From b85ade15899d1936e42dfa7df332a89a05d27639 Mon Sep 17 00:00:00 2001 From: Arlin Davis Date: Thu, 1 May 2014 12:47:43 -0700 Subject: [PATCH] SUSE install/uninstall issues with latest spec file For installation, remove obsolete/conflict with self, only obsolete the old intel-mic-ofed-dapl package name. Add %preun check if mpxyd service exists first, otherwise a non ccl-proxy systems uninstallation fails Signed-off-by: Patrick McCormick Signed-off-by: Arlin Davis --- dapl.spec.in | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dapl.spec.in b/dapl.spec.in index 7c61381..bfda9e8 100644 --- a/dapl.spec.in +++ b/dapl.spec.in @@ -49,8 +49,6 @@ License: Dual GPL/BSD/CPL Url: http://openfabrics.org/ Source: http://www.openfabrics.org/downloads/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_topdir}/BUILDROOT -Obsoletes: dapl -Conflicts: dapl Obsoletes: intel-mic-ofed-dapl Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -66,8 +64,6 @@ atomic operations and rdma write with immediate data. Summary: Development files for the libdat and libdapl libraries Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -Obsoletes: dapl-devel -Conflicts: dapl-devel Obsoletes: intel-mic-ofed-dapl-devel %description devel @@ -76,9 +72,7 @@ Header files for libdat and libdapl library. %package devel-static Summary: Static development files for libdat and libdapl library Group: System Environment/Libraries -Obsoletes: dapl-devel-static Obsoletes: intel-mic-ofed-dapl-devel-static -Conflicts: dapl-devel-static %description devel-static Static libraries for libdat and libdapl library. @@ -87,8 +81,6 @@ Static libraries for libdat and libdapl library. Summary: Test suites for uDAPL library Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -Obsoletes: dapl-utils -Conflicts: dapl-utils Obsoletes: intel-mic-ofed-dapl-utils %description utils @@ -128,8 +120,10 @@ elif [ $1 -gt 2 ]; then fi %preun -/sbin/chkconfig --del mpxyd &> /dev/null || true -service mpxyd stop +if [ -f /etc/init.d/mpxyd ]; then + /sbin/chkconfig --del mpxyd &> /dev/null + service mpxyd stop +fi %postun /sbin/ldconfig -- 2.46.0