Mailinglist Archive: opensuse-commit (564 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package heartbeat for openSUSE:Factory
checked in at Wed Jun 2 18:15:20 CEST 2010.



--------
--- heartbeat/heartbeat.changes 2009-07-13 22:20:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/heartbeat/heartbeat.changes    2010-06-02 
02:15:41.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Jun  2 02:14:14 CEST 2010 - ro@xxxxxxx
+
+- create /var/run/heartbeat and /var/run/heartbeat/ccm in
+  init-script and only keep them as ghost in the specfile
+  to fix build
+- package /var/run/heartbeat/ccm the same way in heartbeat
+  and heartbeat-common while we are at it 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ heartbeat.spec ++++++
--- /var/tmp/diff_new_pack.VNRhLU/_old  2010-06-02 18:14:48.000000000 +0200
+++ /var/tmp/diff_new_pack.VNRhLU/_new  2010-06-02 18:14:48.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package heartbeat (Version 2.99.3)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -37,8 +37,8 @@
 Name:           heartbeat
 Summary:        The Heartbeat Subsystem for High-Availability Linux
 Version:        2.99.3
-Release:        13
-License:        GPL v2 only ; LGPL v2.1 or later
+Release:        14
+License:        GPLv2+ ; LGPLv2.1+
 Url:            http://linux-ha.org/
 Group:          Productivity/Clustering/HA
 Source:         heartbeat.tar.gz
@@ -153,7 +153,7 @@
     (See doc/AUTHORS)
 
 %package resources
-License:        GPL v2 or later ; LGPL v2.1 or later
+License:        GPLv2+ ; LGPLv2.1+
 Summary:        OCF Compliant Cluster Resource Scripts
 Group:          Productivity/Clustering/HA
 
@@ -175,7 +175,7 @@
     (See doc/AUTHORS)
 
 %package common
-License:        GPL v2 or later ; LGPL v2.1 or later
+License:        GPLv2+ ; LGPLv2.1+
 Summary:        Common heartbeat components
 Group:          Productivity/Clustering/HA
 Requires:       perl-TimeDate
@@ -204,7 +204,7 @@
     (See doc/AUTHORS)
 
 %package -n libheartbeat2
-License:        GPL v2 or later ; LGPL v2.1 or later
+License:        GPLv2+ ; LGPLv2.1+
 Summary:        The Heartbeat Subsystem for High-Availability Linux
 Group:          Productivity/Clustering/HA
 Obsoletes:      %{name}-pils < 2.99
@@ -246,7 +246,7 @@
     (See doc/AUTHORS)
 
 %package -n libheartbeat-devel
-License:        GPL v2 or later ; LGPL v2.1 or later
+License:        GPLv2+ ; LGPLv2.1+
 Summary:        The Heartbeat Subsystem for High-Availability Linux
 Group:          Productivity/Clustering/HA
 Requires:       libheartbeat2 = %{version}-%{release}
@@ -287,7 +287,7 @@
     (See doc/AUTHORS)
 
 %package ldirectord
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        A Monitoring Daemon for Maintaining High Availability Resources
 Group:          Productivity/Clustering/HA
 Requires:       %{SSLeay} perl-libwww-perl ipvsadm
@@ -343,7 +343,7 @@
 %endif
 
 %package devel 
-License:        GPL v2 or later ; LGPL v2.1 or later
+License:        GPLv2+ ; LGPLv2.1+
 Summary:        The Heartbeat Subsystem for High-Availability Linux
 Group:          Productivity/Clustering/HA
 Requires:       %{name} = %{version}-%{release}
@@ -626,10 +626,10 @@
 %exclude %{_libdir}/heartbeat/ha_logger
 %exclude %{_libdir}/heartbeat/hb_setsite
 %exclude %{_libdir}/heartbeat/ha_propagate
-%dir %{_var}/run/heartbeat
+%ghost %dir %{_var}/run/heartbeat
 %dir %{_var}/lib/heartbeat
 %dir %{_var}/lib/heartbeat/cores
-%dir %attr (0755, %{uname}, %{gname})   %{_var}/run/heartbeat/ccm
+%ghost %dir %attr (0755, %{uname}, %{gname})   %{_var}/run/heartbeat/ccm
 %{_sysconfdir}/ha.d
 %exclude %{_sysconfdir}/ha.d/resource.d
 %exclude %{_sysconfdir}/ha.d/shellfuncs
@@ -706,7 +706,8 @@
 %{_datadir}/heartbeat/ha_cf_support.sh
 %{_datadir}/heartbeat/openais_conf_support.sh
 %{_datadir}/doc/packages/heartbeat/apphbd.cf
-%{_var}/run/heartbeat
+%ghost %dir %{_var}/run/heartbeat
+%ghost %dir %attr (0755, %{uname}, %{gname})   %{_var}/run/heartbeat/ccm
 %dir %attr (0700, root, root)           %{_var}/lib/heartbeat/cores/root
 %dir %attr (0700, nobody,   %{nogroup}) %{_var}/lib/heartbeat/cores/nobody
 %dir %attr (0700, %{uname}, %{gname})   %{_var}/lib/heartbeat/cores/%{uname}

++++++ heartbeat.suse.in ++++++
--- /var/tmp/diff_new_pack.VNRhLU/_old  2010-06-02 18:14:48.000000000 +0200
+++ /var/tmp/diff_new_pack.VNRhLU/_new  2010-06-02 18:14:48.000000000 +0200
@@ -130,6 +130,11 @@
        rc_exit
 fi
 
+test -d /var/run/heartbeat || mkdir -p /var/run/heartbeat
+test -d /var/run/heartbeat/ccm || {
+       mkdir -p /var/run/heartbeat/ccm
+        chown hacluster:haclient /var/run/heartbeat/ccm
+}
 
 case "$1" in
   start)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx