diff --git a/cups.spec b/cups.spec index bc24254..0d98b7d 100644 --- a/cups.spec +++ b/cups.spec @@ -8,7 +8,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.4.7 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: System Environment/Daemons Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -31,6 +31,7 @@ Source8: cups.cron # Filter and PPD for textonly printing Source9: textonly.filter Source10: textonly.ppd +Source11: macros.cups Patch1: cups-no-gzip-man.patch Patch2: cups-1.1.16-system-auth.patch Patch3: cups-multilib.patch @@ -352,6 +353,10 @@ install -c -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/cups/model/textonly.ppd install -c -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{cups_serverbin}/filter %endif +# Ship an rpm macro for where to put driver executables. +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ +install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ + # Ship a printers.conf file, and a client.conf file. That way, they get # their SELinux file contexts set correctly. touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/printers.conf @@ -557,6 +562,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/cups-config %{_libdir}/*.so %{_includedir}/cups +%{_sysconfdir}/rpm/macros.cups %files lpd %defattr(-,root,root) @@ -571,6 +577,9 @@ rm -rf $RPM_BUILD_ROOT %{php_extdir}/phpcups.so %changelog +* Fri Jul 15 2011 Tim Waugh 1:1.4.7-7 +- Ship an rpm macro for where to put driver executables. + * Wed Jul 13 2011 Tim Waugh 1:1.4.7-6 - Avoid busy loop in cups-polld (bug #720921). diff --git a/macros.cups b/macros.cups new file mode 100644 index 0000000..5b560d9 --- /dev/null +++ b/macros.cups @@ -0,0 +1 @@ +%_cups_serverbin %(/usr/bin/cups-config --serverbin)