Author: glen Date: Mon May 7 12:14:42 2012 GMT Module: packages Tag: HEAD ---- Log message: - up to 20120504 tarball, JBIG1 NOW PATENT FREE worldwide - use /lib/udev for udev rules - verbose files in bindir - use versioned tarballs and builddir - general unification and cleanups
---- Files affected: packages/foo2zjs: foo2zjs.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: packages/foo2zjs/foo2zjs.spec diff -u packages/foo2zjs/foo2zjs.spec:1.11 packages/foo2zjs/foo2zjs.spec:1.12 --- packages/foo2zjs/foo2zjs.spec:1.11 Wed Nov 30 13:48:15 2011 +++ packages/foo2zjs/foo2zjs.spec Mon May 7 14:14:36 2012 @@ -2,17 +2,17 @@ Summary: Linux printer driver for ZjStream protocol Summary(pl.UTF-8): Linuksowy sterownik drukarek dla protokoĊu ZjStream Name: foo2zjs -Version: 20111123 +Version: 20120504 Release: 1 License: GPL v2 Group: Applications/System -Source0: http://foo2zjs.rkkda.com/%{name}.tar.gz -# Source0-md5: e75e2bad825b67984af5629f000ad3e8 +Source0: http://foo2zjs.rkkda.com/foo2zjs.tar.gz#/%{name}-%{version}.tar.gz +# Source0-md5: 88fd5a0982001cfc17a58885802f37d7 Source1: http://foo2zjs.rkkda.com/firmware/sihp1000.tar.gz # Source1-md5: eb7f6e1edfec313e6ca23abd27a0d1c2 Source2: http://foo2zjs.rkkda.com/firmware/sihp1005.tar.gz # Source2-md5: 04f7bd2eec09131371e27403626f38b5 -Source3: http://foo2zjs.rkkda.com/firmware/sihpP1006.tar.gz +Source3: http://foo2zjs.rkkda.com/firmware/sihpP1006.tar.gz # Source3-md5: df4b0b84c6feb0d45f64d7fc219895a5 Source4: http://foo2zjs.rkkda.com/firmware/sihp1018.tar.gz # Source4-md5: bf61f2ce504b233f999bc358f5a79499 @@ -89,7 +89,8 @@ - HP LaserJet 1000, 1005, 1006, 1018, 1020 %prep -%setup -q -n %{name} +%setup -qc -a1 -a2 -a3 -a4 -a5 +mv %{name}/* .; rmdir %{name} %patch0 -p1 %patch1 -p1 @@ -100,31 +101,26 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_datadir}/%{name}/{firmware,crd},/lib/udev/rules.d} + +%{__make} install-prog \ + PREFIX=$RPM_BUILD_ROOT%{_prefix} \ + MANDIR=$RPM_BUILD_ROOT%{_mandir} \ + UDEVBIN=$RPM_BUILD_ROOT%{_bindir} + +%{__make} install-man \ + PREFIX=$RPM_BUILD_ROOT%{_prefix} \ + MANDIR=$RPM_BUILD_ROOT%{_mandir} + +install -p hplj1000 $RPM_BUILD_ROOT%{_bindir}/hplj10xx +cp -p hplj10xx.rules $RPM_BUILD_ROOT/lib/udev/rules.d/11-hplj10xx.rules -install -d $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_bindir} -install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{firmware,crd} -install -d $RPM_BUILD_ROOT/etc/udev/rules.d -install -d $RPM_BUILD_ROOT%{_mandir}/man1 -%{__make} install-prog PREFIX="$RPM_BUILD_ROOT%{_prefix}" MANDIR="$RPM_BUILD_ROOT%{_mandir}" UDEVBIN="$RPM_BUILD_ROOT%{_bindir}" -%{__make} install-man PREFIX="$RPM_BUILD_ROOT%{_prefix}" MANDIR="$RPM_BUILD_ROOT%{_mandir}" - -install hplj1000 $RPM_BUILD_ROOT%{_bindir}/hplj10xx -install hplj10xx.rules $RPM_BUILD_ROOT/etc/udev/rules.d/11-hplj10xx.rules - -install %{SOURCE1} . -install %{SOURCE2} . -install %{SOURCE3} . -install %{SOURCE4} . -install %{SOURCE5} . for i in sihp1000 sihp1005 sihpP1006 sihp1018 sihp1020; do - tar -xf $i.tar.gz --use=gzip - rm $i.tar.gz ./arm2hpdl $i.img > $i.dl - install $i.dl $RPM_BUILD_ROOT%{_datadir}/%{name}/firmware + cp -p $i.dl $RPM_BUILD_ROOT%{_datadir}/%{name}/firmware done -install *.ps $RPM_BUILD_ROOT%{_datadir}/%{name} -install crd/zjs/*.{crd,ps} \ +cp -p *.ps $RPM_BUILD_ROOT%{_datadir}/%{name} +cp -p crd/zjs/*.{crd,ps} \ $RPM_BUILD_ROOT%{_datadir}/%{name}/crd %clean @@ -136,7 +132,37 @@ %files %defattr(644,root,root,755) %doc ChangeLog README manual.pdf -%attr(755,root,root) %{_bindir}/* +%attr(755,root,root) %{_bindir}/arm2hpdl +%attr(755,root,root) %{_bindir}/foo2hiperc +%attr(755,root,root) %{_bindir}/foo2hiperc-wrapper +%attr(755,root,root) %{_bindir}/foo2hp +%attr(755,root,root) %{_bindir}/foo2hp2600-wrapper +%attr(755,root,root) %{_bindir}/foo2lava +%attr(755,root,root) %{_bindir}/foo2lava-wrapper +%attr(755,root,root) %{_bindir}/foo2oak +%attr(755,root,root) %{_bindir}/foo2oak-wrapper +%attr(755,root,root) %{_bindir}/foo2qpdl +%attr(755,root,root) %{_bindir}/foo2qpdl-wrapper +%attr(755,root,root) %{_bindir}/foo2slx +%attr(755,root,root) %{_bindir}/foo2slx-wrapper +%attr(755,root,root) %{_bindir}/foo2xqx +%attr(755,root,root) %{_bindir}/foo2xqx-wrapper +%attr(755,root,root) %{_bindir}/foo2zjs +%attr(755,root,root) %{_bindir}/foo2zjs-pstops +%attr(755,root,root) %{_bindir}/foo2zjs-wrapper +%attr(755,root,root) %{_bindir}/gipddecode +%attr(755,root,root) %{_bindir}/hbpldecode +%attr(755,root,root) %{_bindir}/hipercdecode +%attr(755,root,root) %{_bindir}/hplj10xx +%attr(755,root,root) %{_bindir}/lavadecode +%attr(755,root,root) %{_bindir}/oakdecode +%attr(755,root,root) %{_bindir}/opldecode +%attr(755,root,root) %{_bindir}/printer-profile +%attr(755,root,root) %{_bindir}/qpdldecode +%attr(755,root,root) %{_bindir}/slxdecode +%attr(755,root,root) %{_bindir}/usb_printerid +%attr(755,root,root) %{_bindir}/xqxdecode +%attr(755,root,root) %{_bindir}/zjsdecode %dir %{_datadir}/%{name} %{_datadir}/%{name}/*.ps %{_datadir}/%{name}/crd @@ -148,7 +174,7 @@ %files udev-rules %defattr(644,root,root,755) -/etc/udev/rules.d/11-hplj10xx.rules +/lib/udev/rules.d/11-hplj10xx.rules %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -156,6 +182,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.12 2012/05/07 12:14:36 glen +- up to 20120504 tarball, JBIG1 NOW PATENT FREE worldwide +- use /lib/udev for udev rules +- verbose files in bindir +- use versioned tarballs and builddir +- general unification and cleanups + Revision 1.11 2011/11/30 12:48:15 arekm - up to 20111123 @@ -163,7 +196,7 @@ - added P1006 Revision 1.9 2008/09/26 17:58:19 marcus -i- up to 26092008 +- up to 26092008 Revision 1.8 2008/09/26 17:31:11 marcus - use make install ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/foo2zjs/foo2zjs.spec?r1=1.11&r2=1.12 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
