diff --git a/foomatic.spec b/foomatic.spec index 0dc8987..c700369 100644 --- a/foomatic.spec +++ b/foomatic.spec @@ -3,6 +3,8 @@ %define filtersver 3.0.2 %define hpijsver 1.5-20041124 +%define with_omni 1 + Summary: Foomatic printer database. Name: foomatic Version: 3.0.2 @@ -129,8 +131,10 @@ pushd foomatic-db-%{dbver} %patch7 -p1 -b .ppdload-ppd %patch8 -p1 -b .hplj5 +%if %with_omni # Omni printers tar xjf %{SOURCE4} +%endif # Gimp-print-4.2.0 driver info rm db/source/driver/stp.xml @@ -192,6 +196,7 @@ make DESTDIR=%buildroot PREFIX=%{_prefix} \ INSTALLSITEARCH=$RPM_BUILD_ROOT/$installvendorarch \ install +%if %with_omni # Install printers from the Omni project, if there isn't already an entry cd Omni-printers P_DIR=$RPM_BUILD_ROOT/usr/share/foomatic/db/source/printer @@ -202,6 +207,8 @@ for P in *.xml; do fi; done; cd .. +%endif + popd pushd foomatic-db-hpijs-%{hpijsver} @@ -269,6 +276,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name} %{_mandir}/*/* %changelog +* Wed Mar 9 2005 Tim Waugh +- Make Omni optional. + * Wed Mar 2 2005 Tim Waugh 3.0.2-16 - Rebuild for new GCC.