Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2013-08-27 20:39:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-03-08 
09:09:22.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2013-08-27 
20:39:57.000000000 +0200
@@ -1,0 +2,55 @@
+Thu Aug  8 13:36:24 UTC 2013 - dmuhameda...@suse.com
+
+- cibconf: repair configure load update
+- upstream cs: 66376eb02944
+
+-------------------------------------------------------------------
+Mon Aug  5 15:56:51 UTC 2013 - dmuhameda...@suse.com
+
+- release candidate 1.2.6-rc1
+- main: allow starting with a specified CIB shadow
+- main: make sure that tmp files get removed
+- cibconf: replace minidom with lxml
+- cibconf: groups can have the container meta attribute
+- cibconf: do not load CIB automatically in a non-interactive
+  mode (bnc#813045)
+- cibconf: allow single level fencing_topology (savannah#38737)
+- cibconf: improve exit code if a referenced element does not
+  exist (e.g. in the show command)
+- cibconf: add simulate alias for the ptest command
+- cibconf: add -S when running crm_simulate (formerly ptest)
+- cibconf: use cibadmin patch to update live CIB (with pcmk >= 1.1.10)
+- cibconf: node ids are not id but text
+- cibconf: improve elements edit operation
+- resource: trace and untrace (RA) commands
+- resource: prevent whitespace in meta_attributes when setting
+  attributes in nested elements such as groups (bnc#815447)
+- resource: add option for better control of group management
+  (bnc#806901)
+- node/resource: improve lifetime processing
+- node: update interface to crm_node, its usage changed
+  (bnc#805278)
+- node: maintenance/ready commands
+- node: ignore case when looking up nodes
+- node: update interface to crm_node (node delete)
+- node: allow forced node removal
+- shadow: fix regression in cib import (from PE file)
+- shadow: set shadow directory according to the user preference
+- history: fix search for resource messages (bnc#803790)
+- history: refresh live report for commands other than info
+  (bnc#807402)
+- history: use anonymous re groups to prevent out of groups assertion
+- history: fix xpath expression for graphs of resource sets
+- history: skip empty lines (!) when searching logs
+- history: add support for rfc5242 date format in syslog
+- userprefs: add reset command
+- ui: fix exit code of crm status if crm_mon fails (savannah#38702)
+- ui: fix exit code of the help command
+- parse: drop obsolete test for operations
+- performance: do not make unnecessary parameter uniqueness test
+  (bnc#806372)
+- performance: check programs existence with python os module
+  (bnc#806372)
+- performance: improve tests for running resources
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.RbAlBP/_old  2013-08-27 20:39:58.000000000 +0200
+++ /var/tmp/diff_new_pack.RbAlBP/_new  2013-08-27 20:39:58.000000000 +0200
@@ -16,15 +16,19 @@
 #
 
 
-# crmsh requires pacemaker, which in turn requires cluster-glue, which has a
-# %pre script which creates the hacluster/haclient user and group used here:
 %global gname haclient
 %global uname hacluster
 %global crmsh_docdir %{_defaultdocdir}/%{name}
 
-%global specversion 0
 %global upstream_version tip
 %global upstream_prefix crmsh
+%global crmsh_release 0.rc2
+
+%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 
0%{?rhel} || 0%{?fedora}
+%define pkg_group System Environment/Daemons
+%else
+%define pkg_group Productivity/Clustering/HA
+%endif
 
 # Compatibility macros for distros (fedora) that don't provide Python macros 
by default
 # Do this instead of trying to conditionally include 
{_rpmconfigdir}/macros.python
@@ -33,53 +37,41 @@
 %{!?py_libdir:  %{expand: %%global py_libdir   
%%{expand:%%%%{py_prefix}/%%%%{_lib}/python%%%%{py_ver}}}}
 %{!?py_sitedir: %{expand: %%global py_sitedir  
%%{expand:%%%%{py_libdir}/site-packages}}}
 
-%global crmsh_release %{specversion}
-
-%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
-%define pkg_group System Environment/Daemons
-%else
-%define pkg_group Productivity/Clustering/HA
-%endif
-
 Name:           crmsh
 Summary:        Pacemaker command line interface
-License:        GPL-2.0
+License:        GPL-2.0+
 Group:          %{pkg_group}
-Version:        1.2.5
-Release:        0
+Version:        1.2.6
+Release:        %{?crmsh_release}.<CI_CNT>.<B_CNT>
 Url:            http://savannah.nongnu.org/projects/crmsh
 Source0:        crmsh.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version}
-Requires(pre): pacemaker-ticket-support >= 2.0
-%endif
-Requires(pre): pacemaker >= 1.1.6
+Requires(pre): pacemaker
 Requires:       pssh
 Requires:       python >= 2.4
 Requires:       python-dateutil
+Requires:       python-lxml
+BuildRequires:  python-lxml
 
 %if 0%{?suse_version}
 # Suse splits this off into a separate package
 Requires:       python-curses
-Requires:       python-xml
+BuildRequires:  libglue-devel
+BuildRequires:  libpacemaker-devel
 BuildRequires:  python-curses
-BuildRequires:  python-xml
+%else
+BuildRequires:  cluster-glue-libs-devel
+BuildRequires:  pacemaker-libs-devel
 %endif
 
 # Required for core functionality
 BuildRequires:  asciidoc
 BuildRequires:  autoconf
 BuildRequires:  automake
-%if 0%{?suse_version}
-BuildRequires:  libglue-devel
-BuildRequires:  libpacemaker-devel
-%else
-BuildRequires:  cluster-glue-libs-devel
-BuildRequires:  pacemaker-libs-devel
-%endif
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  python
+
 %if 0%{?suse_version} > 1210
 # xsltproc is necessary for manpage generation; this is split out into
 # libxslt-tools as of openSUSE 12.2.  Possibly strictly should be
@@ -91,14 +83,18 @@
 BuildRequires:  corosync
 BuildRequires:  procps
 BuildRequires:  python-dateutil
-BuildRequires:  vim-base
+BuildRequires:  vim
 Requires:       pacemaker
+Requires:       pssh
 %endif
 
 %description
-CRM shell is a Pacemaker cluster resource manager command line
-interface. It supports Pacemaker configuration, management, and
-troubleshooting.
+crm shell, a Pacemaker command line interface.
+
+Pacemaker is an advanced, scalable High-Availability cluster resource
+manager for Heartbeat and/or Corosync.
+
+Authors: Dejan Muhamedagic <de...@suse.de> and many others
 
 %prep
 %setup -q -n %{upstream_prefix}
@@ -134,28 +130,19 @@
 make %{_smp_mflags} docdir=%{crmsh_docdir}
 
 %install
-%make_install
-%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
-# docs magically end up in /usr/share/doc/crmsh-$version on Fedora etc.
-# so if we don't get rid of 'em here, they'll end up duplicated, which
-# by default causes an "Installed (but unpackaged) file(s) found" error
-# during build.
-rm -r %{buildroot}%{crmsh_docdir}
-%endif
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} docdir=%{crmsh_docdir} install
+
+%clean
+rm -rf %{buildroot}
 
 %if 0%{?with_regression_tests}
+
 %post
-# Needed so that the shell doesn't get stuck on escape
-# sequences
-# 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
-       export TERM=dumb
-       if ! /usr/share/crmsh/tests/regression.sh ; then
+if ! /usr/share/crmsh/tests/regression.sh ; then
                echo "Shell tests failed."
                cat crmtestout/regression.out
                exit 1
-       fi
 fi
 %endif
 
@@ -169,12 +156,15 @@
 %{py_sitedir}/crmsh
 
 %doc %{_mandir}/man8/crm.8*
-%doc COPYING
-%doc AUTHORS
-%doc ChangeLog
-%doc README
-%doc contrib
+%{crmsh_docdir}/COPYING
+%{crmsh_docdir}/AUTHORS
+%{crmsh_docdir}/crm.8.html
+%{crmsh_docdir}/ChangeLog
+%{crmsh_docdir}/README
+%{crmsh_docdir}/contrib/*
 
+%dir %{crmsh_docdir}
+%dir %{crmsh_docdir}/contrib
 %dir %attr (770, %{uname}, %{gname}) %{_var}/cache/crm
 
 %changelog

++++++ crmsh.tar.bz2 ++++++
++++ 27314 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