SHA256
1
0
forked from pool/pacemaker
OBS User unknown 2008-09-24 15:18:10 +00:00 committed by Git OBS Bridge
parent ea11bb47ea
commit d174672082
2 changed files with 68 additions and 36 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Sep 15 11:08:19 CEST 2008 - abeekhof@suse.de
- Create a libpacemaker subpackage
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 11 09:33:12 CEST 2008 - abeekhof@suse.de Thu Sep 11 09:33:12 CEST 2008 - abeekhof@suse.de

View File

@ -24,7 +24,7 @@
%define with_debugging 0 %define with_debugging 0
%define without_fatal_warnings 1 %define without_fatal_warnings 1
%define with_ais_support 1 %define with_ais_support 1
%define with_heartbeat_support 1 %define with_heartbeat_support 0
%define gname haclient %define gname haclient
%define uname hacluster %define uname hacluster
%if 0%{?fedora_version} %if 0%{?fedora_version}
@ -36,7 +36,7 @@
Name: pacemaker Name: pacemaker
Summary: The Pacemaker scalable High-Availability cluster resource manager Summary: The Pacemaker scalable High-Availability cluster resource manager
Version: 0.7.2 Version: 0.7.2
Release: 1 Release: 2
License: GPL v2 or later; LGPL v2.1 or later License: GPL v2 or later; LGPL v2.1 or later
Url: http://www.clusterlabs.org Url: http://www.clusterlabs.org
Group: Productivity/Clustering/HA Group: Productivity/Clustering/HA
@ -45,20 +45,19 @@ Source100: pacemaker.rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv: on AutoReqProv: on
%if %with_ais_support %if %with_ais_support
BuildRequires: openais-devel BuildRequires: libopenais-devel
%if 0%{?suse_version} > 1000 %if 0%{?suse_version} > 1000
Supplements: openais Supplements: openais
%endif %endif
%endif %endif
%if %with_heartbeat_support %if %with_heartbeat_support
BuildRequires: heartbeat-devel > 2.2 BuildRequires: heartbeat-devel
%if 0%{?suse_version} > 1000 %if 0%{?suse_version} > 1000
Supplements: heartbeat Supplements: heartbeat
%endif %endif
%endif %endif
Conflicts: heartbeat < 2.99 Conflicts: heartbeat < 2.99
Obsoletes: heartbeat < 2.99 BuildRequires: e2fsprogs-devel glib2-devel gnutls-devel libheartbeat-devel libxml2-devel libxslt-devel ncurses-devel pam-devel python-devel swig
BuildRequires: e2fsprogs-devel glib2-devel gnutls-devel heartbeat-common heartbeat-common-devel libxml2-devel libxslt-devel ncurses-devel pam-devel python-devel swig
%if 0%{?suse_version} %if 0%{?suse_version}
%if 0%{?suse_version} == 930 %if 0%{?suse_version} == 930
BuildRequires: rpm-devel BuildRequires: rpm-devel
@ -100,13 +99,37 @@ Authors:
-------- --------
Andrew Beekhof <abeekhof@suse.de> Andrew Beekhof <abeekhof@suse.de>
%package devel %package -n libpacemaker3
License: GPL v2 or later; LGPL v2.1 or later License: GPL v2 or later; LGPL v2.1 or later
Summary: The Pacemaker scalable High-Availability cluster resource manager Summary: The Pacemaker scalable High-Availability cluster resource manager
Group: Productivity/Clustering/HA Group: Productivity/Clustering/HA
Requires: %{name} = %{version}-%{release}
%description devel %description -n libpacemaker3
Pacemaker is an advanced, scalable High-Availability cluster resource
manager for Linux-HA (Heartbeat) and/or OpenAIS.
It supports "n-node" clusters with significant capabilities for
managing resources and dependencies.
It will run scripts at initialization, when machines go up or down,
when related resources fail and can be configured to periodically check
resource health.
Authors:
--------
Andrew Beekhof <abeekhof@suse.de>
%package -n libpacemaker-devel
License: GPL v2 or later; LGPL v2.1 or later
Summary: The Pacemaker scalable High-Availability cluster resource manager
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}-%{release}
Requires: libpacemaker3 = %{version}-%{release}
Requires: libheartbeat-devel
%description -n libpacemaker-devel
Pacemaker is an advanced, scalable High-Availability cluster resource Pacemaker is an advanced, scalable High-Availability cluster resource
manager for Linux-HA (Heartbeat) and/or OpenAIS. manager for Linux-HA (Heartbeat) and/or OpenAIS.
@ -157,13 +180,11 @@ export CFLAGS
--localstatedir=%{_var} --infodir=%{_infodir} \ --localstatedir=%{_var} --infodir=%{_infodir} \
--mandir=%{_mandir} --libdir=%{_libdir} \ --mandir=%{_mandir} --libdir=%{_libdir} \
--libexecdir=%{_libexecdir} \ --libexecdir=%{_libexecdir} \
--with-hapkgversion=%{version} \
--enable-glib-malloc \
--with-ais-prefix=%{_prefix} \ --with-ais-prefix=%{_prefix} \
%if %without_fatal_warnings %if %without_fatal_warnings
--enable-fatal-warnings=no \ --enable-fatal-warnings=no \
%endif %endif
--enable-pretty --with-hapkgversion=%{version}
export MAKE="make %{?jobs:-j%jobs}" export MAKE="make %{?jobs:-j%jobs}"
make %{?jobs:-j%jobs} make %{?jobs:-j%jobs}
########################################################### ###########################################################
@ -171,9 +192,16 @@ make %{?jobs:-j%jobs}
%install %install
########################################################### ###########################################################
#make DESTDIR=$RPM_BUILD_ROOT install-strip #make DESTDIR=$RPM_BUILD_ROOT install-strip
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
chmod a+x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/crm_primitive.py
rm $RPM_BUILD_ROOT/%{_libdir}/service_crm.so
(
cd $RPM_BUILD_ROOT/%{_sbindir}
rm crm_standby crm_master crm_failcount
ln crm_attribute crm_standby
ln crm_attribute crm_master
ln crm_attribute crm_failcount
)
#%if %with_ais_support #%if %with_ais_support
# mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/lcrso # mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/lcrso
# cp $RPM_BUILD_ROOT/%{_libdir}/service_crm.so $RPM_BUILD_ROOT/%{_libexecdir}/lcrso/pacemaker.lcrso # cp $RPM_BUILD_ROOT/%{_libdir}/service_crm.so $RPM_BUILD_ROOT/%{_libexecdir}/lcrso/pacemaker.lcrso
@ -197,36 +225,21 @@ fi
rm -rf $RPM_BUILD_DIR/pacemaker rm -rf $RPM_BUILD_DIR/pacemaker
########################################################### ###########################################################
%pre %post -n libpacemaker3 -p /sbin/ldconfig
%preun %postun -n libpacemaker3 -p /sbin/ldconfig
# Use the following if more commands need to be executed
# %post
# /sbin/ldconfig
# [...]
# http://en.opensuse.org/SUSE_Package_Conventions/RPM_Macros
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files %files
########################################################### ###########################################################
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_libdir}/heartbeat %dir %{_libdir}/heartbeat
%dir %{_var}/run/heartbeat
%dir %{_var}/lib/heartbeat
%{_datadir}/pacemaker %{_datadir}/pacemaker
#%{_datadir}/heartbeat #%{_datadir}/heartbeat
%{_libdir}/heartbeat/* %{_libdir}/heartbeat/*
%dir %{_var}/lib/heartbeat %exclude %{_libdir}/heartbeat/crm_utils.py
%{_libdir}/libcib.so.* %exclude %{_libdir}/heartbeat/crm_commands.py
%{_libdir}/libcrmcommon.so.*
%{_libdir}/libcrmcluster.so.*
#%{_libdir}/heartbeat/crm_primitive.py
%{_libdir}/libpe_status.so.*
%{_libdir}/libpe_rules.so.*
%{_libdir}/libpengine.so.*
%{_libdir}/libtransitioner.so.*
%{_libdir}/libstonithd.so.*
%{_sbindir}/cibadmin %{_sbindir}/cibadmin
%{_sbindir}/crm_attribute %{_sbindir}/crm_attribute
%{_sbindir}/crm_diff %{_sbindir}/crm_diff
@ -250,13 +263,25 @@ rm -rf $RPM_BUILD_DIR/pacemaker
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/heartbeat/crm %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/heartbeat/crm
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/heartbeat/pengine %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/heartbeat/pengine
%dir %attr (750, %{uname}, %{gname}) %{_var}/run/heartbeat/crm %dir %attr (750, %{uname}, %{gname}) %{_var}/run/heartbeat/crm
%dir /usr/lib/ocf
%dir /usr/lib/ocf/resource.d %dir /usr/lib/ocf/resource.d
/usr/lib/ocf/resource.d/pacemaker /usr/lib/ocf/resource.d/pacemaker
%if %with_ais_support %if %with_ais_support
%{_libexecdir}/lcrso/pacemaker.lcrso %{_libexecdir}/lcrso/pacemaker.lcrso
%endif %endif
%files devel %files -n libpacemaker3
%defattr(-,root,root)
%{_libdir}/libcib.so.*
%{_libdir}/libcrmcommon.so.*
%{_libdir}/libcrmcluster.so.*
%{_libdir}/libpe_status.so.*
%{_libdir}/libpe_rules.so.*
%{_libdir}/libpengine.so.*
%{_libdir}/libtransitioner.so.*
%{_libdir}/libstonithd.so.*
%files -n libpacemaker-devel
%defattr(-,root,root) %defattr(-,root,root)
#%doc %{_datadir}/doc/%{name}-%{version} #%doc %{_datadir}/doc/%{name}-%{version}
%{_includedir}/pacemaker %{_includedir}/pacemaker
@ -264,6 +289,8 @@ rm -rf $RPM_BUILD_DIR/pacemaker
%{_libdir}/*.so %{_libdir}/*.so
%changelog %changelog
* Mon Sep 15 2008 abeekhof@suse.de
- Create a libpacemaker subpackage
* Thu Sep 11 2008 abeekhof@suse.de * Thu Sep 11 2008 abeekhof@suse.de
- Update source tarball to revision: 2087f5b1a5a0 - Update source tarball to revision: 2087f5b1a5a0
+ High: PE: Bug LF:1950 - Ensure the current values for all notification variables are always set (even if empty) + High: PE: Bug LF:1950 - Ensure the current values for all notification variables are always set (even if empty)