diff --git a/.cvsignore b/.cvsignore index 3f5177e..2b9d049 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -plustek-sane-0.45-5.tar.gz -sane-backends-1.0.9.tar.gz +sane-backends-1.0.12.tar.gz diff --git a/sane-backends.spec b/sane-backends.spec index 6971ee3..6d712b7 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -1,22 +1,17 @@ Summary: Scanner access software. Name: sane-backends -Version: 1.0.9 -Release: 5.5 +Version: 1.0.12 +Release: 4 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs) Group: System Environment/Libraries Source0: ftp://ftp.mostang.com/pub/sane/sane-%{version}/%{name}-%{version}.tar.gz Source1: sane.png -Source2: plustek-sane-0.45-5.tar.gz -Patch0: sane-sparc.patch -Patch1: sane-backends-1.0.7-autoload.patch -Patch2: sane-backends-1.0.8-rpath.patch -Patch3: sane-backends-1.0.8-docdir.patch -Patch4: sane-backends-1.0.9-errorchk.patch -Patch5: sane-backends-1.0.9-hp101.patch -Patch6: sane-backends-1.0.10-security.patch +Patch0: sane-backends-1.0.7-autoload.patch +Patch1: sane-backends-1.0.11-rpath.patch +Patch2: sane-backends-1.0.11-docdir.patch URL: http://www.mostang.com/sane/ BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: tetex-latex libusb-devel +BuildRequires: tetex-latex libusb-devel libieee1284-devel # Backend maintainer says to leave gphoto2 disabled for now. %define gphoto2_support 0 %if %{gphoto2_support} @@ -45,7 +40,7 @@ also install the sane-backends-devel package. %package devel Summary: The SANE (a universal scanner interface) development toolkit. Group: Development/Libraries -Requires: sane-backends = %{version} +Requires: sane-backends = %{version}, libusb-devel, libieee1284-devel Obsoletes: sane-devel Provides: sane-devel @@ -55,24 +50,24 @@ Static libraries and header files for writing Scanner Access Now Easy included in the sane-backends package. %prep -%setup -q -a 2 -%patch0 -p1 -b .sparc +%setup -q # Make sure to load SCSI modules if not already loaded (bug #59979). cd sanei -%patch1 -p0 -b .autoload +%patch0 -p0 -b .autoload cd .. -%patch2 -p1 -b .rpath -%patch3 -p1 -b .docdir -%patch4 -p1 -b .errorchk -%patch5 -p1 -b .hp101 -%patch6 -p1 -b .security +%patch1 -p1 -b .rpath +%patch2 -p1 -b .docdir # Fix bug #62847. perl -pi -e 's,/dev/usbscanner0?,/dev/usb/scanner0,' backend/*.conf # We patched configure.in, so regenerate configure. +sed '/^# libtool\.m4/,$d' < acinclude.m4 > acinclude.m4.new +mv -f acinclude.m4{.new,} +aclocal +libtoolize --force --copy autoconf %build @@ -89,28 +84,42 @@ make rm -rf %{buildroot} %{makeinstall} docdir=%{buildroot}/%{_docdir}/%{name}-%{version} perl -pi -e "s/installed.*/installed=yes/g" $RPM_BUILD_ROOT%{_libdir}/libsane.la -/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir} +/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/sane mkdir -p %{buildroot}%{_datadir}/pixmaps install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps rm -f %{buildroot}%{_bindir}/gamma4scanimage +rm -f %{buildroot}%{_libdir}/sane/*.a %{buildroot}%{_libdir}/*.a +%find_lang %name %clean rm -rf %{buildroot} %post -if grep -q /usr/lib/sane /etc/ld.so.conf; then +FNAME=`mktemp /etc/ld.so.conf.XXXXXX` +grep -v "%{_libdir}/sane" /etc/ld.so.conf > ${FNAME} +echo "%{_libdir}/sane" >> ${FNAME} +cat ${FNAME} > /etc/ld.so.conf +rm -f ${FNAME} +/sbin/ldconfig + +%postun +if [ $1 = 0 ]; then FNAME=`mktemp /etc/ld.so.conf.XXXXXX` - grep -v "/usr/lib/sane" /etc/ld.so.conf > ${FNAME} + grep -v "%{_libdir}/sane" /etc/ld.so.conf > ${FNAME} cat ${FNAME} > /etc/ld.so.conf rm -f ${FNAME} fi /sbin/ldconfig -%postun -p /sbin/ldconfig +%triggerpostun -- sane +if ! grep -q "^%{_libdir}/sane\$" /etc/ld.so.conf; then + echo "%{_libdir}/sane" >> /etc/ld.so.conf +fi +/sbin/ldconfig -%files +%files -f %{name}.lang %defattr(-,root,root) %dir /etc/sane.d %config /etc/sane.d/* @@ -119,7 +128,7 @@ fi %{_sbindir}/* %{_libdir}/libsane*.so.* %dir %{_libdir}/sane -%{_libdir}/sane/libsane-*.so.* +%{_libdir}/sane/*.so.* %{_mandir}/*/* %{_datadir}/pixmaps/sane.png %{_docdir}/* @@ -131,30 +140,33 @@ fi %{_libdir}/libsane*.la %{_libdir}/libsane*.so %{_libdir}/sane/*.la -%{_libdir}/sane/libsane-*.so +%{_libdir}/sane/*.so %changelog -* Fri Jan 2 2004 Tim Waugh 1.0.9-5.5 -- Remove %%{_libdir}/sane from ld.so.conf on upgrade. - -* Wed Dec 24 2003 Tim Waugh 1.0.9-5.4 -- Don't run ldconfig in %%{_libdir}/sane even in %%install. +* Thu Jul 24 2003 Tim Waugh 1.0.12-4 +- The devel package requires libieee1284-devel. -* Tue Dec 16 2003 Tim Waugh 1.0.9-5.3 -- Put rpath tricks back in but take out ld.so.conf tampering (better fix - for bug #110174). +* Mon Jun 16 2003 Tim Waugh 1.0.12-3 +- Use libtoolize and aclocal to fix build. +- Build requires libieee1284-devel (to fix bug #75849). -* Thu Dec 4 2003 Tim Waugh 1.0.9-5.2.1 -- Rebuilt. +* Wed Jun 04 2003 Elliot Lee +- rebuilt -* Thu Dec 4 2003 Tim Waugh 1.0.9-5.2 -- Fix rpath in backends (bug #110174). +* Sun May 25 2003 Tim Waugh 1.0.12-1 +- 1.0.12. -* Thu Jul 24 2003 Tim Waugh 1.0.9-5.1.1 -- Rebuilt. +* Thu Mar 20 2003 Tim Waugh 1.0.11-1 +- Shipped libtool is broken; use installed script instead. +- Remove files not shipped. +- Fix some /usr/lib references. +- 1.0.11. +- Drop sane-sparc, errorchk, hp101, security patches. +- Update rpath, docdir patches. +- Use %%find_lang. -* Thu Jul 24 2003 Tim Waugh 1.0.9-5.1 -- Update plustek backend to 0.45-5 (bug #100659). +* Fri Mar 7 2003 Tim Waugh +- sane-backends-devel requires libusb-devel (bug #85742). * Mon Feb 10 2003 Tim Waugh 1.0.9-5 - Fix saned problems. diff --git a/sources b/sources index 25fb4d8..fd7561a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -ca8f7b1f7ee35b3c09caf0cb16dc6b88 plustek-sane-0.45-5.tar.gz -b1869b7d333ab826b3aa9edde9820a96 sane-backends-1.0.9.tar.gz +28d4d7469cd688dac94c7a415a81a6bb sane-backends-1.0.12.tar.gz