diff --git a/foo2zjs.spec b/foo2zjs.spec index 0dfd654..805b59f 100644 --- a/foo2zjs.spec +++ b/foo2zjs.spec @@ -1,7 +1,7 @@ # TODO: this package has to be splitted in foo2zjs, foo2hp, foo2xqx, foo2lava, foo2qpdl, foo2slx, foo2hiperc and foo2oak Name: foo2zjs -Version: 20141008 +Version: 20150102 Release: 1mamba Summary: A linux printer driver for ZjStream protocol Group: System/Spooling @@ -40,7 +40,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: glibc-devel BuildRequires: libcups-devel ## AUTOBUILDREQ-END -BuildRequires: foomatic-db +#BuildRequires: foomatic-db #BuildRequires: foomatic-filters BuildRequires: vim Requires(post):foomatic @@ -54,16 +54,16 @@ unzip -qoj %{S:8} "*.icm" unzip -qoj %{S:9} "*.icm" %patch0 -p1 %patch1 -p1 -sed -i "s|/etc/hotplug/usb/|/%{_lib}/udev/foo2zjs/|" hplj10xx.rules +sed -i "s|/etc/hotplug/usb/|/lib/udev/foo2zjs/|" hplj10xx.rules %build -%make \ +%make -j1 \ CC=%{_host}-gcc \ USBDIR=/lib/udev/foo2zjs/ %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -mkdir -p %{buildroot}{%{_bindir},/%{_lib}/udev/foo2zjs} +mkdir -p %{buildroot}{%{_bindir},/lib/udev/foo2zjs} #mkdir -p %{buildroot}%{_datadir}/ppd mkdir -p %{buildroot}%{_datadir}/foomatic/db/source/driver mkdir -p %{buildroot}%{_datadir}/foomatic/db/source/printer @@ -77,10 +77,13 @@ mkdir -p %{buildroot}/lib/udev/rules.d UDEVDIR=%{buildroot}/lib/udev/rules.d/ \ USBDIR=%{buildroot}/lib/udev/foo2zjs/ -rpm -ql foomatic-db | grep foomatic/db/source | \ -while read line; do - [ -e %{buildroot}/$line ] && rm -f %{buildroot}/$line || true -done +#rpm -ql foomatic-db | grep foomatic/db/source | \ +#while read line; do +# if [ -e %{buildroot}/$line ]; then +# echo "Deleting $line provided by foomatic-db" +# rm -f %{buildroot}/$line || true +# fi +#done %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -152,6 +155,10 @@ fi # ChangeLog README README.in %changelog +* Fri Jan 02 2015 Silvan Calarco 20150102-1mamba +- update to 20150102 +- don't exclude files provided by foomatic-db but do the reverse thing + * Thu Nov 06 2014 Silvan Calarco 20141008-1mamba - update to 20141008