From 43d7af687eeb27121f8b33a834f0025695bc8e4d239a98c321a98eca1f20d144 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Tue, 20 Apr 2010 15:02:40 +0000 Subject: [PATCH 1/4] 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 } From 7a77500b0f2f2d5247963354559409105486acb173d96c4364f429588df7dfd4 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Tue, 27 Apr 2010 08:56:55 +0000 Subject: [PATCH 2/4] Accepting request 38920 from home:jsmeix:branches:Printing Copy from home:jsmeix:branches:Printing/cups via accept of submit request 38920 revision 2. Request was accepted with message: OBS-URL: https://build.opensuse.org/request/show/38920 OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=189 --- cups-krb5-config | 5 ----- cups.changes | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 cups-krb5-config diff --git a/cups-krb5-config b/cups-krb5-config deleted file mode 100644 index b6ab14b..0000000 --- a/cups-krb5-config +++ /dev/null @@ -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' diff --git a/cups.changes b/cups.changes index d0d2f52..5193ddd 100644 --- a/cups.changes +++ b/cups.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 From 474c9cb44bfb8072b3399cfe6badd0c04673fb5424d290efc519f51c3d0ffe3b Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 28 Apr 2010 20:21:37 +0000 Subject: [PATCH 3/4] Accepting request 38923 from Printing checked in (request 38923) OBS-URL: https://build.opensuse.org/request/show/38923 OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=190 --- cups-krb5-config | 5 +++++ cups.changes | 15 --------------- cups.spec | 12 ++++++------ cups.xinetd | 2 +- 4 files changed, 12 insertions(+), 22 deletions(-) create mode 100644 cups-krb5-config diff --git a/cups-krb5-config b/cups-krb5-config new file mode 100644 index 0000000..b6ab14b --- /dev/null +++ b/cups-krb5-config @@ -0,0 +1,5 @@ +#!/bin/bash + +unset CFLAGS +/usr/lib/mit/bin/krb5-config ${1+"$@"} | \ + sed -r -e 's/-W[^[:blank:]]+//g' -e 's/-L[^[:blank:]]+//g' diff --git a/cups.changes b/cups.changes index 5193ddd..c0523cc 100644 --- a/cups.changes +++ b/cups.changes @@ -1,18 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/cups.spec b/cups.spec index 3faa62c..8afb046 100644 --- a/cups.spec +++ b/cups.spec @@ -236,10 +236,11 @@ 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 -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 +# 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 # 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 @@ -248,11 +249,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 -# Add D-BUS Configuration: +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d 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 @@ -343,7 +344,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. @@ -537,4 +538,3 @@ exit 0 %doc %{_mandir}/man1/cups-config.1.gz %changelog - diff --git a/cups.xinetd b/cups.xinetd index 6b7caa2..0728c59 100644 --- a/cups.xinetd +++ b/cups.xinetd @@ -6,6 +6,6 @@ service printer protocol = tcp wait = no user = lp - server = /usr/lib/cups/daemon/cups-lpd + server = @LIB@/cups/daemon/cups-lpd server_args = cups-lpd -o document-format=application/octet-stream } From 188e92882f9e31e9e238dc78da7e9d5a157e4f0a01ab1363d4975fdc37d49d82 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 28 Apr 2010 20:21:38 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/cups revision 72.0 OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=2c6b47b7e1f6e4d44219ba06bb3bc08d --- cups-krb5-config | 5 ----- cups.changes | 15 +++++++++++++++ cups.spec | 17 ++++++++--------- cups.xinetd | 2 +- 4 files changed, 24 insertions(+), 15 deletions(-) delete mode 100644 cups-krb5-config diff --git a/cups-krb5-config b/cups-krb5-config deleted file mode 100644 index b6ab14b..0000000 --- a/cups-krb5-config +++ /dev/null @@ -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' diff --git a/cups.changes b/cups.changes index c0523cc..5193ddd 100644 --- a/cups.changes +++ b/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 diff --git a/cups.spec b/cups.spec index 8afb046..393396d 100644 --- a/cups.spec +++ b/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. 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 }