rpms/heartbeat/devel heartbeat-2.1.2-open.patch, NONE, 1.1 heartbeat.spec, 1.16, 1.17
Kevin Fenzi (kevin)
fedora-extras-commits at redhat.com
Wed Aug 29 16:46:38 UTC 2007
Author: kevin
Update of /cvs/extras/rpms/heartbeat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29273
Modified Files:
heartbeat.spec
Added Files:
heartbeat-2.1.2-open.patch
Log Message:
Upgrade to 2.1.2
Update license tag for new guidelines.
Patch open function issues.
heartbeat-2.1.2-open.patch:
--- NEW FILE heartbeat-2.1.2-open.patch ---
diff -Nur heartbeat-2.1.2.orig/heartbeat/heartbeat.c heartbeat-2.1.2/heartbeat/heartbeat.c
--- heartbeat-2.1.2.orig/heartbeat/heartbeat.c 2007-08-01 20:06:54.000000000 -0600
+++ heartbeat-2.1.2/heartbeat/heartbeat.c 2007-08-14 22:21:46.000000000 -0600
@@ -862,7 +862,7 @@
ourproc = procinfo->nprocs;
- if (mp->vf->open(mp) != HA_OK){
+ if ((mp->vf->open)(mp) != HA_OK){
cl_log(LOG_ERR, "cannot open %s %s",
mp->type,
mp->name);
diff -Nur heartbeat-2.1.2.orig/lib/clplumbing/cl_msg.c heartbeat-2.1.2/lib/clplumbing/cl_msg.c
--- heartbeat-2.1.2.orig/lib/clplumbing/cl_msg.c 2007-08-01 20:06:54.000000000 -0600
+++ heartbeat-2.1.2/lib/clplumbing/cl_msg.c 2007-08-14 21:36:14.000000000 -0600
@@ -145,7 +145,7 @@
return -1;
}
- return open(filename, O_WRONLY|O_CREAT|O_APPEND);
+ return open(filename, O_WRONLY|O_CREAT|O_APPEND, 0755);
}
Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- heartbeat.spec 29 Aug 2007 04:45:01 -0000 1.16
+++ heartbeat.spec 29 Aug 2007 16:46:05 -0000 1.17
@@ -5,14 +5,15 @@
%define uname hacluster
Summary: Heartbeat subsystem for High-Availability Linux
Name: heartbeat
-Version: 2.0.8
-Release: 4%{?dist}
-License: GPL/LGPL
+Version: 2.1.2
+Release: 1%{?dist}
+License: GPLv2 and LGPLv2+
URL: http://linux-ha.org/
Group: System Environment/Daemons
Source0: http://linux-ha.org/download/%{name}-%{version}.tar.gz
Patch0: heartbeat-fedora-pam.patch
Patch1: heartbeat-fedora-chkconfig.patch
+Patch2: heartbeat-2.1.2-open.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel
BuildRequires: iputils
@@ -23,6 +24,8 @@
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
BuildRequires: libtool
+BuildRequires: libxml2-devel
+BuildRequires: gettext
%if %{ENABLE_MGMT}
BuildRequires: gnutls-devel
BuildRequires: pam-devel
@@ -107,12 +110,13 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
# disable-fatal-warnings flag used to disable gcc4.x warnings of 'difference in signedness'
CFLAGS=${RPM_OPT_FLAGS} \
%configure \
- --with-ocf-root=%{_libdir}/ocf \
+ --with-ocf-root=%{_datadir}/ocf \
--disable-fatal-warnings \
--disable-static \
%if %{ENABLE_MGMT}
@@ -148,8 +152,8 @@
chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat-gui/pymgmt.py
# fix some wrong line endings issues
-sed -i 's/\r//' $RPM_BUILD_ROOT/%{_libdir}/ocf/resource.d/heartbeat/SAPDatabase
-sed -i 's/\r//' $RPM_BUILD_ROOT/%{_libdir}/ocf/resource.d/heartbeat/SAPInstance
+sed -i 's/\r//' $RPM_BUILD_ROOT/%{_datadir}/ocf/resource.d/heartbeat/SAPDatabase
+sed -i 's/\r//' $RPM_BUILD_ROOT/%{_datadir}/ocf/resource.d/heartbeat/SAPInstance
%find_lang haclient
@@ -218,7 +222,8 @@
%{_libdir}/libstonithd.so.*
%{_libdir}/libpe_rules.so.*
%{_libdir}/libpe_status.so.*
-%{_libdir}/ocf/
+%{_datadir}/heartbeat/
+%{_datadir}/ocf/
%{_sysconfdir}/ha.d/resource.d/
%exclude %{_sysconfdir}/ha.d/resource.d/ldirectord
%{_sysconfdir}/init.d/heartbeat
@@ -231,6 +236,8 @@
%dir %{_var}/run/heartbeat
%attr (2755, hacluster, haclient) %{_bindir}/cl_status
%{_bindir}/cl_respawn
+%{_bindir}/hb_gui
+%{_datadir}/heartbeat-gui/
%{_sbindir}/crmadmin
%{_sbindir}/cibadmin
%{_sbindir}/ccm_tool
@@ -247,6 +254,8 @@
%{_sbindir}/attrd_updater
%{_sbindir}/crm_failcount
%{_sbindir}/ocf-tester
+%{_sbindir}/ha_logger
+%{_sbindir}/ptest
%dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/ccm
%dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/crm
%dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/crm
@@ -317,6 +326,11 @@
%{_libdir}/*.so
%changelog
+* Tue Aug 29 2007 Kevin Fenzi <kevin at tummy.com> - 2.1.2-1
+- Upgrade to 2.1.2
+- Update license tag for new guidelines.
+- Patch open function issues.
+
* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.0.8-4
- Rebuild for selinux ppc32 issue.
More information about the scm-commits
mailing list