From 559442c3123098056903a36a42f7e9a6f43b60312363501185df21443b1ef6bd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 23 Oct 2012 20:22:00 +0000 Subject: [PATCH 1/2] Accepting request 138781 from openSUSE:Factory:Staging:Systemd - buildrequire systemd by pkgconfig provide to prefer -mini OBS-URL: https://build.opensuse.org/request/show/138781 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=89 --- avahi-glib2.spec | 4 ++-- avahi-mono.spec | 4 ++-- avahi-qt4.spec | 4 ++-- avahi.changes | 5 +++++ avahi.spec | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 1ec3f7f..3f0f217 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -110,7 +110,7 @@ BuildRequires: graphviz BuildRequires: python-gdbm BuildRequires: zlib-devel %if %suse_version >= 1210 -BuildRequires: systemd-devel +BuildRequires: pkgconfig(systemd) %endif # For python bindings and utilities: #BuildRequires: dbus-1-python @@ -1050,7 +1050,7 @@ fi %{_sysconfdir}/avahi/avahi-autoipd.action %dir %{_sysconfdir}/avahi/services %{_sysconfdir}/avahi/services/*.service -%{_sysconfdir}/avahi/hosts +%config(noreplace) %{_sysconfdir}/avahi/hosts %{_sysconfdir}/dbus-1/system.d/*.conf %{_sysconfdir}/init.d/avahi-dnsconfd %{_sysconfdir}/init.d/avahi-daemon diff --git a/avahi-mono.spec b/avahi-mono.spec index e4de7ae..bd7f98f 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -110,7 +110,7 @@ BuildRequires: graphviz BuildRequires: python-gdbm BuildRequires: zlib-devel %if %suse_version >= 1210 -BuildRequires: systemd-devel +BuildRequires: pkgconfig(systemd) %endif # For python bindings and utilities: #BuildRequires: dbus-1-python @@ -1049,7 +1049,7 @@ fi %{_sysconfdir}/avahi/avahi-autoipd.action %dir %{_sysconfdir}/avahi/services %{_sysconfdir}/avahi/services/*.service -%{_sysconfdir}/avahi/hosts +%config(noreplace) %{_sysconfdir}/avahi/hosts %{_sysconfdir}/dbus-1/system.d/*.conf %{_sysconfdir}/init.d/avahi-dnsconfd %{_sysconfdir}/init.d/avahi-daemon diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 43107e5..c5458ff 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -110,7 +110,7 @@ BuildRequires: graphviz BuildRequires: python-gdbm BuildRequires: zlib-devel %if %suse_version >= 1210 -BuildRequires: systemd-devel +BuildRequires: pkgconfig(systemd) %endif # For python bindings and utilities: #BuildRequires: dbus-1-python @@ -1052,7 +1052,7 @@ fi %{_sysconfdir}/avahi/avahi-autoipd.action %dir %{_sysconfdir}/avahi/services %{_sysconfdir}/avahi/services/*.service -%{_sysconfdir}/avahi/hosts +%config(noreplace) %{_sysconfdir}/avahi/hosts %{_sysconfdir}/dbus-1/system.d/*.conf %{_sysconfdir}/init.d/avahi-dnsconfd %{_sysconfdir}/init.d/avahi-daemon diff --git a/avahi.changes b/avahi.changes index bc5d919..7524240 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 16 11:37:56 UTC 2012 - coolo@suse.com + +- buildrequire systemd by pkgconfig provide to prefer -mini + ------------------------------------------------------------------- Wed Oct 3 15:20:32 UTC 2012 - schwab@linux-m68k.org diff --git a/avahi.spec b/avahi.spec index 34aced1..8a494c9 100644 --- a/avahi.spec +++ b/avahi.spec @@ -112,7 +112,7 @@ BuildRequires: graphviz BuildRequires: python-gdbm BuildRequires: zlib-devel %if %suse_version >= 1210 -BuildRequires: systemd-devel +BuildRequires: pkgconfig(systemd) %endif # For python bindings and utilities: #BuildRequires: dbus-1-python From de8219715116366ac2756456286dfbc1b142b6098589c905c23107ecd0eb0bf4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 23 Oct 2012 20:23:44 +0000 Subject: [PATCH 2/2] Accepting request 139124 from home:dimstar:branches:GNOME:Factory twea OBS-URL: https://build.opensuse.org/request/show/139124 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=90 --- avahi.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/avahi.changes b/avahi.changes index 7524240..36ed62f 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Tue Oct 16 11:37:56 UTC 2012 - coolo@suse.com -- buildrequire systemd by pkgconfig provide to prefer -mini +- Replace systemd-devel BuildRequires with pkgconfig(systemd) + to prefer the -mini package, avoiding build cycles. ------------------------------------------------------------------- Wed Oct 3 15:20:32 UTC 2012 - schwab@linux-m68k.org