From 5d1d69c8ad9848b5ade9a549ad1a15aa1dd4faafdde12e0235c5f6507a5967b3 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 7 Nov 2008 14:47:39 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/rpcbind?expand=0&rev=3

---
 rpcbind.changes |  7 +++++++
 rpcbind.spec    | 15 ++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/rpcbind.changes b/rpcbind.changes
index 060deac..d98e854 100644
--- a/rpcbind.changes
+++ b/rpcbind.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov  5 14:44:56 CET 2008 - mkoenig@suse.de
+
+- fix version comparison in Obsoletes [bnc#440313]
+- disable portmap service in pre script to avoid problems when
+  upgrading from portmap
+
 -------------------------------------------------------------------
 Wed Oct 15 19:07:48 CEST 2008 - mkoenig@suse.de
 
diff --git a/rpcbind.spec b/rpcbind.spec
index ce0e221..69b4943 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -24,17 +24,16 @@ License:        BSD 3-Clause
 Group:          Productivity/Networking/System
 AutoReqProv:    on
 Version:        0.1.6+git20080930
-Release:        1
+Release:        2
 Summary:        Transport independent RPC portmapper
 Url:            http://nfsv4.bullopensource.org/doc/tirpc_rpcbind.php
 Source:         %{name}-%{version}.tar.bz2
 Source1:        rpcbind.init
 Source2:        sysconfig.rpcbind
 Source3:        rpcbind.xml
-#Patch6:         rpcbind-0.1.4-localaddr.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       portmap = 6.0+git20070716
-Obsoletes:      portmap < 6.0+git20070716
+Obsoletes:      portmap <= 6.0+git20070716
 PreReq:         %insserv_prereq %fillup_prereq
 
 %description
@@ -85,6 +84,12 @@ install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%_datadir/omc/svcinfo.d/
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+# upgrade case from portmap
+if test -x /sbin/portmap && chkconfig -c portmap; then
+	chkconfig -f -s portmap off
+fi
+
 %preun
 %stop_on_removal rpcbind
 
@@ -108,6 +113,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/omc/svcinfo.d/rpcbind.xml
 
 %changelog
+* Wed Nov 05 2008 mkoenig@suse.de
+- fix version comparison in Obsoletes [bnc#440313]
+- disable portmap service in pre script to avoid problems when
+  upgrading from portmap
 * Wed Oct 15 2008 mkoenig@suse.de
 - update to 0.1.6 with additional patches from git
   * Fixed an ipv6 related segfault on startup