From abde4125bbe50791254baeaed0bd50261718b29219788c26889464361b4dd8cc Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 19 Oct 2015 10:12:06 +0000 Subject: [PATCH] Accepting request 339789 from home:Zaitor:branches:GNOME:Factory Does this look sane to y'all? OBS-URL: https://build.opensuse.org/request/show/339789 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=120 --- avahi-glib2.spec | 6 ++++-- avahi-mono.spec | 6 ++++-- avahi-qt4.spec | 6 ++++-- avahi.changes | 6 ++++++ avahi.spec | 6 ++++-- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 9a1ba53..3beb6e7 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -143,8 +143,9 @@ Obsoletes: mDNSResponder-64bit # mDNSResponder was used for <= 10.2: Provides: mDNSResponder = 107.5 Obsoletes: mDNSResponder < 107.5 +# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for service-types.db openSUSE <= 12.3 SLE <= 11SP2 -Conflicts: avahi-utils <= 0.6.31-9.2 +#Conflicts: avahi-utils <= 0.6.31-9.2 %endif %if %build_glib2 BuildRequires: gobject-introspection-devel @@ -332,8 +333,9 @@ Summary: IPv4LL Service for Zeroconf and Bonjour Group: Productivity/Networking/Other # Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11. Provides: avahi:%{_sbindir}/avahi-autoipd +# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11 -Conflicts: avahi <= 0.6.31-9.2 +#Conflicts: avahi <= 0.6.31-9.2 # coreutils contains /usr/bin/chown Requires(post): coreutils # shadow contains useradd and groupadd diff --git a/avahi-mono.spec b/avahi-mono.spec index f23fbb4..55d74a2 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -143,8 +143,9 @@ Obsoletes: mDNSResponder-64bit # mDNSResponder was used for <= 10.2: Provides: mDNSResponder = 107.5 Obsoletes: mDNSResponder < 107.5 +# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for service-types.db openSUSE <= 12.3 SLE <= 11SP2 -Conflicts: avahi-utils <= 0.6.31-9.2 +#Conflicts: avahi-utils <= 0.6.31-9.2 %endif %if %build_glib2 BuildRequires: gobject-introspection-devel @@ -331,8 +332,9 @@ Summary: IPv4LL Service for Zeroconf and Bonjour Group: Productivity/Networking/Other # Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11. Provides: avahi:%{_sbindir}/avahi-autoipd +# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11 -Conflicts: avahi <= 0.6.31-9.2 +#Conflicts: avahi <= 0.6.31-9.2 # coreutils contains /usr/bin/chown Requires(post): coreutils # shadow contains useradd and groupadd diff --git a/avahi-qt4.spec b/avahi-qt4.spec index d7b4cd0..14741d4 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -143,8 +143,9 @@ Obsoletes: mDNSResponder-64bit # mDNSResponder was used for <= 10.2: Provides: mDNSResponder = 107.5 Obsoletes: mDNSResponder < 107.5 +# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for service-types.db openSUSE <= 12.3 SLE <= 11SP2 -Conflicts: avahi-utils <= 0.6.31-9.2 +#Conflicts: avahi-utils <= 0.6.31-9.2 %endif %if %build_glib2 BuildRequires: gobject-introspection-devel @@ -334,8 +335,9 @@ Summary: IPv4LL Service for Zeroconf and Bonjour Group: Productivity/Networking/Other # Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11. Provides: avahi:%{_sbindir}/avahi-autoipd +# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11 -Conflicts: avahi <= 0.6.31-9.2 +#Conflicts: avahi <= 0.6.31-9.2 # coreutils contains /usr/bin/chown Requires(post): coreutils # shadow contains useradd and groupadd diff --git a/avahi.changes b/avahi.changes index 5ca04fc..0de920d 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 19 09:24:58 UTC 2015 - zaitor@opensuse.org + +- Temp disable 2 old Conflicts that are breaking staging. These can + back in once there is a new release of avahi. + ------------------------------------------------------------------- Wed Oct 7 20:34:24 UTC 2015 - mgorse@suse.com diff --git a/avahi.spec b/avahi.spec index c503dfa..e94fc75 100644 --- a/avahi.spec +++ b/avahi.spec @@ -145,8 +145,9 @@ Obsoletes: mDNSResponder-64bit # mDNSResponder was used for <= 10.2: Provides: mDNSResponder = 107.5 Obsoletes: mDNSResponder < 107.5 +# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for service-types.db openSUSE <= 12.3 SLE <= 11SP2 -Conflicts: avahi-utils <= 0.6.31-9.2 +#Conflicts: avahi-utils <= 0.6.31-9.2 %endif %if %build_glib2 BuildRequires: gobject-introspection-devel @@ -334,8 +335,9 @@ Summary: IPv4LL Service for Zeroconf and Bonjour Group: Productivity/Networking/Other # Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11. Provides: avahi:%{_sbindir}/avahi-autoipd +# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11 -Conflicts: avahi <= 0.6.31-9.2 +#Conflicts: avahi <= 0.6.31-9.2 # coreutils contains /usr/bin/chown Requires(post): coreutils # shadow contains useradd and groupadd