Author: sparky Date: Tue Jan 19 23:22:34 2010 GMT Module: packages Tag: HEAD ---- Log message: - updated to 1.0.20, builds nicely but not tested yet, so rel 0.1 - configure patch converted to lockpath_group patch - link patch applied upstream - removed - added hp_rts88xx patch - patches Makefile.am unlike patch-sane.sh which edits Makefile.in; prepare hp_rts88xx manually - don't use patch-sane.sh - BR: libv4l-devel - build mustek600iin-off also on x8664 - added new backends - sane-pint man page is out - it is bsd-only tool
---- Files affected: packages/sane-backends: sane-backends.spec (1.126 -> 1.127) ---- Diffs: ================================================================ Index: packages/sane-backends/sane-backends.spec diff -u packages/sane-backends/sane-backends.spec:1.126 packages/sane-backends/sane-backends.spec:1.127 --- packages/sane-backends/sane-backends.spec:1.126 Fri Jan 15 00:14:22 2010 +++ packages/sane-backends/sane-backends.spec Wed Jan 20 00:22:28 2010 @@ -11,24 +11,23 @@ Summary(pl.UTF-8): SANE - prosta obsługa skanerów lokalnych i sieciowych Summary(pt_BR.UTF-8): SANE - acesso a scanners locais e em rede Name: sane-backends -Version: 1.0.19 -Release: 7 +Version: 1.0.20 +Release: 0.1 License: relaxed GPL v2+ (libraries), Public Domain (docs) Group: Libraries Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/sane-backends-%{version}.tar.gz -# Source0-md5: 8c0936272dcfd4e98c51512699f1c06f +# Source0-md5: a0cfdfdebca2feb4f2ba5d3418b15a42 Source1: %{name}.rc-inetd Source2: %{name}.m4 # http://hp44x0backend.sourceforge.net/ and http://home.foni.net/~johanneshub/ Source3: http://dl.sourceforge.net/hp44x0backend/sane_hp_rts88xx-0.18.tar.gz # Source3-md5: 09d3eaf73f35b7795cd8418b8dc60f69 -Patch0: %{name}-missing-files.patch +Patch0: %{name}-lockpath_group.patch Patch1: %{name}-mustek-path.patch Patch2: %{name}-spatc.patch -Patch3: %{name}-link.patch -Patch4: %{name}-pl.po-update.patch -Patch5: %{name}-hp_rts88xx-fixes.patch -Patch6: %{name}-configure.patch +Patch3: %{name}-pl.po-update.patch +Patch10: %{name}-hp_rts88xx.patch +Patch11: %{name}-hp_rts88xx-fixes.patch URL: http://www.sane-project.org/ BuildRequires: autoconf >= 2.54 BuildRequires: automake @@ -39,6 +38,7 @@ BuildRequires: libtiff-devel BuildRequires: libtool BuildRequires: libusb-compat-devel +BuildRequires: libv4l-devel BuildRequires: pkgconfig BuildRequires: resmgr-devel BuildRequires: rpmbuild(macros) >= 1.268 @@ -220,21 +220,26 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +# needs update +#%%patch3 -p1 + %if %{with rts88xx} -cd sane_hp_rts88xx/sane_hp_rts88xx -sh -x patch-sane.sh `pwd`/../.. -cd ../.. +%patch10 -p1 +%patch11 -p1 +cp sane_hp_rts88xx/sane_hp_rts88xx/*.[ch] backend/ +cp sane_hp_rts88xx/sane_hp_rts88xx/hp_rts88xx.conf backend/hp_rts88xx.conf.in +cp sane_hp_rts88xx/sane_hp_rts88xx/hp_rts88xx.conf backend/hp_rts88xx.conf +ln -s stubs.c backend/hp_rts88xx-s.c + +cp sane_hp_rts88xx/sane_hp_rts88xx/hp_rts88xx.desc doc/descriptions/ +cp sane_hp_rts88xx/sane_hp_rts88xx/sane-hp_rts88xx.man doc/ %endif %build %{__libtoolize} -cp -f /usr/share/automake/config.* . %{__aclocal} -I m4 %{__autoconf} +%{__automake} %configure \ --enable-static \ --enable-pnm-backend \ @@ -243,9 +248,9 @@ %{__make} -%ifarch %{ix86} +%ifarch %{ix86} %{x8664} cd tools -%{__cc} -DHAVE_SYS_IO_H %{rpmcflags} \ +%{__cc} %{rpmcppflags} -DHAVE_SYS_IO_H %{rpmcflags} %{rpmldflags} \ -I../include -o mustek600iin-off mustek600iin-off.c cd .. %endif @@ -260,14 +265,14 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/saned install %{SOURCE2} $RPM_BUILD_ROOT%{_aclocaldir} -%ifarch %{ix86} +%ifarch %{ix86} %{x8664} install tools/mustek600iin-off $RPM_BUILD_ROOT%{_bindir} %endif -rm -rf $RPM_BUILD_ROOT%{_prefix}/doc +%{__rm} -rf $RPM_BUILD_ROOT%{_prefix}/doc # only shared modules - shut up check-files -rm -f $RPM_BUILD_ROOT%{_libdir}/sane/libsane-*.{so,la,a} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/sane/libsane-*.{so,la,a} %find_lang %{name} --all-name @@ -309,9 +314,11 @@ %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/bh.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/canon.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/canon630u.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/canon_dr.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/cardscan.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/coolscan.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/coolscan2.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/coolscan3.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/dc210.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/dc240.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/dc25.conf @@ -344,9 +351,11 @@ %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/nec.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/net.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/pie.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/pixma.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/plustek.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/qcam.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/ricoh.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/rts8891.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/s9036.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/sceptre.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/sharp.conf @@ -365,6 +374,7 @@ %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/umax1220u.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/umax_pp.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/v4l.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/xerox_mfp.conf %attr(755,root,root) %{_libdir}/libsane.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libsane.so.1 %dir %{_libdir}/sane @@ -378,9 +388,11 @@ %attr(755,root,root) %{_libdir}/sane/libsane-bh.so.* %attr(755,root,root) %{_libdir}/sane/libsane-canon.so.* %attr(755,root,root) %{_libdir}/sane/libsane-canon630u.so.* +%attr(755,root,root) %{_libdir}/sane/libsane-canon_dr.so.* %attr(755,root,root) %{_libdir}/sane/libsane-cardscan.so.* %attr(755,root,root) %{_libdir}/sane/libsane-coolscan.so.* %attr(755,root,root) %{_libdir}/sane/libsane-coolscan2.so.* +%attr(755,root,root) %{_libdir}/sane/libsane-coolscan3.so.* %attr(755,root,root) %{_libdir}/sane/libsane-dc210.so.* %attr(755,root,root) %{_libdir}/sane/libsane-dc240.so.* %attr(755,root,root) %{_libdir}/sane/libsane-dc25.so.* @@ -423,6 +435,7 @@ %attr(755,root,root) %{_libdir}/sane/libsane-pnm.so.* %attr(755,root,root) %{_libdir}/sane/libsane-qcam.so.* %attr(755,root,root) %{_libdir}/sane/libsane-ricoh.so.* +%attr(755,root,root) %{_libdir}/sane/libsane-rts8891.so.* %attr(755,root,root) %{_libdir}/sane/libsane-s9036.so.* %attr(755,root,root) %{_libdir}/sane/libsane-sceptre.so.* %attr(755,root,root) %{_libdir}/sane/libsane-sharp.so.* @@ -442,6 +455,7 @@ %attr(755,root,root) %{_libdir}/sane/libsane-umax1220u.so.* %attr(755,root,root) %{_libdir}/sane/libsane-umax_pp.so.* %attr(755,root,root) %{_libdir}/sane/libsane-v4l.so.* +%attr(755,root,root) %{_libdir}/sane/libsane-xerox_mfp.so.* %dir %attr(775,root,usb) /var/lock/sane %{_mandir}/man1/sane-find-scanner.1* %{_mandir}/man1/scanimage.1* @@ -457,9 +471,11 @@ %{_mandir}/man5/sane-bh.5* %{_mandir}/man5/sane-canon.5* %{_mandir}/man5/sane-canon630u.5* +%{_mandir}/man5/sane-canon_dr.5* %{_mandir}/man5/sane-cardscan.5* %{_mandir}/man5/sane-coolscan.5* %{_mandir}/man5/sane-coolscan2.5* +%{_mandir}/man5/sane-coolscan3.5* %{_mandir}/man5/sane-dc210.5* %{_mandir}/man5/sane-dc240.5* %{_mandir}/man5/sane-dc25.5* @@ -467,6 +483,7 @@ %{_mandir}/man5/sane-dmc.5* %{_mandir}/man5/sane-epjitsu.5* %{_mandir}/man5/sane-epson.5* +%{_mandir}/man5/sane-epson2.5* %{_mandir}/man5/sane-fujitsu.5* %{_mandir}/man5/sane-genesys.5* %{_mandir}/man5/sane-gt68xx.5* @@ -495,12 +512,12 @@ %{_mandir}/man5/sane-net.5* %{_mandir}/man5/sane-niash.5* %{_mandir}/man5/sane-pie.5* -%{_mandir}/man5/sane-pint.5* %{_mandir}/man5/sane-pixma.5* %{_mandir}/man5/sane-plustek.5* %{_mandir}/man5/sane-pnm.5* %{_mandir}/man5/sane-qcam.5* %{_mandir}/man5/sane-ricoh.5* +%{_mandir}/man5/sane-rts8891.5* %{_mandir}/man5/sane-s9036.5* %{_mandir}/man5/sane-sceptre.5* %{_mandir}/man5/sane-scsi.5* @@ -522,6 +539,7 @@ %{_mandir}/man5/sane-umax_pp.5* %{_mandir}/man5/sane-usb.5* %{_mandir}/man5/sane-v4l.5* +%{_mandir}/man5/sane-xerox_mfp.5* %{_mandir}/man7/sane.7* %files devel @@ -543,7 +561,7 @@ %attr(755,root,root) %{_sbindir}/saned %{_mandir}/man8/saned.8* -%ifarch %{ix86} +%ifarch %{ix86} %{x8664} %files -n sane-mustek600IIN %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/mustek600iin-off @@ -580,6 +598,17 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.127 2010/01/19 23:22:28 sparky +- updated to 1.0.20, builds nicely but not tested yet, so rel 0.1 +- configure patch converted to lockpath_group patch +- link patch applied upstream - removed +- added hp_rts88xx patch - patches Makefile.am unlike patch-sane.sh which + edits Makefile.in; prepare hp_rts88xx manually - don't use patch-sane.sh +- BR: libv4l-devel +- build mustek600iin-off also on x8664 +- added new backends +- sane-pint man page is out - it is bsd-only tool + Revision 1.126 2010/01/14 23:14:22 hawk - no texlive in Titanium, release 7 @@ -690,7 +719,7 @@ - formatting Revision 1.94 2004/09/16 00:05:32 ankry -- %%userremove/%%groupremove support +- %userremove/%groupremove support - unification Revision 1.93 2004/09/05 09:51:51 adasi @@ -780,7 +809,7 @@ - merge translations from MIZI. Revision 1.68 2002/12/07 14:34:16 ankry -- fix improper usage of %%{_sysconfdir} +- fix improper usage of %{_sysconfdir} Revision 1.67 2002/11/29 10:55:31 newrom - Updated to ver 1.0.9 @@ -829,7 +858,7 @@ - release 8. Revision 1.53 2002/08/18 15:20:22 blues -license fix +- license fix Revision 1.52 2002/07/29 21:08:19 qboosh - oops, more requires moved to -saned; release 7 @@ -864,7 +893,7 @@ Revision 1.43 2002/06/16 11:52:40 qboosh - enabled pnm backend and translations -- new %%doc +- new %doc - don't run automake - this package doesn't use am - release 3 @@ -876,13 +905,13 @@ Revision 1.40 2002/06/02 08:04:05 kloczek - updated to 1.0.8, -- build plustek kernel modules only on %%{ix86} (package is now also sparc* ready), +- build plustek kernel modules only on %{ix86} (package is now also sparc* ready), - removed outdate DESTDIR patch. Revision 1.39 2002/05/21 23:14:40 kloczek -perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \ - s/^automake -a -c -f/\%\{__automake\}/; \ - s/^autoconf/\%\{__autoconf\}/" +- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \ + s/^automake -a -c -f/\%\{__automake\}/; \ + s/^autoconf/\%\{__autoconf\}/" Revision 1.38 2002/05/08 08:53:30 qboosh - typo, sorted base description translations @@ -902,7 +931,7 @@ Revision 1.34 2002/03/13 18:47:02 mkochano - Release 2.11. -- Corrected %%files: now plustek docs should be included. +- Corrected %files: now plustek docs should be included. Revision 1.33 2002/03/13 18:40:37 mkochano - Release 2.10. @@ -914,12 +943,12 @@ - Release 2.9. - Renamed plustek-up_smp_switch patch to plustek-Makefile. - No longer use subshells. The do not propagate exit codes correctly. -STBR for /test + STBR for /test Revision 1.31 2002/03/12 22:16:13 mkochano - Release 2.1. - Politically correct smp/up. -IT DOESN'T BUILD! + IT DOESN'T BUILD! Revision 1.30 2002/03/12 21:18:24 mkochano - Release 2. @@ -941,7 +970,7 @@ - prevent restarting inetd twice during upgrade; release 8 Revision 1.26 2002/01/18 02:14:51 kloczek -perl -pi -e "s/[email protected]/[email protected]/" +- perl -pi -e "s/[email protected]/[email protected]/" Revision 1.25 2001/12/16 13:48:11 mkochano - Release 7. @@ -987,11 +1016,11 @@ - removed obsoleted includes,mustek-gamma patches Revision 1.12 2001/06/08 20:10:05 zagrodzki -- fixed %%post +- fixed %post - release 3 Revision 1.11 2001/04/30 16:05:30 kloczek -- added using %%{rpmcflags} macro. +- added using %{rpmcflags} macro. Revision 1.10 2001/03/08 07:25:10 kloczek - more raname. @@ -1002,7 +1031,7 @@ Revision 1.8 2001/03/08 07:22:04 kloczek - relese 2, - rename sane-backends-sane-devel -> sane-backends-devel, - sane-backends-sane-static -> sane-backends-staic. + sane-backends-sane-static -> sane-backends-staic. Revision 1.7 2001/02/12 01:16:49 kloczek - revert changes for sane-{devel,static}. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sane-backends/sane-backends.spec?r1=1.126&r2=1.127&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
