From 43d7af687eeb27121f8b33a834f0025695bc8e4d239a98c321a98eca1f20d144 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Tue, 20 Apr 2010 15:02:40 +0000 Subject: [PATCH] Accepting request 38364 from home:jsmeix:branches:Printing Copy from home:jsmeix:branches:Printing/cups via accept of submit request 38364 revision 2. Request was accepted with message: Adapted cups.xinetd to work with upstream compliant CUPS 1.4 on all platforms (bnc#575544) OBS-URL: https://build.opensuse.org/request/show/38364 OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=188 --- cups.changes | 8 ++++++++ cups.spec | 14 +++++++------- cups.xinetd | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/cups.changes b/cups.changes index c0523cc..d0d2f52 100644 --- a/cups.changes +++ b/cups.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Apr 20 15:53:26 CEST 2010 - jsmeix@suse.de + +- In cups.xinetd replaced '@LIB@' by '/usr/lib' and removed + the perl substitute calls regarding '@LIB@' in cups.spec because + since the upstream compliant CUPS 1.4 it is '/usr/lib/cups/' + on all platforms (see Novell/Suse Bugzilla bnc#575544). + ------------------------------------------------------------------- Wed Mar 31 12:52:02 CEST 2010 - jsmeix@suse.de diff --git a/cups.spec b/cups.spec index 8afb046..3faa62c 100644 --- a/cups.spec +++ b/cups.spec @@ -236,11 +236,10 @@ make BUILDROOT=$RPM_BUILD_ROOT install install -d -m755 $RPM_BUILD_ROOT/etc/init.d # Source101: cups.init install -m755 %{SOURCE101} $RPM_BUILD_ROOT/etc/init.d/cups -install -d -m755 $RPM_BUILD_ROOT/var/adm/fillup-templates -# Source103: cups.sysconfig -install -m 644 %{SOURCE103} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.cups -perl -pi -e "s:\@LIB\@:%{_libdir}:g" $RPM_BUILD_ROOT/etc/init.d/cups ln -sf ../../etc/init.d/cups $RPM_BUILD_ROOT/usr/sbin/rccups +# Source103: cups.sysconfig +install -d -m755 $RPM_BUILD_ROOT/var/adm/fillup-templates +install -m 644 %{SOURCE103} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.cups # Use Ghostscript fonts instead of CUPS fonts: rm -r $RPM_BUILD_ROOT/usr/share/cups/fonts mkdir -p $RPM_BUILD_ROOT/usr/share/ghostscript/fonts @@ -249,11 +248,11 @@ ln -sf /usr/share/ghostscript/fonts $RPM_BUILD_ROOT/usr/share/cups/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cups/ssl # Add a client.conf as template (Source108: cups-client.conf): install -m644 %{SOURCE108} $RPM_BUILD_ROOT%{_sysconfdir}/cups/client.conf -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d +# Add D-BUS Configuration: install -m 644 -D packaging/cups-dbus.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/cups.conf # Source104: cups.xinetd +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d install -m 644 -D %{SOURCE104} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/cups-lpd -perl -pi -e "s:\@LIB\@:%{_libdir}:g" $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/cups-lpd # Make the libraries accessible also via generic named links: ln -sf libcupsimage.so.2 $RPM_BUILD_ROOT%{_libdir}/libcupsimage.so ln -sf libcups.so.2 $RPM_BUILD_ROOT%{_libdir}/libcups.so @@ -344,7 +343,7 @@ exit 0 # installed in the build system regardless of an explicite # configure setting ' --with-pdftops=/usr/bin/pdftops', # see also http://www.cups.org/str.php?L3278). -# When all mandatory files are explicitely listed. +# When all mandatory files are explicitely listed, # the build fails intentionally if a mandatory file was not built # which ensures that already existing correctly built binary RPMs # are not overwritten by broken RPMs where mandatory files are missing. @@ -538,3 +537,4 @@ exit 0 %doc %{_mandir}/man1/cups-config.1.gz %changelog + diff --git a/cups.xinetd b/cups.xinetd index 0728c59..6b7caa2 100644 --- a/cups.xinetd +++ b/cups.xinetd @@ -6,6 +6,6 @@ service printer protocol = tcp wait = no user = lp - server = @LIB@/cups/daemon/cups-lpd + server = /usr/lib/cups/daemon/cups-lpd server_args = cups-lpd -o document-format=application/octet-stream }