From 4fda41147ff6e0acea76de6e4f3496df272b5e73 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 05:19:52 +0000 Subject: import clufter-0.77.1-1.el7 --- diff --git a/.clufter.metadata b/.clufter.metadata index c9b9742..bba10f0 100644 --- a/.clufter.metadata +++ b/.clufter.metadata @@ -1,2 +1,2 @@ -9bba7d491ecc864bba521168e039050e5ac9f2ed SOURCES/clufter-0.77.0-tests.tar.xz -f063247be4eeec9f93e61e2791fcb8e6cd15e8c6 SOURCES/clufter-0.77.0.tar.gz +a8e2a4aeed9ec51b267f59e66f4011d22d434cbd SOURCES/clufter-0.77.1-tests.tar.xz +8dbcaa596a15ed926a2cb93c3cad8a6ae4eb473d SOURCES/clufter-0.77.1.tar.gz diff --git a/.gitignore b/.gitignore index 4469b96..0f83920 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/clufter-0.77.0-tests.tar.xz -SOURCES/clufter-0.77.0.tar.gz +SOURCES/clufter-0.77.1-tests.tar.xz +SOURCES/clufter-0.77.1.tar.gz diff --git a/SOURCES/a75e1456f11725b7a58bc81148a6d6403b2530d2.patch b/SOURCES/a75e1456f11725b7a58bc81148a6d6403b2530d2.patch deleted file mode 100644 index 54e07c4..0000000 --- a/SOURCES/a75e1456f11725b7a58bc81148a6d6403b2530d2.patch +++ /dev/null @@ -1,61 +0,0 @@ -From a75e1456f11725b7a58bc81148a6d6403b2530d2 Mon Sep 17 00:00:00 2001 -From: Jan Pokorný -Date: Dec 01 2017 10:47:51 +0000 -Subject: formats/corosync.rng: support nodelist.node.name configuration option - - -This option within corosync configuration was silently established (and -suggested to overcome certain node identification issues) by pacemaker -without any awareness within the former, and hence was completely -foreign also to a detached attempt to formalize this public config, -interface (known as "corosync.conf" file) by the means of RelaxNG -schema describing its XML equivalent and materialized as an in-tree -corosync.rng file. This used to be prone to validation issues with the -cib2pcscmd* commands, but since corosync now acknowledges that option -just as any other native one[*], set the schema to follow suit. - -[*] https://github.com/corosync/corosync/pull/286 - -Resolves: -Signed-off-by: Jan Pokorný - ---- - -diff --git a/formats/corosync/corosync.rng b/formats/corosync/corosync.rng -index 7b12652..f239da8 100644 ---- a/formats/corosync/corosync.rng -+++ b/formats/corosync/corosync.rng -@@ -376,6 +376,19 @@ adjust nodes in the cluster. - - - -+ -+ This optional configuration option -+provides a unified way for the client software (e.g. pacemaker) atop, -+respectively the end users, to guide establishing a nominal -+(self-)identification for each node in case neither respective -+*ringX_addr* specifies a network hostname nor other means are -+available/effective in this process. Option is not used by Corosync -+itself. -+ -+ -+ -+ -+ - - This configuration option is optional when - using IPv4 and required when using IPv6. This is a 32bit value -@@ -395,8 +408,10 @@ is reserved and should not be used. - - - -- This specifies IP address of one of the nodes for particular ring --as denoted by its number (instead 0, there can be higher numbers). -+ This specifies IP or network hostname -+address of the particular node for particular link as denoted by its -+number (there can be higher numbers instead of 0 that marks the first -+link). - - - - diff --git a/SPECS/clufter.spec b/SPECS/clufter.spec index 05317bc..cf51f37 100644 --- a/SPECS/clufter.spec +++ b/SPECS/clufter.spec @@ -4,15 +4,15 @@ # python2-clufter -> python-clufter Name: clufter -Version: 0.77.0 -Release: 2%{?dist} +Version: 0.77.1 +Release: 1%{?dist} Group: System Environment/Base Summary: Tool/library for transforming/analyzing cluster configuration formats License: GPLv2+ URL: https://pagure.io/%{name} # required for autosetup macro -BuildRequires: git +#BuildRequires: git # Python 2 related BuildRequires: python2-devel @@ -39,11 +39,10 @@ Source0: https://people.redhat.com/jpokorny/pkgs/%{name}/%{name}-%{versio Source1: https://people.redhat.com/jpokorny/pkgs/%{name}/%{name}-%{testver}-tests.tar.xz Source2: https://pagure.io/%{name}/raw/v%{version}/f/misc/fix-jing-simplified-rng.xsl Source3: https://pagure.io/%{name}/raw/v%{version}/f/misc/pacemaker-borrow-schemas -Patch0: https://pagure.io/clufter/c/a75e1456f11725b7a58bc81148a6d6403b2530d2.patch # for pacemaker BuildRequires dependency %if 0%{?rhel} > 0 -ExclusiveArch: i686 x86_64 ppc64le s390x +ExclusiveArch: i686 x86_64 aarch64 ppc64le s390x %endif %description @@ -156,12 +155,12 @@ formats and filters. %prep %setup -b 1 #XXX cannot patch ccs-flatten this way -pushd %{name} >/dev/null -%global __scm git_am -%{expand:%__scm_setup_%{__scm}} -%{__git} config core.whitespace -blank-at-eol -%autopatch -p1 -popd >/dev/null +#pushd {name} >/dev/null +#global __scm git_am +#{expand:__scm_setup_{__scm}} +#{__git} config core.whitespace -blank-at-eol +#autopatch -p1 +#popd >/dev/null %if "%{testver}" != "%{version}" %{__cp} -a ../"%{name}-%{testver}"/* . @@ -358,6 +357,11 @@ test -x '%{_bindir}/%{name}' && test -f "${bashcomp}" \ %{_datarootdir}/%{name}/ext-plugins/lib-pcs %changelog +* Fri Jun 08 2018 Jan Pokorný - 0.77.1-1 +- bump upstream package, see https://pagure.io/clufter/releases +- build for aarch64 + [rhbz#1569111] + * Fri Dec 01 2017 Jan Pokorný - 0.77.0-2 - fix nodelist.node.name configuration option (originaly devised by pacemaker) not supported in corosync.conf with the built-in validation schema @@ -403,6 +407,7 @@ test -x '%{_bindir}/%{name}' && test -f "${bashcomp}" \ * Fri Jul 22 2016 Jan Pokorný - 0.59.0-1 - add ability to borrow validation schemas from pacemaker installed along - bump upstream package, see https://pagure.io/clufter/releases +- build for s390x * Fri Jul 15 2016 Jan Pokorný - 0.58.0-1 - fix Python interpreter propagated as enquoted string with old setuptools