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
This commit is contained in:
Dominique Leuenberger 2015-10-19 10:12:06 +00:00 committed by Git OBS Bridge
parent 9d8e5b15e7
commit abde4125bb
5 changed files with 22 additions and 8 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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