Hello community, here is the log from the commit of package cups for openSUSE:12.3 checked in at 2013-02-07 10:00:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/cups (Old) and /work/SRC/openSUSE:12.3/.cups.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cups", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.3/cups/cups.changes 2013-01-31 01:14:37.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.cups.new/cups.changes 2013-02-07 10:00:59.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Jan 30 13:24:43 UTC 2013 - [email protected] + +- Move everything (pid, lock, socket files) to /run only for 12.3. + Added: cups-move-everything-to-run.patch + See also + http://lists.opensuse.org/opensuse-factory/2013-01/msg00578.html + +------------------------------------------------------------------- New: ---- cups-move-everything-to-run.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups.spec ++++++ --- /var/tmp/diff_new_pack.yQjk3o/_old 2013-02-07 10:01:00.000000000 +0100 +++ /var/tmp/diff_new_pack.yQjk3o/_new 2013-02-07 10:01:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cups # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -151,6 +151,17 @@ Patch106: cups-config-libs.patch # Patch107 provides cupsd.service in cups.service Patch107: cups-provides-cupsd-service.patch +# Patch108 cups-move-everything-to-run.patch (move pid, socket and lock files to /run) +# Explanation that I got via mail from Robert Milasan (quotation): +# the changes are due to systemd. Systemd needs /run and in our case +# openSUSE we bind /run to /var/run which at boot time can created +# issues, meaning /var/run is used before being binded to /run. +# All apps should use /run and /run/lock instead of /var/run and /var/lock. +# In other distro's they links /run to /var/run and /run/lock +# to /var/lock, but we don't, so it's better to move everything +# and yes upstream should do the same. Please also check: +# http://lists.opensuse.org/opensuse-factory/2013-01/msg00578.html +Patch108: cups-move-everything-to-run.patch # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -289,6 +300,10 @@ %patch106 # Patch107 provides cupsd.service in cups.service %patch107 -p1 +%if %suse_version > 1220 +# Patch108 moves everything to /run +%patch108 -p1 +%endif %build # Disable SILENT run of make so that make runs verbose as usual: @@ -341,6 +356,10 @@ # 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 +%if %suse_version > 1220 +sed -i -e 's|/var/run|/run|g' $RPM_BUILD_ROOT/etc/init.d/cups +sed -i -e 's|/var/lock|/run/lock|g' $RPM_BUILD_ROOT/etc/init.d/cups +%endif # 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 @@ -352,6 +371,9 @@ 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 +%if %suse_version > 1220 +sed -i -e 's|/var/run|/run|g' $RPM_BUILD_ROOT%{_sysconfdir}/cups/client.conf +%endif # Source104: cups.xinetd mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d install -m 644 -D %{SOURCE104} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/cups-lpd ++++++ cups-move-everything-to-run.patch ++++++ Index: cups-1.5.4/config.h.in =================================================================== --- cups-1.5.4.orig/config.h.in +++ cups-1.5.4/config.h.in @@ -131,7 +131,7 @@ #define CUPS_SBINDIR "/usr/sbin" #define CUPS_SERVERBIN "/usr/lib/cups" #define CUPS_SERVERROOT "/etc/cups" -#define CUPS_STATEDIR "/var/run/cups" +#define CUPS_STATEDIR "/run/cups" /* Index: cups-1.5.4/configure =================================================================== --- cups-1.5.4.orig/configure +++ cups-1.5.4/configure @@ -6424,7 +6424,7 @@ case "$uname" in ;; *) # All others - CUPS_STATEDIR="$localstatedir/run/cups" + CUPS_STATEDIR="/run/cups" ;; esac cat >>confdefs.h <<_ACEOF -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
