diff --git a/sane.spec b/sane.spec index 04a324c..263817c 100644 --- a/sane.spec +++ b/sane.spec @@ -1,13 +1,7 @@ -%define name sane -%define version 1.0.22 -%define release %mkrel 4 %define beta %nil -#define beta -pre1 -#define beta .20080121 - %define libmajor 1 %define libname %mklibname %{name} %{libmajor} -%define libname_devel %mklibname %{name} %{libmajor} -d +%define develname %mklibname %{name} %{libmajor} -d %define iscanversion 2.24.0 @@ -35,13 +29,17 @@ %define epkowa_support 0 %endif -Name: %{name} -Version: %{version} -Release: %{release} +Name: sane +Version: 1.0.22 +Release: 5 Summary: SANE - local and remote scanner access +# lib/ is LGPLv2+, backends are GPLv2+ with exceptions +# Tools are GPLv2+, docs are public domain +License: GPLv2+ and GPLv2+ with exceptions and Public Domain +Group: Graphics URL: http://www.sane-project.org/ Source: ftp://ftp.sane-project.org/pub/sane/sane-%version/sane-backends-%{version}%{beta}.tar.gz -Source3: http://belnet.dl.sourceforge.net/sourceforge/px-backend/primaxscan-1.1.beta1.tar.bz2 +Source3: http://belnet.dl.sourceforge.net/sourceforge/px-backend/primaxscan-1.1.beta1.tar.bz2 Source5: saned-xinetd Source9: http://heanet.dl.sourceforge.net/sourceforge/hp44x0backend/sane_hp_rts88xx-0.18.tar.bz2 Source10: http://heanet.dl.sourceforge.net/sourceforge/brother-mfc/sane-driver-0.2.tar.bz2 @@ -99,34 +97,31 @@ Patch203: sane-backends-1.0.20-hal.patch Patch205: sane-backends-1.0.20-epson-expression800.patch Patch206: sane-backends-1.0.22-v4l.patch -# lib/ is LGPLv2+, backends are GPLv2+ with exceptions -# Tools are GPLv2+, docs are public domain -License: GPLv2+ and GPLv2+ with exceptions and Public Domain -Group: Graphics Requires: %{libname} = %{version}-%{release} Requires: sane-backends = %{version}-%{release} -Buildroot: %{_tmppath}/%{name}-%{version}-root + BuildRequires: jpeg-devel BuildRequires: tiff-devel -BuildRequires: libusb-devel +BuildRequires: pkgconfig(libusb) BuildRequires: libieee1284-devel BuildRequires: libltdl-devel BuildRequires: tetex-latex BuildRequires: tetex-dvips BuildRequires: gettext BuildRequires: gettext-devel -BuildRequires: libgtk+2.0-devel +BuildRequires: pkgconfig(gtk+-2.0) %if %{gphoto2_support} -BuildRequires: gphoto2-devel +BuildRequires: pkgconfig(libgphoto2) %endif %if %{v4l_support} BuildRequires: libv4l-devel %endif %if %{epkowa_support} BuildRequires: autoconf +BuildRequires: automake %endif # ensure resmgr is not pulled -BuildConflicts: resmgr-devel +BuildConflicts: resmgr-devel %description SANE (Scanner Access Now Easy) is a sane and simple interface @@ -162,16 +157,15 @@ mailing list access, see http://www.mostang.com/sane/ This package does not enable network scanning by default; if you wish to enable it, install the saned package. -%package -n %{libname_devel} +%package -n %{develname} Group: Development/C License: LGPL Summary: SANE - local and remote scanner access Requires: %{libname} = %{version} Provides: libsane-devel = %{version}-%{release} Provides: sane-devel = %{version}-%{release} -Obsoletes: sane-devel -%description -n %{libname_devel} +%description -n %{develname} SANE (Scanner Access Now Easy) is a sane and simple interface to both local and networked scanners and other image acquisition devices like digital still and video cameras. SANE currently includes modules for @@ -217,7 +211,7 @@ Summary: SANE - local and remote scanner access Provides: iscan = %{iscanversion} Conflicts: sane-backends < 1.0.19-3 Conflicts: %{libname} < 1.0.19-5 -Conflicts: %{libname_devel} < 1.0.20-7 +Conflicts: %{develname} < 1.0.20-7 %description backends-iscan SANE (Scanner Access Now Easy) is a sane and simple interface @@ -380,11 +374,11 @@ popd rm -f backend/dll.conf %build - %configure2_5x \ - --enable-rpath=no \ + --disable-static \ + --enable-rpath=no \ %if !%{gphoto2_support} - --without-gphoto2 + --without-gphoto2 %endif @@ -399,7 +393,9 @@ cd primaxscan* PATH=`pwd`/../tools:${PATH} CFLAGS="${RPM_OPT_FLAGS/-ffast-math/} -fPIC -I`pwd`/../include -L`pwd`/../backend/.libs/"\ #CFLAGS="${RPM_OPT_FLAGS/-ffast-math/} -I`pwd`/../include/sane -L`pwd`/../backend/.libs/"\ -%configure2_5x +%configure2_5x \ + --disable-static + %make %make primax_scan cd .. @@ -414,13 +410,14 @@ cd iscan-%{iscanversion} sh ./bootstrap export CFLAGS="${RPM_OPT_FLAGS/-ffast-math/} -I`pwd`/../include -L`pwd`/../backend/ -fPIC" export CXXFLAGS="${RPM_OPT_FLAGS/-ffast-math/} -I`pwd`/../include -L`pwd`/../backend/ -fPIC" -%configure2_5x --disable-frontend +%configure2_5x \ + --disable-static \ + --disable-frontend %make cd .. %endif %install - rm -rf %{buildroot} %makeinstall_std @@ -461,15 +458,12 @@ net EOF %endif -# Remove /usr/lib/libsane.a, it is a broken symlink -#rm -f %{buildroot}%{_libdir}/libsane.a - # Move documentation from /usr/doc to /usr/share/doc install -d %{buildroot}%{_docdir}/sane-backends-%version/ install -d %{buildroot}%{_docdir}/sane-backends-doc-%version/ pushd %{buildroot}/usr/doc/sane-%{version} #pushd %{buildroot}/usr/doc/sane-1.0.18-cvs -mv `find -mindepth 1 -type d` *.html *.ps *.txt %{buildroot}%{_docdir}/sane-backends-doc-%version/ +mv `find -mindepth 1 -type d` *.html *.txt %{buildroot}%{_docdir}/sane-backends-doc-%version/ mv README README.linux %{buildroot}%{_docdir}/sane-backends-%version/ rm -f README.* mv * %{buildroot}%{_docdir}/sane-backends-%version/ @@ -508,18 +502,18 @@ install -m644 tools/udev/libsane.rules %{buildroot}/%{_sysconfdir}/udev/rules.d/ perl -p -i -e 's/(\#.{500}).*$/$1 .../' %{buildroot}/%{_sysconfdir}/udev/rules.d/60-libsane.rules %find_lang sane-backends -%if %epkowa_support -%find_lang iscan -%endif +#if %epkowa_support +#find_lang iscan +#endif sed -i '/^%dir/d' sane-backends.lang -%if %epkowa_support -sed -i '/^%dir/d' iscan.lang -%endif +#if %epkowa_support +#sed -i '/^%dir/d' iscan.lang +#endif + +# remove libtool archives +find %{buildroot} -name '*.la' -exec rm -f {} ';' -%if %mdkversion < 200900 -%post -n %{libname} -p /sbin/ldconfig -%endif %post -n saned %_post_service saned @@ -532,17 +526,10 @@ sed -i '/^%dir/d' iscan.lang %preun -n saned %_preun_service saned -%if %mdkversion < 200900 -%postun -n %{libname} -p /sbin/ldconfig -%endif %postun -n saned %_postun_userdel saned -%clean -rm -rf %{buildroot} - %files backends -f sane-backends.lang -%defattr(-,root,root,755) %doc %{_docdir}/sane-backends-%version %{_bindir}/sane-find-scanner %{_bindir}/scanimage @@ -566,8 +553,8 @@ rm -rf %{buildroot} %endif %if %epkowa_support -%files backends-iscan -f iscan.lang -%defattr(-,root,root,755) +#-f iscan.lang +%files backends-iscan %_libdir/sane/libsane-epkowa.* %_sysconfdir/sane.d/epkowa.conf %_mandir/man5/sane-epkowa.5* @@ -576,11 +563,9 @@ rm -rf %{buildroot} %endif %files backends-doc -%defattr(-,root,root,755) %doc %{_docdir}/sane-backends-doc-%version %files -n %{libname} -%defattr(-,root,root,755) %{_libdir}/*.so.* %dir %{_libdir}/sane %{_libdir}/sane/*.so.* @@ -588,14 +573,9 @@ rm -rf %{buildroot} %exclude %_libdir/sane/libsane-epkowa.* %endif -%files -n %{libname_devel} -%defattr(-,root,root,755) +%files -n %{develname} %{_bindir}/sane-config -#%{_libdir}/*.a -%{_libdir}/*.la %{_libdir}/*.so -#%{_libdir}/sane/*.a -%{_libdir}/sane/*.la %{_libdir}/sane/*.so %{_includedir}/sane %if %epkowa_support @@ -603,7 +583,6 @@ rm -rf %{buildroot} %endif %files -n saned -%defattr(-,root,root,755) %{_sbindir}/* %{_mandir}/man8/saned* #config(noreplace) %{_sysconfdir}/sane.d/saned.conf @@ -612,8 +591,22 @@ rm -rf %{buildroot} %changelog -* Tue Aug 16 2011 Alexander Barakin 1.0.22-3mdv2011.0 -+ Revision: 694682 +* Mon Nov 28 2011 Matthew Dawkins 1.0.22-4 ++ Revision: 735064 +- removed iscan.lang +- removed find_lang for iscan +- removed .ps list of files to be moved +- fixed typoes for disable +- added back beta macro +- rebuild +- removed old ldconfig scriptlets +- removed .la files +- cleaned up spec +- utilize disable static instead of removing the files + +* Tue Aug 16 2011 Alexander Barakin 1.0.22-3 ++ Revision: 694688 +- add automake to build-reqs - homedir patch #63844 * Mon Jul 04 2011 Luis Daniel Lucio Quiroz 1.0.22-2 @@ -805,3 +798,194 @@ rm -rf %{buildroot} + Revision: 91406 - Added patch plustek-s12 to support plustek s12. Closes: #26491 + +* Tue Jan 30 2007 Olivier Blin 1.0.18-10mdv2007.0 ++ Revision: 115312 +- remove bogus provides in backends-doc +- split backends doc in sane-backends-doc package + +* Sat Jan 13 2007 Götz Waschk 1.0.18-8mdv2007.1 ++ Revision: 108211 +- Import sane + +* Sat Jan 13 2007 Götz Waschk 1.0.18-8mdv2007.1 +- use find-lang + +* Tue Sep 19 2006 Till Kamppeter 1.0.18-7mdv2007.0 +- Building the sane package was only working on machines with + libsane-devel installed, added missing paths to the CXXFLAGS of + IScan to fix this. + +* Mon Sep 18 2006 Till Kamppeter 1.0.18-6mdv2007.0 +- More 64-bit fixes for IScan build. + +* Sat Sep 16 2006 Till Kamppeter 1.0.18-5mdv2007.0 +- Added "BuildRequires: gtp+-2.0-devel", needed by the configure script + of the "epkowa" driver. +- Added explicit "-fPIC" to compiler flags of IScan compilation (needed + to build on 64-bit systems). + +* Thu Jul 27 2006 Till Kamppeter 1.0.18-4mdv2007.0 +- Shorten too long comment lines in udev rules file (bug 23509). + +* Wed Jul 05 2006 Till Kamppeter 1.0.18-3mdv2007.0 +- Moved the udev script "libusbscanner" to the standard location + /lib/udev. + +* Tue Jul 04 2006 Till Kamppeter 1.0.18-2mdv2007.0 +- Added the "epkowa" backend from Epson Avasys (Source 13). +- Commented out "epson" backend in dll.conf, it is replaced by Epson's + "epkowa" backend. +- Added "Provides: iscan" so that Epson's plug-in RPMs (closed-source + modules, firmware files) can be installed without problems. + +* Tue Jul 04 2006 Till Kamppeter 1.0.18-1mdv2007.0 +- Updated to SANE 1.0.18 (New backends: "dell1600n_net" (Dell 1600n), + "hp3500" (HP ScanJet 3500 series), "pixma" (Canon Pixma series), "stv680" + (Aiptek Pencam and similar); updated backends: "avision", "canon", "dll", + "epson", "fujitsu", "genesys", "gt68xx", "microtek2", "mustek_pp", + "niash", "plustek", "snapscan", "sp15c", "test", "u12", "umax1220u"; + scanimage batch mode fixes; scanner lists contain USB vendor/product ids + and some statistics now; udev/hotplug lists are generated autmatically + from the .desc files now; updated translations; ocumentation updates; + bugfixes). +- Removed patch 20 ("hp3500" backend merged upstream). +- Use udev rules file provided by SANE, but let libusbscanner script be + run. +- We have a backend/dll.conf.in file now, and backend/dll.conf gets + generated by the Makefile. This works only when the patches do not + already create backend/dll.conf. Removed the backend/dll.conf + generated by the patches and applied the changes from the patches + in the backend/dll.conf.in file. + +* Mon Feb 27 2006 Till Kamppeter 1.0.17-4mdk +- Updated /etc/xinetd.d/saned to new /etc/services file (service name + moved from "sane" to "sane-port", bug 21128), + +* Mon Feb 27 2006 Till Kamppeter 1.0.17-3mdk +- Introduced %%mkrel. + +* Wed Jan 04 2006 Oden Eriksson 1.0.17-2mdk +- rebuilt against new net-snmp with new major (10) + +* Mon Dec 19 2005 Till Kamppeter 1.0.17-1mdk +- Updated to SANE 1.0.17 (New backends: "hp4200" (HP ScanJet 4200), + "lexmark" (Lexmark X1100 series), "mustek_usb2" (Mustek BearPaw 2448 + TA Pro); updated backends: "artec_eplus48u", "avision", "canon", "epson", + "fujitsu", "genesys", "gt68xx", "microtek2", "mustek_pp", "plustek", + "plustek_pp", "sm3600", "snapscan", "umax_pp"; hotplug/udev updates; + scanimage fixes; sane-find-scanner finds more chipsets; updated + translations; documentation updates; bugfixes). +- Removed patch 14 ("hp4200" backend is now standard part of SANE). +- Added "hp3500" backend (patch 20). +- Added "primascan" backend (sources 11 and 12). + +* Mon Nov 14 2005 Oden Eriksson 1.0.16-6mdk +- rebuilt against openssl-0.9.8a + +* Sat Sep 03 2005 Olivier Blin 1.0.16-5mdk +- fix BuildRequires: udev_import_usermap is now in udev-tools + +* Fri Sep 02 2005 Olivier Blin 1.0.16-4mdk +- Source8: handle udev events (PHYSDEVBUS=usb) and simplify + +* Sun Aug 28 2005 Olivier Blin 1.0.16-3mdk +- move hotplug usermaps to udev rules +- move libusbscanner script to /etc/udev/agents.d/usb/ + +* Sun Aug 14 2005 Till Kamppeter 1.0.16-2mdk +- Added missing lock directory: /var/lib/lock/sane + +* Sun Aug 14 2005 Till Kamppeter 1.0.16-1mdk +- Updated to SANE 1.0.16 (New backends: "genesys", "sm3840"; updated + backends: "avision", "canon", "coolscan", "epson", "gphoto2", "gt68xx", + "mustek", "mustek_pp", "niash", "plustek", "plustek_pp", "qcam", + "sm3600", "snapscan", "teco2", "umax_pp", "v4l"; more functionality/fixes + for sanei_usb and sanei_pp; added sanei_access to allow locking of SANE + devices; hotplug updates; scanimage updates; portability fixes; added + Polish translation; updated other translations; fixed format strings; + documentation updates; bugfixes). +- "geniusvp2" backend temporarily deactivated. Patch does not fit well onto + 1.0.16. + +* Fri Mar 18 2005 Till Kamppeter 1.0.15-7mdk +- Removed Patch 17 (USB timeout issues on "epson" backend) to fix bug + 14424. + +* Wed Mar 16 2005 Till Kamppeter 1.0.15-6mdk +- Commented out entry for the "geniusvp2" in /etc/sane.d/dll.conf as it + makes SANE hanging on some systems when the appropriate scanner is not + present (bug 14639). + +* Thu Feb 17 2005 Thierry Vignaud 1.0.15-5mdk +- rebuild with new libusb + +* Mon Feb 14 2005 Till Kamppeter 1.0.15-4mdk +- Added "geniusvp2" backend to support the Genius ColorPage-Vivid Pro II + scanner. +- Added "hp_rts88xx" backend to support the HP ScanJet 44x0C scanners. +- Added "sm3840" backend to support the Microtek ScanMaker 3840 scanner. +- Removed patch to introduce "niash" backend. "niash" is already included + in SANE. +- Not built in debug mode anymore. +- Some clean-up. + +* Wed Dec 29 2004 Christiaan Welvaart 1.0.15-3mdk +- rebuild with libexif 0.6.x + +* Wed Nov 24 2004 Till Kamppeter 1.0.15-2mdk +- Both saned and sane-backends claimed ownership on /etc/sane.d/saned.conf + due to the expression "*[^saned]" in the %%files section not supported + any more by RPM. Transferred the file /etc/sane.d/saned.conf to the + sane-backends package. + +* Tue Nov 09 2004 Till Kamppeter 1.0.15-1mdk +- Updated to SANE 1.0.15 final. + +* Tue Oct 19 2004 Till Kamppeter 1.0.15-0.1mdk +- Updated to SANE 1.0.15-pre1 (New backends: "niash"; updated backends: + "agfafocus", "artec_eplus48u", "avision", "canon", "canon_pp", + "coolscan", "dll", "epson", "fujitsu", "gt68xx", "hp", "hp5400", + "leo", "microtek2", "mustek", "mustek_pp", "net", "pie", "plustek", + "plustek_pp", "snapscan", "sp15c", "tamarack", "teco2", "umax", + "umax_pp", "u12", "v4l"; sane-find-scanner detects more chipsets now; + finnish translation. translations updates; saned fixes; documentation + updates; bugfixes). +- Uncompressed patches. + +* Thu Aug 19 2004 Till Kamppeter 1.0.14-3mdk +- Added patch to remove the accidentally introduced device IDs for the Epson + Perfection 1250 and 1260 from the "epson" backend. +- Added patch to fix USB timeout issues on "epson" backend. + +* Wed May 05 2004 Frederic Lepied 1.0.14-2mdk +- put back our hotplug script + +* Tue May 04 2004 Till Kamppeter 1.0.14-1mdk +- Updated to SANE 1.0.14 (New backends: "u12"; updated backends: "artec", + "artec_eplus48u", "as6e", "avision", "canon630u", "canon_pp", "epson", + "fujitsu", "gphoto2", "gt68xx", "hp", "matsushita", "mustek", "mustek_pp", + "mustek_usb", "plustek", "plustek_pp", "sm3600", "snapscan", "teco1", + "teco2", "u12", "umax", "umax_pp", "v4l"; new USB hot-plugging script; + usb-find-scanner recognizes more hardware; support for danish language; + bugfixes). +- Switched to SANE's own hotplug infrastructure (needs to be merged with + dynamic stuff of Mandrakelinux). +- This SANE package needs kernel 2.6.6-rc2, on older 2.6.x kernels it hangs + on the "epson" (one can also comment it out in /etc/sane.d/dll.conf). + +* Tue Mar 30 2004 Frederic Lepied 1.0.13-8mdk +- don't call dynamic stuff multiple times + +* Thu Mar 25 2004 Frederic Lepied 1.0.13-7mdk +- call dynamic stuff in usb script + +* Mon Mar 01 2004 Marcel Pol 1.0.13-6mdk +- include hotplug files again, needed after all + +* Thu Feb 26 2004 Marcel Pol 1.0.13-5mdk +- revert last change, pam deals with it + +* Thu Feb 12 2004 Marcel Pol 1.0.13-4mdk +- add usb.usermap and hotplug script for libusb user support +