diff --git a/sane-backends-1.0.19-acinclude.patch.bz2 b/sane-backends-1.0.19-acinclude.patch.bz2 deleted file mode 100644 index 6e504b5..0000000 Binary files a/sane-backends-1.0.19-acinclude.patch.bz2 and /dev/null differ diff --git a/sane-backends.spec b/sane-backends.spec index 89059ba..fdd8587 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -1,7 +1,7 @@ Summary: Scanner access software Name: sane-backends Version: 1.0.19 -Release: 12%{?dist} +Release: 13%{?dist} # lib/ is LGPLv2+, backends are GPLv2+ with exceptions # Tools are GPLv2+, docs are public domain # see LICENSE for details @@ -10,12 +10,11 @@ Group: System Environment/Libraries Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz Source1: sane.png Source2: hal-usb-scanner-add -Patch0: sane-backends-1.0.19-acinclude.patch.bz2 -Patch1: sane-backends-1.0.18-rpath.patch -Patch2: sane-backends-1.0.19-pkgconfig.patch -Patch3: sane-backends-1.0.19-glibc-2.7.patch -Patch4: sane-backends-1.0.19-policykit.patch -Patch5: sane-backends-1.0.19-uninitialized.patch +Patch0: sane-backends-1.0.18-rpath.patch +Patch1: sane-backends-1.0.19-pkgconfig.patch +Patch2: sane-backends-1.0.19-glibc-2.7.patch +Patch3: sane-backends-1.0.19-policykit.patch +Patch4: sane-backends-1.0.19-uninitialized.patch URL: http://www.sane-project.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n) BuildRequires: tetex-latex @@ -23,9 +22,6 @@ BuildRequires: libusb-devel BuildRequires: libieee1284-devel BuildRequires: libjpeg-devel BuildRequires: libtiff-devel -BuildRequires: autoconf -BuildRequires: libtool -BuildRequires: gettext BuildRequires: gphoto2-devel Requires: pam >= 0.78-2 Requires: hal >= 0.4.0 @@ -78,21 +74,17 @@ want to access digital cameras. %prep %setup -q -%patch0 -p1 -b .acinclude -%patch1 -p1 -b .rpath -%patch2 -p1 -b .pkgconfig -%patch3 -p1 -b .glibc-2.7 -%patch4 -p1 -b .policykit -%patch5 -p1 -b .uninitialized +%patch0 -p1 -b .rpath +%patch1 -p1 -b .pkgconfig +%patch2 -p1 -b .glibc-2.7 +%patch3 -p1 -b .policykit +%patch4 -p1 -b .uninitialized for i in agfafocus avision coolscan2 umax_pp; do iconv -f iso-8859-1 -t utf-8 < "doc/sane-$i.man" > "doc/sane-$i.man_" mv "doc/sane-$i.man_" "doc/sane-$i.man" done -# We patched configure.in, so regenerate configure. -autoreconf --install --force - %build %configure \ --with-gphoto2=%{_prefix} \ @@ -102,7 +94,7 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} -%{makeinstall} docdir=%{buildroot}/%{_docdir}/%{name}-%{version} +make DESTDIR="%{buildroot}" install mkdir -p %{buildroot}%{_datadir}/pixmaps install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps @@ -162,6 +154,11 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/sane-backends.pc %changelog +* Wed Feb 25 2009 Nils Philippsen - 1.0.19-13 +- drop acinclude patch to not unnecessarily rebuild autoconf/libtool files + which made libtool break builds on Rawhide +- use "make DESTDIR=... install" instead of "%%makeinstall" + * Thu Sep 4 2008 Tom "spot" Callaway - 1.0.19-12 - fix license tag