Accepting request 38923 from Printing

Copy from Printing/cups based on submit request 38923 from user jsmeix

OBS-URL: https://build.opensuse.org/request/show/38923
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cups?expand=0&rev=72

cups-krb5-config

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-unset CFLAGS
-/usr/lib/mit/bin/krb5-config ${1+"$@"} | \
-	sed -r -e 's/-W[^[:blank:]]+//g' -e 's/-L[^[:blank:]]+//g' 

cups.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Apr 27 09:40:34 CEST 2010 - jsmeix@suse.de
+
+- cups-krb5-config wrapper script for krb5-config is no longer
+  needed because since April 2008 krb5-config works correctly
+  (see Novell/Suse Bugzilla bnc#378270 and compare STR #3556).
+
+-------------------------------------------------------------------
+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
 

cups.spec

@@ -26,11 +26,11 @@ BuildRequires:  fdupes update-desktop-files
 PreReq:         textutils, fileutils, sh-utils, %insserv_prereq,
 PreReq:         %fillup_prereq /usr/sbin/groupadd
 Url:            http://www.cups.org/
-License:        GPLv2+
+License:        GPLv2+ ; LGPLv2.1+
 Group:          Hardware/Printing
 Summary:        The Common UNIX Printing System
 Version:        1.4.3
-Release:        1
+Release:        2
 # Require the exact matching version-release of the cups-libs sub-package because
 # non-matching CUPS libraries may let CUPS software crash (e.g. segfault)
 # because all CUPS software is built from the one same CUPS source tar ball
@@ -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.

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 
 }