[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-ha-dev
Subject:    [Linux-ha-dev] Proposed .spec patch
From:       "Andrew Beekhof (GMail)" <beekhof () gmail ! com>
Date:       2005-08-17 14:05:25
Message-ID: 0C857B0C-DBF6-44FE-947D-17842E9D8E15 () gmail ! com
[Download RAW message or body]

I have some suggestions for the .spec file... but since I rarely use  
make rpm, I thought i'd run it by the list first.

Its mostly just cleanups and a few tweaks.



["heartbeat.spec.in.patch" (heartbeat.spec.in.patch)]

--- heartbeat.spec.in	17 Aug 2005 15:04:41 +0200	1.138
+++ heartbeat.spec.in	17 Aug 2005 15:59:51 +0200	
@@ -3,16 +3,16 @@
 # Workaround for a change in RPM 4.1.x; needs proper fixing soon!
 ##%define _unpackaged_files_terminate_build 0
 
-Summary: @HB_PKG@ - heartbeat subsystem for High-Availability Linux
+Summary: The Heartbeat Subsystem for High-Availability Linux
 Name:	@HB_PKG@
 Version:	@VERSION@
-Release:	1
+Release:	2
 License: GPL/LGPL
 URL: http://linux-ha.org/
 Group: Utilities
 Packager: Alan Robertson <alanr@unix.sh>
 Source: http://linux-ha.org/download/@HB_PKG@-@VERSION@.tar.gz
-Buildroot: %{_tmppath}/@HB_PKG@-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
 BuildPrereq: glib-devel, @UCDSNMPDEVEL@, perl, iputils, /usr/bin/ssh, openssl-devel, libnet
 # libnet available from www.ultramonkey.org and others
 Requires: sysklogd, heartbeat-stonith = %{version}-%{release}, heartbeat-pils = %{version}-%{release}
@@ -943,11 +943,6 @@
 ###########################################################
 %install
 ###########################################################
-if
-  [ ! -z "${RPM_BUILD_ROOT}"  -a "${RPM_BUILD_ROOT}" != "/" ]
-then
-  rm -rf $RPM_BUILD_ROOT
-fi
 #make DESTDIR=$RPM_BUILD_ROOT install-strip
 make DESTDIR=$RPM_BUILD_ROOT install
 (
@@ -973,15 +968,19 @@
 @libdir@/libplumbgpl.*
 @libdir@/libstonithd.*
 @libdir@/libapphb.*
+@libdir@/libcib.*
+@libdir@/libcrmcommon.*
+@libdir@/libpengine.*
+@libdir@/liblrm.*
 @libdir@/librecoverymgr.*
+/usr/lib/ocf
 @base_includedir@/heartbeat
 @base_includedir@/clplumbing
 @base_includedir@/saf
 @base_includedir@/ocf
 @sysconfdir@/ha.d/resource.d/
-@INITDIR@/heartbeat
-/usr/lib/ocf
-@sysconfdir@/logrotate.d/heartbeat
+%config @INITDIR@/heartbeat
+%config @sysconfdir@/logrotate.d/heartbeat
 %dir @localstatedir@/lib/@HB_PKG@
 %dir @localstatedir@/lib/@HB_PKG@/cores
 %dir %attr (0700, root, -) @localstatedir@/lib/@HB_PKG@/cores/root
@@ -1012,10 +1011,6 @@
 	@MIBS_DIR@/LINUX-HA-MIB.mib
 %endif
 
-@libdir@/libcib.*
-@libdir@/libcrmcommon.*
-@libdir@/libpengine.*
-@libdir@/liblrm.*
 ###########################################################
 # Files for ldirectord
 %files ldirectord
@@ -1027,8 +1022,8 @@
 @sysconfdir@/logrotate.d/ldirectord
 @INITDIR@/ldirectord
 @sysconfdir@/ha.d/resource.d/ldirectord
-@mandir@/man8/ldirectord.8*
-@mandir@/man8/supervise-ldirectord-config.8*
+%doc @mandir@/man8/ldirectord.8*
+%doc @mandir@/man8/supervise-ldirectord-config.8*
 %doc ldirectord/ldirectord.cf
 
 ###########################################################
@@ -1057,7 +1052,7 @@
 %clean
 ###########################################################
 if
-  [ -z "${RPM_BUILD_ROOT}"  -a "${RPM_BUILD_ROOT}" != "/" ]
+  [ ! -z "${RPM_BUILD_ROOT}"  -a "${RPM_BUILD_ROOT}" != "/" ]
 then
   rm -rf $RPM_BUILD_ROOT
 fi
@@ -1099,7 +1094,6 @@
     /usr/sbin/useradd @HA_CCMUSER@
   fi
 fi
-#
 
 ###########################################################
 %post
@@ -1120,3 +1114,7 @@
   [ -x /sbin/chkconfig ] && /sbin/chkconfig --del heartbeat
 fi
 true
+
+###########################################################
+%postun
+###########################################################


--
Andrew Beekhof

"Too much knowledge leads to confusion; Too many guitar lessons lead  
to jazz-fusion!" - TISM





_______________________________________________________
Linux-HA-Dev: Linux-HA-Dev@lists.linux-ha.org
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/


[prev in list] [next in list] [prev in thread] [next in thread]