Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2013-09-27 17:07:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
 and      /work/SRC/openSUSE:Factory/.crmsh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "crmsh"

Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes      2013-08-27 
20:39:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2013-09-27 
17:07:40.000000000 +0200
@@ -1,0 +2,43 @@
+Wed Sep 25 16:06:59 UTC 2013 - dmuhameda...@suse.com
+
+- cibconf: fix removing cluster properties in edit (bnc#841764)
+- history: improve setting history source
+- cibconf: fix rsc_template referencing (savannah#40011)
+- help: fix help for alias commands
+- history: show and allow completion of all primitives and not
+  only top level resources such as groups
+- site: add missing completions
+- site: add missing command aliases
+- upstream cs: crmsh-1.2.6
+
+-------------------------------------------------------------------
+Mon Sep 23 18:11:39 UTC 2013 - kgronl...@suse.com
+
+- Use fdupes to make symlinks of duplicate .pyo files.
+
+-------------------------------------------------------------------
+Fri Sep 13 13:06:13 UTC 2013 - dmuhameda...@suse.com
+
+- Add crmsh-cibadmin_can_patch.patch: Allow atomic CIB updates
+  (cibadmin -P support)
+
+-------------------------------------------------------------------
+Fri Sep 13 09:05:10 UTC 2013 - dmuhameda...@suse.com
+
+- completion: list all resource ids for rsctest
+- rsctest: fix multistate resource testing
+- rsctest: add support for STONITH resources
+- history: use more anonymous groups to prevent out of groups
+  assertion
+- upstream cs: edde9365afa6
+
+-------------------------------------------------------------------
+Wed Aug 28 14:52:09 UTC 2013 - dmuhameda...@suse.com
+
+- cibconf: disable atomic updates until cibadmin gets fixed
+- cibconf: match special ids on configuration edit (fixes
+  disappearing elements on edit)
+- doc: website sources
+- upstream cs: 5cfd0ebaa7e3 (1.2.6-rc3)
+
+-------------------------------------------------------------------

New:
----
  crmsh-cibadmin_can_patch.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.sUoZFB/_old  2013-09-27 17:07:41.000000000 +0200
+++ /var/tmp/diff_new_pack.sUoZFB/_new  2013-09-27 17:07:41.000000000 +0200
@@ -22,7 +22,7 @@
 
 %global upstream_version tip
 %global upstream_prefix crmsh
-%global crmsh_release 0.rc2
+%global crmsh_release 1
 
 %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 
0%{?rhel} || 0%{?fedora}
 %define pkg_group System Environment/Daemons
@@ -42,9 +42,13 @@
 License:        GPL-2.0+
 Group:          %{pkg_group}
 Version:        1.2.6
-Release:        %{?crmsh_release}.<CI_CNT>.<B_CNT>
+Release:        %{?crmsh_release}%{?dist}
 Url:            http://savannah.nongnu.org/projects/crmsh
 Source0:        crmsh.tar.bz2
+# PATCH-FEATURE-OPENSUSE crmsh-cibadmin_can_patch.patch
+# de...@suse.de -- enable atomic CIB updates here, because our
+# pacemaker version has been fixed in the meantime
+Patch11:        crmsh-cibadmin_can_patch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires(pre): pacemaker
 Requires:       pssh
@@ -56,6 +60,7 @@
 %if 0%{?suse_version}
 # Suse splits this off into a separate package
 Requires:       python-curses
+BuildRequires:  fdupes
 BuildRequires:  libglue-devel
 BuildRequires:  libpacemaker-devel
 BuildRequires:  python-curses
@@ -98,6 +103,7 @@
 
 %prep
 %setup -q -n %{upstream_prefix}
+%patch11 -p1
 
 # Force the local time
 #
@@ -132,6 +138,9 @@
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} docdir=%{crmsh_docdir} install
+%if 0%{?suse_version}
+%fdupes %{buildroot}
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -139,10 +148,14 @@
 %if 0%{?with_regression_tests}
 
 %post
-if ! /usr/share/crmsh/tests/regression.sh ; then
+# NB: this is called twice by OBS, that's why we touch the file
+if [ ! -e /tmp/.crmsh_regression_tests_ran ]; then
+       touch /tmp/.crmsh_regression_tests_ran
+       if ! /usr/share/crmsh/tests/regression.sh ; then
        echo "Shell tests failed."
        cat crmtestout/regression.out
        exit 1
+       fi
 fi
 %endif
 

++++++ crmsh-cibadmin_can_patch.patch ++++++
# HG changeset patch
# Parent edde9365afa66becafaea3b48d29d6c9a8268005
High: cibconfig: enable cibadmin patch functionality

diff -r edde9365afa6 -r 4155dbe91ca1 modules/utils.py
--- a/modules/utils.py  Thu Sep 12 15:20:35 2013 +0200
+++ b/modules/utils.py  Fri Sep 13 15:04:02 2013 +0200
@@ -1005,9 +1005,7 @@ def is_pcmk_118(cib_f=None):
 
 
 def cibadmin_can_patch():
-    # cibadmin -P doesn't handle comments, hopefully in v1.1.11
-    return False
-    #return is_min_pcmk_ver("1.1.11")
+    return True
 
 
 user_prefs = UserPrefs.getInstance()
++++++ crmsh.tar.bz2 ++++++
++++ 1804 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to