diff --git a/fate-323526_pacemaker-tests-shebang-python3.patch b/fate-323526_pacemaker-tests-shebang-python3.patch new file mode 100644 index 0000000..8d9830f --- /dev/null +++ b/fate-323526_pacemaker-tests-shebang-python3.patch @@ -0,0 +1,81 @@ +Index: pacemaker-1.1.18+20180101.494eacba4/cts/CIB.py +=================================================================== +--- pacemaker-1.1.18+20180101.494eacba4.orig/cts/CIB.py ++++ pacemaker-1.1.18+20180101.494eacba4/cts/CIB.py +@@ -403,7 +403,7 @@ Description=Dummy resource that takes a + + [Service] + Type=notify +-ExecStart=/usr/bin/python -c 'import time, systemd.daemon; time.sleep(10); systemd.daemon.notify("READY=1"); time.sleep(86400)' ++ExecStart=/usr/bin/python3 -c 'import time, systemd.daemon; time.sleep(10); systemd.daemon.notify("READY=1"); time.sleep(86400)' + ExecStop=/bin/sh -c 'sleep 10; [ -n "\$MAINPID" ] && kill -s KILL \$MAINPID' + """ + +Index: pacemaker-1.1.18+20180101.494eacba4/cts/CTSlab.py +=================================================================== +--- pacemaker-1.1.18+20180101.494eacba4.orig/cts/CTSlab.py ++++ pacemaker-1.1.18+20180101.494eacba4/cts/CTSlab.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + '''CTS: Cluster Testing System: Lab environment module + ''' +Index: pacemaker-1.1.18+20180101.494eacba4/cts/OCFIPraTest.py +=================================================================== +--- pacemaker-1.1.18+20180101.494eacba4.orig/cts/OCFIPraTest.py ++++ pacemaker-1.1.18+20180101.494eacba4/cts/OCFIPraTest.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + '''OCF IPaddr/IPaddr2 Resource Agent Test''' + +Index: pacemaker-1.1.18+20180101.494eacba4/lrmd/regression.py.in +=================================================================== +--- pacemaker-1.1.18+20180101.494eacba4.orig/lrmd/regression.py.in ++++ pacemaker-1.1.18+20180101.494eacba4/lrmd/regression.py.in +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + """ Regression tests for Pacemaker's lrmd + """ + +@@ -412,7 +412,7 @@ class Tests(object): + os.system("dd if=/dev/urandom of=/etc/pacemaker/authkey bs=4096 count=1") + + ### Make fake systemd daemon and unit file ### +- dummy_daemon = """#!/usr/bin/python ++ dummy_daemon = """#!/usr/bin/python3 + import time, systemd.daemon + time.sleep(3) + systemd.daemon.notify("READY=1") +@@ -432,7 +432,7 @@ description "Dummy service for regre + exec dd if=/dev/random of=/dev/null + """) + +- dummy_fence_sleep_agent = ("""#!/usr/bin/python ++ dummy_fence_sleep_agent = ("""#!/usr/bin/python3 + import sys + import time + def main(): +Index: pacemaker-1.1.18+20180101.494eacba4/fencing/fence_dummy +=================================================================== +--- pacemaker-1.1.18+20180101.494eacba4.orig/fencing/fence_dummy ++++ pacemaker-1.1.18+20180101.494eacba4/fencing/fence_dummy +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + """Dummy fence agent for testing + """ + +Index: pacemaker-1.1.18+20180101.494eacba4/fencing/regression.py.in +=================================================================== +--- pacemaker-1.1.18+20180101.494eacba4.orig/fencing/regression.py.in ++++ pacemaker-1.1.18+20180101.494eacba4/fencing/regression.py.in +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + """ Regression tests for Pacemaker's stonithd + """ + diff --git a/pacemaker-1.1.18+20180101.494eacba4.tar.xz b/pacemaker-1.1.18+20180101.494eacba4.tar.xz deleted file mode 100644 index 1b8d32b..0000000 --- a/pacemaker-1.1.18+20180101.494eacba4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d961239d7211f235bdd831fac4c4d50b1b0ef76294ce10ccfde29fbb5c3ce1e -size 3227664 diff --git a/pacemaker-1.1.18+20180104.7ba28d854.tar.xz b/pacemaker-1.1.18+20180104.7ba28d854.tar.xz new file mode 100644 index 0000000..cbf5968 --- /dev/null +++ b/pacemaker-1.1.18+20180104.7ba28d854.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2d29a8935bc8b561a3903ae555cf7c867f24f4529cf57e46eec9ad2b4fb628d +size 3226060 diff --git a/pacemaker.changes b/pacemaker.changes index 972e786..80bc12b 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Fri Jan 05 03:16:07 UTC 2018 - ygao@suse.com + +- Update to version 1.1.18+20180104.7ba28d854: +- tools: improve crm_standby option handling +- tools: improve crm_standby help and error messages +- tools: improve crm_master option handling +- tools: improve crm_master help and error messages +- tools: remove deprecated stonith_admin option (fate#324508) +- tools: remove deprecated crm_verify option (fate#324508) +- tools: remove deprecated crm_attribute --node-uuid option (fate#324508) +- tools: avoid using deprecated options +- tools: remove deprecated crm_resource options (fate#324508) +- libpe_status: use consistent monitor for implicit remotes +- all: overhaul log locations (fate#324508) + +------------------------------------------------------------------- +Wed Jan 3 12:28:59 UTC 2018 - ygao@suse.com + +- spec: Switch dependencies from python to python3 (fate#323526) +- tests: Switch shebang from /usr/bin/python to /usr/bin/python3 (fate#323526) + * fate-323526_pacemaker-tests-shebang-python3.patch + ------------------------------------------------------------------- Tue Jan 02 10:13:35 UTC 2018 - bliu@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 6d244c1..11e2a4f 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -67,7 +67,7 @@ %endif Name: pacemaker -Version: 1.1.18+20180101.494eacba4 +Version: 1.1.18+20180104.7ba28d854 Release: 0 Summary: Scalable High-Availability cluster resource manager # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary @@ -88,6 +88,7 @@ Patch6: pacemaker-Wno-format-signedness.patch Patch7: bug-943295_pacemaker-lrmd-log-notice.patch Patch8: bug-977201_pacemaker-controld-self-fencing.patch Patch9: bug-995365_pacemaker-cts-restart-systemd-journald.patch +Patch10: fate-323526_pacemaker-tests-shebang-python3.patch # Required for core functionality BuildRequires: autoconf BuildRequires: automake @@ -117,7 +118,7 @@ BuildRequires: pkgconfig(libqb) > 0.13.0 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) # Pacemaker targets compatibility with python 2.6+ and 3.2+ -BuildRequires: pkgconfig(python) >= 2.6 +BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(uuid) Requires: %{name}-cli = %{version}-%{release} @@ -125,7 +126,7 @@ Requires: corosync Requires: libpacemaker3 = %{version}-%{release} Requires: libqb > 0.13.0 Requires: psmisc -Requires: python >= 2.6 +Requires: python3 Requires: resource-agents Recommends: crmsh Recommends: fence-agents @@ -160,8 +161,8 @@ BuildRequires: publican %endif %if %{with_regression_tests} BuildRequires: procps -BuildRequires: python-curses -BuildRequires: python-xml +BuildRequires: python3-curses +BuildRequires: python3-xml %endif %description @@ -267,9 +268,9 @@ for developing tools for Pacemaker. Summary: Test framework for cluster-related technologies Group: Productivity/Clustering/HA Requires: libpacemaker3 = %{version}-%{release} -Requires: python >= 2.6 -#Requires: python-systemd -Recommends: python-systemd +Requires: python3 +#Requires: python3-systemd +Recommends: python3-systemd %description cts Test framework for cluster-related technologies like Pacemaker @@ -297,6 +298,7 @@ manager. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build @@ -582,6 +584,8 @@ fi #%license licenses/LGPLv2.1 %doc COPYING ChangeLog %{_libdir}/libcrmcluster.so.* +%dir %attr (770, %{uname}, %{gname}) %{_var}/log/pacemaker +%dir %attr (770, %{uname}, %{gname}) %{_var}/log/pacemaker/bundles %if %{enable_lib_cluster_pkg} %files -n libpacemaker3-cluster @@ -609,7 +613,7 @@ fi %files cts %defattr(-,root,root) -%{py_sitedir}/cts +%{python3_sitearch}/cts %{_datadir}/pacemaker/tests/cts %{_libexecdir}/pacemaker/lrmd_test #%license licenses/GPLv2