From ea11bb47ea0ad42a12caa936c28435aa15405d573928a2bfcdb0647dad6f1222 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 13 Sep 2008 10:02:11 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pacemaker?expand=0&rev=7 --- pacemaker.changes | 20 +++++++++++++ pacemaker.rpmlintrc | 16 +++++++++++ pacemaker.spec | 68 ++++++++++++++++++++++++--------------------- pacemaker.tar.gz | 4 +-- 4 files changed, 74 insertions(+), 34 deletions(-) create mode 100644 pacemaker.rpmlintrc diff --git a/pacemaker.changes b/pacemaker.changes index d400dda..a4497e3 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu Sep 11 09:33:12 CEST 2008 - abeekhof@suse.de + +- 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:1955 - Ensure unmanaged masters are unconditionally repromoted to ensure they are monitored correctly. + + High: PE: Bug LF:1955 - Fix another case of filtering causing unmanaged master failures + + High: PE: Bug LF:1955 - Umanaged mode prevents master resources from being allocated correctly + + High: PE: Bug N:420538 - Anit-colocation caused a positive node preference + + High: PE: Correctly handle unmanaged resources to prevent them from being started elsewhere + + High: PE: crm_resource - Fix the --migrate command + + High: ais: Move the service id definition to a common location and make sure it is always used + + High: stonithd (LF 1951): fix remote stonith operations + + Medium: Build: Make sure crm_config.h is only ever included once + + Medium: PE: Bug LF:1950 - Notifications do not contain all documented resource state fields + + Medium: PE: Bug N:417585 - Don't restart group children who's individual score drops below zero + + Medium: PE: Implement a true maintenance mode + + Medium: ais: Use the agreed service number + + Medium: Tools: Implement a unified CLI shell + ------------------------------------------------------------------- Mon Sep 1 10:25:58 CEST 2008 - abeekhof@suse.de diff --git a/pacemaker.rpmlintrc b/pacemaker.rpmlintrc new file mode 100644 index 0000000..293eb4f --- /dev/null +++ b/pacemaker.rpmlintrc @@ -0,0 +1,16 @@ +#addFilter(".*") +addFilter("script-without-shebang /usr/share/pacemaker/.*\.rng") +addFilter("script-without-shebang /usr/share/pacemaker/.*\.dtd") +addFilter("script-without-shebang /usr/share/pacemaker/.*\.xsl") +#addFilter("script-without-shebang /usr/share/pacemaker/cts/") +addFilter("non-executable-script /usr/share/pacemaker/cts/") +#addFilter("non-utf8-spec-file heartbeat.spec") +addFilter("no-version-in-last-changelog") +addFilter("shlib-policy-missing-suffix") +addFilter("source-or-patch-not-bzipped") +#addFilter("missing-dependency-to-cron") +#addFilter("no-prereq-on pwdutils") +#addFilter("no-packager-tag") + +# Debug packages take care of this +addFilter("unstripped-binary-or-object") diff --git a/pacemaker.spec b/pacemaker.spec index c5e5e2e..5a9fd64 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -1,5 +1,5 @@ # -# spec file for package pacemaker (Version 0.7.1) +# spec file for package pacemaker (Version 0.7.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,6 +25,8 @@ %define without_fatal_warnings 1 %define with_ais_support 1 %define with_heartbeat_support 1 +%define gname haclient +%define uname hacluster %if 0%{?fedora_version} %define pkg_group System Environment/Daemons %else @@ -33,42 +35,31 @@ Name: pacemaker Summary: The Pacemaker scalable High-Availability cluster resource manager -Version: 0.7.1 -Release: 4 +Version: 0.7.2 +Release: 1 License: GPL v2 or later; LGPL v2.1 or later Url: http://www.clusterlabs.org Group: Productivity/Clustering/HA Source: pacemaker.tar.gz +Source100: pacemaker.rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on %if %with_ais_support BuildRequires: openais-devel -%endif -%if %with_heartbeat_support -BuildRequires: heartbeat heartbeat-devel > 2.1.2 -%endif -%if %{with_ais_support} - %if %{with_heartbeat_support} -Conflicts: pacemaker-ais -Conflicts: pacemaker-heartbeat - %else -Conflicts: pacemaker -Conflicts: pacemaker-heartbeat - %endif -%else -Conflicts: pacemaker -Conflicts: pacemaker-ais -%endif -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} > 1000 -%if %with_ais_support Supplements: openais %endif +%endif %if %with_heartbeat_support +BuildRequires: heartbeat-devel > 2.2 +%if 0%{?suse_version} > 1000 Supplements: heartbeat %endif %endif +Conflicts: heartbeat < 2.99 +Obsoletes: heartbeat < 2.99 +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} == 930 BuildRequires: rpm-devel %endif @@ -169,12 +160,6 @@ export CFLAGS --with-hapkgversion=%{version} \ --enable-glib-malloc \ --with-ais-prefix=%{_prefix} \ -%if %with_ais_support == 0 - --without-ais-support \ -%endif -%if %with_heartbeat_support == 0 - --without-heartbeat-support \ -%endif %if %without_fatal_warnings --enable-fatal-warnings=no \ %endif @@ -198,6 +183,8 @@ make DESTDIR=$RPM_BUILD_ROOT install [ -d $RPM_BUILD_ROOT/usr/share/libtool ] && rm -rf $RPM_BUILD_ROOT/usr/share/libtool find $RPM_BUILD_ROOT -name '*.a' -type f -print0 | xargs -0 rm -f find $RPM_BUILD_ROOT -name '*.la' -type f -print0 | xargs -0 rm -f +find $RPM_BUILD_ROOT -name '*.pyc' -type f -print0 | xargs -0 rm -f +find $RPM_BUILD_ROOT -name '*.pyo' -type f -print0 | xargs -0 rm -f ########################################################### %clean @@ -227,8 +214,8 @@ rm -rf $RPM_BUILD_DIR/pacemaker ########################################################### %defattr(-,root,root) %dir %{_libdir}/heartbeat -%{_prefix}/share/pacemaker -%{_prefix}/share/heartbeat +%{_datadir}/pacemaker +#%{_datadir}/heartbeat %{_libdir}/heartbeat/* %dir %{_var}/lib/heartbeat %{_libdir}/libcib.so.* @@ -246,7 +233,7 @@ rm -rf $RPM_BUILD_DIR/pacemaker %{_sbindir}/crm_failcount %{_sbindir}/crm_master %{_sbindir}/crm_mon -%exclude %{_sbindir}/crm_sh +%{_sbindir}/crm %{_sbindir}/crm_resource %{_sbindir}/crm_standby %{_sbindir}/crm_uuid @@ -263,7 +250,7 @@ rm -rf $RPM_BUILD_DIR/pacemaker %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/heartbeat/crm %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/heartbeat/pengine %dir %attr (750, %{uname}, %{gname}) %{_var}/run/heartbeat/crm -%dir /usr/lib/ocf/resource.d/pacemaker +%dir /usr/lib/ocf/resource.d /usr/lib/ocf/resource.d/pacemaker %if %with_ais_support %{_libexecdir}/lcrso/pacemaker.lcrso @@ -277,6 +264,23 @@ rm -rf $RPM_BUILD_DIR/pacemaker %{_libdir}/*.so %changelog +* Thu Sep 11 2008 abeekhof@suse.de +- 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:1955 - Ensure unmanaged masters are unconditionally repromoted to ensure they are monitored correctly. + + High: PE: Bug LF:1955 - Fix another case of filtering causing unmanaged master failures + + High: PE: Bug LF:1955 - Umanaged mode prevents master resources from being allocated correctly + + High: PE: Bug N:420538 - Anit-colocation caused a positive node preference + + High: PE: Correctly handle unmanaged resources to prevent them from being started elsewhere + + High: PE: crm_resource - Fix the --migrate command + + High: ais: Move the service id definition to a common location and make sure it is always used + + High: stonithd (LF 1951): fix remote stonith operations + + Medium: Build: Make sure crm_config.h is only ever included once + + Medium: PE: Bug LF:1950 - Notifications do not contain all documented resource state fields + + Medium: PE: Bug N:417585 - Don't restart group children who's individual score drops below zero + + Medium: PE: Implement a true maintenance mode + + Medium: ais: Use the agreed service number + + Medium: Tools: Implement a unified CLI shell * Mon Sep 01 2008 abeekhof@suse.de - Update source tarball to revision: 1df197982079 - Try again to fix compilation in STABLE (this time also tested with mbuild) diff --git a/pacemaker.tar.gz b/pacemaker.tar.gz index 37a5136..3c37d55 100644 --- a/pacemaker.tar.gz +++ b/pacemaker.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:426891e32eb06e5473561f2346d94968224737cf9405c993135755db12b3ad91 -size 1160970 +oid sha256:aa446bdbd9014dacb3d41947a7ea1d30a7a9ddc5f071d4bdf85c8e7a6b9d7157 +size 1197953