From 58036198be948be2d48172f5e063d2c1ea0f4bf029b9d87f033e851e315bd12d Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 31 May 2008 10:12:13 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nss-mdns?expand=0&rev=8 --- baselibs.conf | 3 +++ nss-mdns.changes | 7 +++++++ nss-mdns.spec | 12 +++++------- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index fc8303d..3050118 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1,4 @@ nss-mdns + conflicts "nss-mdns- < " + conflicts "nss-mdns- > " + supplements "packageand(nss-mdns:glibc-)" diff --git a/nss-mdns.changes b/nss-mdns.changes index e0d75c4..8aa83a9 100644 --- a/nss-mdns.changes +++ b/nss-mdns.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 28 15:49:14 CEST 2008 - olh@suse.de + +- change the recommends for XXbit packages to a supplements + add a Conflicts: != version to the XXbit packages, to give a hint + during manual package upgrades (bnc#336678) + ------------------------------------------------------------------- Tue Apr 22 10:08:38 CEST 2008 - coolo@suse.de diff --git a/nss-mdns.spec b/nss-mdns.spec index 6ea9757..cc64b20 100644 --- a/nss-mdns.spec +++ b/nss-mdns.spec @@ -15,7 +15,7 @@ Name: nss-mdns # lynx is not needed, text version of README is already present #BuildRequires: lynx Version: 0.10 -Release: 5 +Release: 13 Group: Productivity/Networking/DNS/Utilities License: LGPL v2.1 or later Url: http://0pointer.de/lennart/projects/nss-mdns/ @@ -26,12 +26,6 @@ AutoReqProv: on PreReq: sed grep Requires: avahi BuildRoot: %{_tmppath}/%{name}-%{version}-build -%ifarch x86_64 s390x -Recommends: %{name}-32bit = %{version} -%endif -%ifarch ppc -Recommends: %{name}-64bit = %{version} -%endif %description nss-mdns is a plug-in for the GNU Name Service Switch (NSS) @@ -143,6 +137,10 @@ sed -i "/^hosts:/{$REMOVE_REGEXP}" etc/nsswitch.conf rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 28 2008 olh@suse.de +- change the recommends for XXbit packages to a supplements + add a Conflicts: != version to the XXbit packages, to give a hint + during manual package upgrades (bnc#336678) * Tue Apr 22 2008 coolo@suse.de - degrading the requires to recommends. It's very well possible to install a system with just 64bit