[cluster-glue] Allow cluster-glue-libs to be installed independently of cluster-glue

Andrew Beekhof beekhof at fedoraproject.org
Mon Sep 26 02:36:43 UTC 2011


commit 3e87770d8a0efd6e2aa6892666e6228289d4b64d
Author: Andrew Beekhof <andrew at beekhof.net>
Date:   Mon Sep 26 12:36:26 2011 +1000

    Allow cluster-glue-libs to be installed independently of cluster-glue

 cluster-glue.spec |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/cluster-glue.spec b/cluster-glue.spec
index 7a76c8b..e9fa484 100644
--- a/cluster-glue.spec
+++ b/cluster-glue.spec
@@ -20,6 +20,8 @@ Url:		http://linux-ha.org/wiki/Cluster_Glue
 Group:		System Environment/Base
 Source0:	http://hg.linux-ha.org/glue/archive/%{upstreamversion}.tar.bz2
 Source1:	logd.service
+Requires:	%{name}-libs = %{version}-%{release}
+
 # Directives to allow upgrade from combined heartbeat packages in Fedora11
 Provides:	heartbeat-stonith = 3.0.0-1
 Provides:	heartbeat-pils = 3.0.0-1
@@ -177,12 +179,11 @@ fi
 
 # cluster-glue-libs
 
-%package -n cluster-glue-libs
+%package libs
 Summary:	Reusable cluster libraries
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
 
-%description -n cluster-glue-libs
+%description libs
 A collection of libraries that are useful for writing cluster managers 
 such as Pacemaker.
 
@@ -193,11 +194,11 @@ useradd -r -g %{gname} -d %{_var}/lib/heartbeat/cores/hacluster -s /sbin/nologin
 -c "heartbeat user" %{uname}
 exit 0
 
-%post -n cluster-glue-libs -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
 
-%postun -n cluster-glue-libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
-%files -n cluster-glue-libs
+%files libs
 %defattr(-,root,root)
 %{_libdir}/lib*.so.*
 %doc AUTHORS
@@ -205,16 +206,16 @@ exit 0
 
 # cluster-glue-libs-devel
 
-%package -n cluster-glue-libs-devel 
+%package libs-devel 
 Summary:	Headers and libraries for writing cluster managers
 Group:		Development/Libraries
-Requires:	cluster-glue-libs = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
-%description -n cluster-glue-libs-devel
+%description libs-devel
 Headers and shared libraries for a useful for writing cluster managers 
 such as Pacemaker.
 
-%files -n cluster-glue-libs-devel
+%files libs-devel
 %defattr(-,root,root)
 %dir %{_libdir}/heartbeat
 %dir %{_libdir}/heartbeat/plugins


More information about the scm-commits mailing list