From 07af77108e642f5809ff153a4d2675378406f37e Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Wed, 15 Aug 2012 22:46:13 +1100 Subject: [PATCH] LOG Fix provides exceptions generation, add rpmlintrc file --- sane.rpmlintrc | 2 ++ sane.spec | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 sane.rpmlintrc diff --git a/sane.rpmlintrc b/sane.rpmlintrc new file mode 100644 index 0000000..cc77da9 --- /dev/null +++ b/sane.rpmlintrc @@ -0,0 +1,2 @@ +# Actually, versioned enough +addFilter("E: non-versioned-file-in-library-package") diff --git a/sane.spec b/sane.spec index eb2f4e9..0187150 100644 --- a/sane.spec +++ b/sane.spec @@ -1,14 +1,14 @@ %define beta %nil %define libmajor 1 %define libname %mklibname %{name} %{libmajor} -%define develname %mklibname %{name} %{libmajor} -d +%define develname %mklibname %{name} %{libmajor} -d %define iscanversion 2.24.0 # All sane backends have SONAME libsane.so.1. We do not want # sane-backends-iscan to provide libsane.so.1, so filter these out. %if %{_use_internal_dependency_generator} -%define __noautoprovfiles %{_libdir}/%{name}/ +%define __noautoprovfiles %{_libdir}/sane %else %define _exclude_files_from_autoprov %{_libdir}/%{name}/ %endif @@ -36,7 +36,7 @@ Name: sane Version: 1.0.22 -Release: 5 +Release: 6 Summary: SANE - local and remote scanner access # lib/ is LGPLv2+, backends are GPLv2+ with exceptions # Tools are GPLv2+, docs are public domain @@ -56,6 +56,7 @@ Source12: http://www.geocities.com/trsh0101/SANE/primascan.c # mkdir x; cd x; tar -xvzf ../iscan_2.21.0-6.tar.gz; rm -f */non-free/EAPL*.txt */non-free/lib*.so; tar -cvjf ../iscan_2.21.0-6-free.tar.bz2 *; cd ..; rm -rf x Source13: iscan_%{iscanversion}-4-free.tar.bz2 Source14: http://downloads.sourceforge.net/project/geniusvp2/sane-backend-geniusvp2/1.0.16.1/sane-backend-geniusvp2_1.0.16.1.tar.gz +Source15: sane.rpmlintrc Patch1: sane-backends-1.0.18-plustek-s12.patch Patch9: sane-sparc.patch #Patch20: http://projects.troy.rollo.name/rt-scanners/hp3500.diff