Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2015-01-09 20:50:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-11-24 11:15:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-01-09 20:50:58.000000000 +0100 @@ -1,0 +2,46 @@ +Fri Jan 9 09:29:11 UTC 2015 - kgronl...@suse.com + +- Pre-release 2.2.0-rc2 +- medium: ui_resource: Set probe interval 0 if not set (bnc#905050) +- doc: Document probe op in resource trace (bnc#905050) +- low: ui_resource: --reprobe and --refresh are deprecated (bnc#905092) +- doc: Document deprecation of refresh and reprobe (bnc#905092) +- medium: parse: Support resource-discovery in location constraints +- medium: pacemaker: Support pacemaker-next as schema +- medium: cibconfig: Allow unsupported schemas with warning +- medium: ra: Use correct path for crmd (#67) +- medium: cmd_status: Show pending if available, enable extra options +- high: config: Fix path to system-wide crm.conf (#67) +- medium: config: Fall back to /etc/crm/crmsh.conf (#67) +- low: cliformat: Colorize id: as identifier (boo#905338) +- medium: cibconfig: Revised CIB schema handling +- medium: ui_configure: Add replace option to commit +- medium: cibconfig: Don't bump epoch if stripping version +- medium: ui_context: Lazily import readline +- medium: ui_configure: selectors in save command +- medium: config: Add core.ignore_missing_metadata (#68) (boo#905910) +- Medium: config: add alwayscolor to display output option +- doc: Clarify documentation for property (boo#905637) +- doc: Add documentation section describing rule expressions (boo#905637) +- doc: Link to documentation on rule expressions +- medium: Allow removing groups even if is_running (boo#905271) +- medium: cibconfig: Delete containers first in edits (boo#905268) +- doc: Improved documentation for show and save +- doc: Add note about modeline for vim syntax +- medium: ui_history: Fix crash using empty object set +- utils: append_file: open destination in append-mode (boo#907528) +- medium: parse: Allow nvpair with no value using name= syntax (#71) +- medium: parse: Enable name[=value] for nvpair (#71) +- Low: term: get rid of annying ^O in piped-to-less-R output +- high: parse: Implicit initial parameter list +- high: crm_pssh: Switch to python-parallax over pssh (bnc#905116) +- low: report: Fix references to PSSH +- low: report: Delay Report creation until use +- medium: utils: Check if path basename is less (#74) +- medium: ui_options: Accept prefix or suffix of option as argument +- medium: Remove CIB version in case no --no-version. +- low: cibconfig: Use LXML to remove version data more robustly (#75) +- low: crm_gv: Avoid crashing if passed None in my_edge +- low: cibconfig: Protect against dereferencing None when building graph + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.SjG42E/_old 2015-01-09 20:50:59.000000000 +0100 +++ /var/tmp/diff_new_pack.SjG42E/_new 2015-01-09 20:50:59.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package crmsh # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,41 +30,32 @@ %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 -%{!?py_ver: %{expand: %%global py_ver %%(echo `python -c "import sys; print sys.version[:3]"`)}} -%{!?py_prefix: %{expand: %%global py_prefix %%(echo `python -c "import sys; print sys.prefix"`)}} -%{!?py_libdir: %{expand: %%global py_libdir %%{expand:%%%%{py_prefix}/%%%%{_lib}/python%%%%{py_ver}}}} -%{!?py_sitedir: %{expand: %%global py_sitedir %%{expand:%%%%{py_libdir}/site-packages}}} +%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: crmsh Summary: High Availability cluster command-line interface License: GPL-2.0+ Group: %{pkg_group} -Version: 2.2.0~rc1 +Version: 2.2.0~rc2 Release: %{?crmsh_release}%{?dist} Url: http://crmsh.github.io Source0: crmsh.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): pacemaker -Requires: pssh Requires: python >= 2.6 Requires: python-dateutil Requires: python-lxml +Requires: python-parallax Requires: which BuildRequires: python-lxml +BuildRequires: python-setuptools %if 0%{?suse_version} Requires: python-PyYAML # Suse splits this off into a separate package Requires: python-curses BuildRequires: fdupes -BuildRequires: libglue-devel -BuildRequires: libpacemaker-devel BuildRequires: python-curses -%else -BuildRequires: cluster-glue-libs-devel -BuildRequires: pacemaker-libs-devel %endif %if 0%{?fedora_version} @@ -85,6 +76,10 @@ BuildRequires: libxslt-tools %endif +%if 0%{?suse_version} > 1110 +BuildArch: noarch +%endif + %description The crm shell is a command-line interface for High-Availability cluster management on GNU/Linux systems. It simplifies the @@ -104,7 +99,19 @@ BuildRequires: python-nose BuildRequires: vim Requires: pacemaker -Requires: pssh + +%if 0%{?suse_version} > 1110 +BuildArch: noarch +%endif + +%if 0%{?suse_version} +BuildRequires: libglue-devel +BuildRequires: libpacemaker-devel +%else +BuildRequires: cluster-glue-libs-devel +BuildRequires: pacemaker-libs-devel +%endif + %endif %description test The crm shell is a command-line interface for High-Availability @@ -128,24 +135,12 @@ %build ./autogen.sh -# RHEL <= 5 does not support --docdir -# SLES <= 10 does not support ./configure --docdir=, -# hence, use this ugly hack -%if 0%{?suse_version} < 1020 -export docdir=%{crmsh_docdir} -%{configure} \ - --sysconfdir=%{_sysconfdir} \ - --localstatedir=%{_var} \ - --with-pkg-name=%{name} \ - --with-version=%{version}-%{release} -%else %{configure} \ --sysconfdir=%{_sysconfdir} \ --localstatedir=%{_var} \ --with-pkg-name=%{name} \ --with-version=%{version}-%{release} \ --docdir=%{crmsh_docdir} -%endif make %{_smp_mflags} docdir=%{crmsh_docdir} @@ -191,7 +186,8 @@ %defattr(-,root,root) %{_sbindir}/crm -%{py_sitedir}/crmsh +%{python_sitelib}/crmsh +%{python_sitelib}/crmsh*.egg-info %{_datadir}/%{name} %exclude %{_datadir}/%{name}/tests ++++++ crmsh.tar.bz2 ++++++ ++++ 3725 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org