Hello community, here is the log from the commit of package cups for openSUSE:Factory checked in at 2013-10-09 14:17:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cups (Old) and /work/SRC/openSUSE:Factory/.cups.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cups" Changes: -------- --- /work/SRC/openSUSE:Factory/cups/cups.changes 2013-07-09 20:48:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cups.new/cups.changes 2013-10-09 14:17:51.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Oct 9 04:15:45 UTC 2013 - crrodrig...@opensuse.org + +- patch cups-move-everything-to-run.patch missed to move + CUPS_STATEDIR to run, so systemd sockets are still created + in /var/run +- Add required tmpfiles.d config snippet to ensure /run/cups + is always available. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups.spec ++++++ --- /var/tmp/diff_new_pack.tfdtJh/_old 2013-10-09 14:17:53.000000000 +0200 +++ /var/tmp/diff_new_pack.tfdtJh/_new 2013-10-09 14:17:53.000000000 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: cups BuildRequires: dbus-1-devel BuildRequires: fdupes @@ -45,6 +46,8 @@ BuildRequires: pkgconfig(systemd) %{?systemd_requires} %define have_systemd 1 +#may not be defined in older systemd macros.. +%{!?_tmpfilesdir: %global _tmpfilesdir /usr/lib/tmpfiles.d } %endif # The "BuildRequires: poppler-tools" installs /usr/bin/pdftops for the # check in config-scripts/cups-pdf.m4 regarding HAVE_PDFTOPS_WITH_ORIGPAGESIZE @@ -447,6 +450,17 @@ sed -i -e 's/^# Sample configuration /# Configuration /' $RPM_BUILD_ROOT/%{_sysconfdir}/cups/cupsd.conf grep -q '^# Sample configuration ' $RPM_BUILD_ROOT/%{_sysconfdir}/cups/cupsd.conf.default sed -i -e 's/^# Sample configuration /# Default configuration /' $RPM_BUILD_ROOT/%{_sysconfdir}/cups/cupsd.conf.default + +%if 0%{?have_systemd} +# install /usr/lib/tmpfiles.d/cups.conf +mkdir -p ${RPM_BUILD_ROOT}%{_tmpfilesdir} +cat > ${RPM_BUILD_ROOT}%{_tmpfilesdir}/cups.conf <<EOF +# See tmpfiles.d(5) for details +d /run/cups 0755 root lp - +d /run/cups/certs 0511 lp sys - +d /var/spool/cups/tmp - - - 30d +EOF +%endif # Run fdupes: %fdupes $RPM_BUILD_ROOT @@ -597,6 +611,7 @@ %{_unitdir}/cups.path %{_unitdir}/cups.service %{_unitdir}/cups.socket +%{_tmpfilesdir}/cups.conf %endif %files client ++++++ cups-move-everything-to-run.patch ++++++ --- /var/tmp/diff_new_pack.tfdtJh/_old 2013-10-09 14:17:53.000000000 +0200 +++ /var/tmp/diff_new_pack.tfdtJh/_new 2013-10-09 14:17:53.000000000 +0200 @@ -1,5 +1,3 @@ -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 @@ @@ -11,8 +9,6 @@ /* -Index: cups-1.5.4/configure -=================================================================== --- cups-1.5.4.orig/configure +++ cups-1.5.4/configure @@ -6424,7 +6424,7 @@ case "$uname" in @@ -24,3 +20,14 @@ ;; esac cat >>confdefs.h <<_ACEOF +--- cups-1.5.4.orig/config-scripts/cups-directories.m4 ++++ cups-1.5.4/config-scripts/cups-directories.m4 +@@ -429,7 +429,7 @@ case "$uname" in + ;; + *) + # All others +- CUPS_STATEDIR="$localstatedir/run/cups" ++ CUPS_STATEDIR="/run/cups" + ;; + esac + AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR") -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
