Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cups for openSUSE:Factory checked in at 2022-07-26 19:42:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cups (Old) and /work/SRC/openSUSE:Factory/.cups.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cups" Tue Jul 26 19:42:46 2022 rev:164 rq:990986 version:2.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cups/cups.changes 2022-06-03 14:16:32.317306527 +0200 +++ /work/SRC/openSUSE:Factory/.cups.new.1533/cups.changes 2022-07-26 19:42:58.753204145 +0200 @@ -1,0 +2,5 @@ +Sat Jul 9 12:32:40 UTC 2022 - Callum Farmer <[email protected]> + +- Move the dbus-1 system.d file to /usr (bsc#1201346) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups.spec ++++++ --- /var/tmp/diff_new_pack.14Egmn/_old 2022-07-26 19:42:59.425100320 +0200 +++ /var/tmp/diff_new_pack.14Egmn/_new 2022-07-26 19:42:59.429099702 +0200 @@ -25,6 +25,16 @@ # _tmpfilesdir is not defined in systemd macros up to openSUSE 13.2 %{!?_tmpfilesdir: %global _tmpfilesdir /usr/lib/tmpfiles.d } + +# dbus too old in SLE 12 +%if 0%{?suse_version} < 1500 +%define dbus_dir %{_sysconfdir}/dbus-1 +%define dbus_config %config +%else +%define dbus_dir %{_datadir}/dbus-1 +%define dbus_config %nil +%endif + Name: cups # CUPS beta version numbers like "2.3b6" can be used as is because # "zypper vcmp 2.3.b99 2.3.0" shows "2.3.b99 is older than 2.3.0" and @@ -379,7 +389,7 @@ make %{?_smp_mflags} %install -make BUILDROOT=%{buildroot} install +make BUILDROOT=%{buildroot} DBUSDIR=%{dbus_dir} install # Make directory for ssl files: mkdir -p %{buildroot}%{_sysconfdir}/cups/ssl # Add a client.conf as template (Source108: cups-client.conf): @@ -581,7 +591,7 @@ %config(noreplace) %attr(640,root,lp) %{_sysconfdir}/cups/cupsd.conf %config(noreplace) %attr(640,root,lp) %{_sysconfdir}/cups/snmp.conf %config %{_sysconfdir}/pam.d/cups -%config %{_sysconfdir}/dbus-1/system.d/cups.conf +%dbus_config %{dbus_dir}/system.d/cups.conf %config %{_sysconfdir}/cups/cupsd.conf.default %config %{_sysconfdir}/cups/cups-files.conf.default %config %{_sysconfdir}/cups/snmp.conf.default
