rpms/heartbeat/F-13 .cvsignore, 1.12, 1.13 heartbeat.spec, 1.40, 1.41 sources, 1.12, 1.13

Andrew Beekhof beekhof at fedoraproject.org
Mon Feb 22 14:16:12 UTC 2010


Author: beekhof

Update of /cvs/pkgs/rpms/heartbeat/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32721

Modified Files:
	.cvsignore heartbeat.spec sources 
Log Message:
Fix compilation after DSO handling change


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/heartbeat/F-13/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	19 Aug 2009 06:36:15 -0000	1.12
+++ .cvsignore	22 Feb 2010 14:16:11 -0000	1.13
@@ -1 +1,2 @@
+dso.patch
 0daab7da36a8.tar.bz2


Index: heartbeat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/heartbeat/F-13/heartbeat.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- heartbeat.spec	21 Oct 2009 11:45:22 -0000	1.40
+++ heartbeat.spec	22 Feb 2010 14:16:11 -0000	1.41
@@ -2,7 +2,7 @@
 # When downloading directly from Mercurial, it will automatically add this prefix
 # Invoking 'hg archive' wont but you can add one with:
 # hg archive -t tgz -p "Linux-HA-Dev-" -r $upstreamversion $upstreamversion.tar.gz
-%global specversion 5
+%global specversion 6
 %global upstreamprefix Linux-HA-Dev-
 %global upstreamversion 0daab7da36a8
 
@@ -20,6 +20,7 @@ License:          GPLv2 and LGPLv2+
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
 Source0:          http://hg.linux-ha.org/dev/archive/%{upstreamversion}.tar.bz2
+Patch1:		  dso.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires:    glib2-devel
 BuildRequires:    iputils
@@ -87,6 +88,7 @@ Headers and shared libraries for writing
 
 %prep
 %setup -q -n %{upstreamprefix}%{upstreamversion}
+%patch1 -p0 
 
 %build
 ./bootstrap
@@ -176,6 +178,9 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Mon Feb 22 2010 Andrew Beekhof <andrew at beekhof.net> - 3.0.0-0.6.0daab7da36a8.hg
+- Correctly link to all required libraries when building
+
 * Thu Oct 15 2009 Andrew Beekhof <andrew at beekhof.net> - 3.0.0-0.5.0daab7da36a8.hg
 - Resolve file conflict, shellfuncs is provided by resource-agents
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/heartbeat/F-13/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	19 Aug 2009 06:36:15 -0000	1.12
+++ sources	22 Feb 2010 14:16:11 -0000	1.13
@@ -1 +1,2 @@
+8adb6c5433e1d5acf454f8c894afcd82  dso.patch
 278681d62d2c39b1748ac0eb8ae234d8  0daab7da36a8.tar.bz2



More information about the scm-commits mailing list