From 3c0a0fd2433b539de05bc715543fa804544e7b8816afbbdaba805bf6d9de65a7 Mon Sep 17 00:00:00 2001
From: Johannes Meixner <jsmeix@suse.com>
Date: Fri, 22 Jul 2022 10:55:37 +0000
Subject: [PATCH 1/2] Accepting request 988020 from home:gmbr3:Active

- Move the dbus-1 system.d file to /usr (bsc#1201346)

OBS-URL: https://build.opensuse.org/request/show/988020
OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=389
---
 cups.changes | 5 +++++
 cups.spec    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/cups.changes b/cups.changes
index 7e3b197..d537155 100644
--- a/cups.changes
+++ b/cups.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jul  9 12:32:40 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
+
+- Move the dbus-1 system.d file to /usr (bsc#1201346)
+
 -------------------------------------------------------------------
 Mon May 30 08:12:20 UTC 2022 - jsmeix@suse.de
 
diff --git a/cups.spec b/cups.spec
index 3d61a0d..b675620 100644
--- a/cups.spec
+++ b/cups.spec
@@ -379,7 +379,7 @@ export CC=cc
 make %{?_smp_mflags}
 
 %install
-make BUILDROOT=%{buildroot} install
+make BUILDROOT=%{buildroot} DBUSDIR=%{_datadir}/dbus-1 install
 # Make directory for ssl files:
 mkdir -p %{buildroot}%{_sysconfdir}/cups/ssl
 # Add a client.conf as template (Source108: cups-client.conf):
@@ -581,7 +581,7 @@ exit 0
 %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
+%{_datadir}/dbus-1/system.d/cups.conf
 %config %{_sysconfdir}/cups/cupsd.conf.default
 %config %{_sysconfdir}/cups/cups-files.conf.default
 %config %{_sysconfdir}/cups/snmp.conf.default

From 19a73f0683169459292b06787ee35ba5ca58467127622baff21acc702c60b3f4 Mon Sep 17 00:00:00 2001
From: Johannes Meixner <jsmeix@suse.com>
Date: Mon, 25 Jul 2022 09:23:52 +0000
Subject: [PATCH 2/2] Accepting request 990800 from home:gmbr3:Active

fix SLE 12

OBS-URL: https://build.opensuse.org/request/show/990800
OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=390
---
 cups.spec | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/cups.spec b/cups.spec
index b675620..9c6a22c 100644
--- a/cups.spec
+++ b/cups.spec
@@ -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 @@ export CC=cc
 make %{?_smp_mflags}
 
 %install
-make BUILDROOT=%{buildroot} DBUSDIR=%{_datadir}/dbus-1 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 @@ exit 0
 %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
-%{_datadir}/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