- Make Omni optional.

This commit is contained in:
Tim Waugh 2005-03-09 12:39:21 +00:00
parent b9242fdafc
commit f7b28f1b01
1 changed files with 10 additions and 0 deletions

View File

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