packages: heartbeat/heartbeat.spec, heartbeat/heartbeat-drbd-outdate-libs.p...

[mmazur]

Author: mmazur                       Date: Tue Jul 19 21:54:05 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- works; rel 1; stbr

---- Files affected:
packages/heartbeat:
   heartbeat.spec (1.103 -> 1.104) , heartbeat-drbd-outdate-libs.patch (1.1 -> NONE)  (REMOVED), heartbeat-install.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/heartbeat/heartbeat.spec
diff -u packages/heartbeat/heartbeat.spec:1.103 packages/heartbeat/heartbeat.spec:1.104
--- packages/heartbeat/heartbeat.spec:1.103	Tue Jul 19 20:00:14 2011
+++ packages/heartbeat/heartbeat.spec	Tue Jul 19 23:53:59 2011
@@ -1,37 +1,25 @@
 # $Revision$, $Date$
-# NOTE:
-# - In post-2.1.4 releases, Linux-HA code is packaged in three different
-#   sub-projects, leading to three separate tarballs for each release: one for
-#   Heartbeat, one for Cluster Glue, and one for the Resource Agents. The three
-#   projects have separate release cycles, a release for one sub-project may or
-#   may not coincide with that of another.
-#   The former Heartbeat CRM is now maintained as the Pacemaker project, also
-#   on its own release cycle.
 # TODO
-# - from above note: Cluster Glue, Resource Agents, Heartbeat CRM packages
-#   - resource agent patch: heartbeat-no_ipmilan_test.patch
 # - merge mibs supackage from 2.1 branch
 # - cleanup deps, users for 3.x
 # - fixup deps, inner deps, think of subpackages, ugprade path from 2.1
 # - keep /etc/ha.d/resource.d in resource-agents, not here
 #
 %include	/usr/lib/rpm/macros.perl
-%define		rel		0.2
 Summary:	Heartbeat - subsystem for High-Availability Linux
 Summary(es.UTF-8):	Subsistema heartbeat para Linux "High-Availability"
 Summary(pl.UTF-8):	Podsystem heartbeat dla systemów o podwyższonej niezawodności
 Summary(pt_BR.UTF-8):	Implementa sistema de monitoração (heartbeats) visando Alta Disponibilidade
 Name:		heartbeat
 Version:	3.0.5
-Release:	0.%{rel}
+Release:	1
 License:	GPL v2+
 Group:		Networking/Daemons
 Source0:	http://hg.linux-ha.org/heartbeat-STABLE_3_0/archive/STABLE-%{version}.tar.bz2
 # Source0-md5:	f8686abde8722c42265c6d84fbe3d3bf
 Source1:	%{name}.init
 Patch0:		%{name}-ac.patch
-Patch1:		%{name}-drbd-outdate-libs.patch
-Patch2:		%{name}-libs.patch
+Patch1:		%{name}-libs.patch
 URL:		http://www.linux-ha.org/Heartbeat
 BuildRequires:	OpenIPMI-devel >= 2.0.3
 BuildRequires:	autoconf
@@ -150,8 +138,7 @@
 %prep
 %setup -qn Heartbeat-3-0-STABLE-%{version}
 %patch0 -p1
-#%patch1 -p1
-%patch2 -p1
+%patch1 -p1
 rm -rf libltdl
 
 %build
@@ -300,6 +287,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.104  2011/07/19 21:53:59  mmazur
+- works; rel 1; stbr
+
 Revision 1.103  2011/07/19 18:00:14  mmazur
 - builds; rel 0.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heartbeat/heartbeat.spec?r1=1.103&r2=1.104&f=u