[packages/pacemaker/DEVEL-pacemaker-2] - up to 2.1.2; python3 now - updated manpage_xslt patch - added link patch

qboosh qboosh at pld-linux.org
Mon Feb 7 21:15:07 CET 2022 

commit 4f1c009c80f852e3770832249b050f090ae3ceb7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Feb 7 21:16:30 2022 +0100

    - up to 2.1.2; python3 now
    - updated manpage_xslt patch
    - added link patch

 pacemaker-link.patch         | 20 ++++++++++++++++++++
 pacemaker-manpage_xslt.patch | 15 ++++++++-------
 pacemaker.spec               | 39 ++++++++++++++++++---------------------
 3 files changed, 46 insertions(+), 28 deletions(-)
---
diff --git a/pacemaker.spec b/pacemaker.spec
index 825bbc4..ab5cab4 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -1,3 +1,6 @@
+# TODO:
+# - Source2 vs upstream provided pacemaker.service file
+# - readd pacemaker_remote.init or drop SysV completely
 #
 # Conditional build:
 %bcond_without	corosync	# Corosync stack support
@@ -14,16 +17,17 @@
 Summary:	The scalable High-Availability cluster resource manager
 Summary(pl.UTF-8):	Skalowalny zarządca zasobów klastrów o wysokiej dostępności
 Name:		pacemaker
-Version:	2.0.5
+Version:	2.1.2
 Release:	1
 License:	GPL v2+, LGPL v2.1+
 Group:		Applications/System
 #Source0Download: https://github.com/ClusterLabs/pacemaker/releases
 Source0:	https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-%{version}.tar.gz
-# Source0-md5:	c36c8ed401e39ff3e727ba4bf5fcc2e7
+# Source0-md5:	544c832d5e3d136f74822d89f31f8110
 Source1:	%{name}.tmpfiles
 Source2:	%{name}.init
 Source3:	%{name}.service
+Patch0:		%{name}-link.patch
 Patch1:		%{name}-manpage_xslt.patch
 Patch2:		%{name}-update.patch
 URL:		https://wiki.clusterlabs.org/wiki/Pacemaker
@@ -37,7 +41,7 @@ BuildRequires:	cluster-glue-libs-devel
 BuildRequires:	dbus-devel
 BuildRequires:	docbook-style-xsl
 BuildRequires:	gettext-tools
-BuildRequires:	glib2-devel >= 1:2.16.0
+BuildRequires:	glib2-devel >= 1:2.32.0
 BuildRequires:	gnutls-devel >= 2.12.0
 BuildRequires:	help2man
 BuildRequires:	libltdl-devel
@@ -51,7 +55,7 @@ BuildRequires:	libxslt-progs
 BuildRequires:	ncurses-devel >= 5.4
 BuildRequires:	pam-devel
 BuildRequires:	pkgconfig
-BuildRequires:	python-devel >= 1:2.7
+BuildRequires:	python3-devel >= 1:3.2
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.644
 BuildRequires:	systemd-units
@@ -96,7 +100,7 @@ Pacemaker był wcześniej częścią pakietu Heartbeat.
 Summary:	Pacemaker libraries
 Summary(pl.UTF-8):	Biblioteki Pacemakera
 Group:		Libraries
-Requires:	glib2 >= 1:2.16.0
+Requires:	glib2 >= 1:2.32.0
 Requires:	gnutls-libs >= 2.12.0
 Requires:	libqb >= 0.17.0
 
@@ -113,7 +117,7 @@ Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	bzip2-devel
 Requires:	dbus-devel
-Requires:	glib2-devel >= 1:2.16.0
+Requires:	glib2-devel >= 1:2.32.0
 Requires:	gnutls-devel >= 2.12.0
 Requires:	libqb-devel >= 0.17.0
 Requires:	libxml2-devel >= 2.0
@@ -184,6 +188,7 @@ Dokumentacja do Pacemakera.
 
 %prep
 %setup -qn pacemaker-Pacemaker-%{version}
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
@@ -196,12 +201,11 @@ Dokumentacja do Pacemakera.
 
 # enable systemd explicitly to avoid configure checks via dbus-send or systemctl
 %configure \
-	PYTHON=%{__python} \
+	PYTHON=%{__python3} \
 	--disable-fatal-warnings \
 	--disable-silent-rules \
 	--enable-systemd \
 	--disable-upstart \
-	--with-acl \
 	--with-corosync%{!?with_corosync:=no} \
 	--with-initdir=/etc/rc.d/init.d
 
@@ -252,8 +256,6 @@ fi
 %systemd_reload
 
 %post remote
-/sbin/chkconfig --add pacemaker_remote
-%service pacemaker_remote restart "pacemaker_remote daemon"
 %systemd_post pacemaker_remote.service
 
 %preun remote
@@ -267,7 +269,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog README.markdown doc/*.html doc/security.txt doc/{openstack,pcs-crmsh-quick-ref}.md
+%doc ChangeLog README.markdown doc/*.html doc/security.txt
 %attr(755,root,root) %{_sbindir}/attrd_updater
 %attr(755,root,root) %{_sbindir}/cibadmin
 %attr(755,root,root) %{_sbindir}/crm_attribute
@@ -287,6 +289,7 @@ fi
 %attr(755,root,root) %{_sbindir}/crm_verify
 %attr(755,root,root) %{_sbindir}/crmadmin
 %attr(755,root,root) %{_sbindir}/fence_legacy
+%attr(755,root,root) %{_sbindir}/fence_watchdog
 %attr(755,root,root) %{_sbindir}/iso8601
 %attr(755,root,root) %{_sbindir}/stonith_admin
 %if %{with servicelog}
@@ -296,28 +299,22 @@ fi
 %attr(755,root,root) %{_sbindir}/notifyServicelogEvent
 %endif
 %dir %{_libexecdir}/%{name}
-%attr(755,root,root) %{_libexecdir}/%{name}/attrd
-%attr(755,root,root) %{_libexecdir}/%{name}/cib
-%attr(755,root,root) %{_libexecdir}/%{name}/cibmon
-%attr(755,root,root) %{_libexecdir}/%{name}/crmd
 %attr(755,root,root) %{_libexecdir}/%{name}/cts-exec-helper
 %attr(755,root,root) %{_libexecdir}/%{name}/cts-fence-helper
 %attr(755,root,root) %{_libexecdir}/%{name}/cts-log-watcher
 %attr(755,root,root) %{_libexecdir}/%{name}/cts-support
-%attr(755,root,root) %{_libexecdir}/%{name}/lrmd
 %attr(755,root,root) %{_libexecdir}/%{name}/pacemaker-attrd
 %attr(755,root,root) %{_libexecdir}/%{name}/pacemaker-based
 %attr(755,root,root) %{_libexecdir}/%{name}/pacemaker-controld
 %attr(755,root,root) %{_libexecdir}/%{name}/pacemaker-execd
 %attr(755,root,root) %{_libexecdir}/%{name}/pacemaker-fenced
 %attr(755,root,root) %{_libexecdir}/%{name}/pacemaker-schedulerd
-%attr(755,root,root) %{_libexecdir}/%{name}/pengine
-%attr(755,root,root) %{_libexecdir}/%{name}/stonithd
 %{_datadir}/pacemaker
 %{_datadir}/mibs/PCMK-MIB.txt
-%{py_sitescriptdir}/cts
+%{py3_sitescriptdir}/cts
 %{systemdunitdir}/crm_mon.service
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/pacemaker
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/crm_mon
 %attr(750,root,haclient) %dir %{_sysconfdir}/pacemaker
 %ghost /var/log/pacemaker.log
 %{_mandir}/man7/ocf_pacemaker_*.7*
@@ -343,6 +340,7 @@ fi
 %{_mandir}/man8/crm_verify.8*
 %{_mandir}/man8/crmadmin.8*
 %{_mandir}/man8/fence_legacy.8*
+%{_mandir}/man8/fence_watchdog.8*
 %{_mandir}/man8/iso8601.8*
 %{_mandir}/man8/stonith_admin.8*
 %if %{with servicelog}
@@ -366,7 +364,6 @@ fi
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/ifspeed
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/o2cb
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/ping
-%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/pingd
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/remote
 
 %dir /var/lib/%{name}
@@ -448,7 +445,6 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/pacemaker-remoted
 %attr(755,root,root) %{_sbindir}/pacemaker_remoted
-%attr(755,root,root) /etc/rc.d/init.d/pacemaker_remote
 %{systemdunitdir}/pacemaker_remote.service
 %{_mandir}/man8/pacemaker-remoted.8*
 
@@ -458,6 +454,7 @@ fi
 %attr(755,root,root) %{_sbindir}/pacemakerd
 %attr(755,root,root) /etc/rc.d/init.d/%{name}
 %{systemdunitdir}/%{name}.service
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/pacemaker
 %{_mandir}/man8/pacemakerd.8*
 %endif
 
diff --git a/pacemaker-link.patch b/pacemaker-link.patch
new file mode 100644
index 0000000..5f43abc
--- /dev/null
+++ b/pacemaker-link.patch
@@ -0,0 +1,20 @@
+--- pacemaker-Pacemaker-2.1.2/lib/pengine/Makefile.am.orig	2021-11-24 16:54:28.000000000 +0100
++++ pacemaker-Pacemaker-2.1.2/lib/pengine/Makefile.am	2022-02-07 20:36:18.101808130 +0100
+@@ -29,7 +29,7 @@ libpe_status_la_LDFLAGS	= -version-info
+ libpe_status_la_CFLAGS	= $(CFLAGS_HARDENED_LIB)
+ libpe_status_la_LDFLAGS	+= $(LDFLAGS_HARDENED_LIB)
+ 
+-libpe_status_la_LIBADD	= $(top_builddir)/lib/common/libcrmcommon.la
++libpe_status_la_LIBADD	= $(top_builddir)/lib/common/libcrmcommon.la $(top_builddir)/lib/cib/libcib.la
+ # Use += rather than backlashed continuation lines for parsing by bumplibs
+ libpe_status_la_SOURCES	=
+ libpe_status_la_SOURCES	+= bundle.c
+@@ -48,5 +48,8 @@ libpe_status_la_SOURCES	+= unpack.c
+ libpe_status_la_SOURCES	+= utils.c
+ libpe_status_la_SOURCES	+= pe_output.c
+ 
++$(top_builddir)/lib/cib/libcib.la : libpe_rules.la
++	$(MAKE) -C $(top_builddir)/lib/cib
++
+ clean-generic:
+ 	rm -f *.log *.debug *~
diff --git a/pacemaker-manpage_xslt.patch b/pacemaker-manpage_xslt.patch
index 894f44e..06f5f91 100644
--- a/pacemaker-manpage_xslt.patch
+++ b/pacemaker-manpage_xslt.patch
@@ -1,12 +1,12 @@
---- pacemaker-Pacemaker-2.0.3/configure.ac.orig	2020-05-27 21:20:14.380073396 +0200
-+++ pacemaker-Pacemaker-2.0.3/configure.ac	2020-05-27 21:24:07.088812705 +0200
-@@ -713,27 +713,7 @@
+--- pacemaker-Pacemaker-2.1.2/configure.ac.orig	2022-02-07 20:17:17.317988287 +0100
++++ pacemaker-Pacemaker-2.1.2/configure.ac	2022-02-07 20:19:04.630740257 +0100
+@@ -873,28 +873,7 @@ if test x"${HELP2MAN}" != x""; then
      PCMK_FEATURES="$PCMK_FEATURES generated-manpages"
  fi
  
 -MANPAGE_XSLT=""
 -if test x"${XSLTPROC}" != x""; then
--    AC_MSG_CHECKING(docbook to manpage transform)
+-    AC_MSG_CHECKING([for DocBook-to-manpage transform])
 -    # first try to figure out correct template using xmlcatalog query,
 -    # resort to extensive (semi-deterministic) file search if that fails
 -    DOCBOOK_XSL_URI='http://docbook.sourceforge.net/release/xsl/current'
@@ -15,9 +15,10 @@
 -                   | sed -n 's|^file://||p;q')
 -    if test x"${MANPAGE_XSLT}" = x""; then
 -        DIRS=$(find "${datadir}" -name $(basename $(dirname ${DOCBOOK_XSL_PATH})) \
--               -type d | LC_ALL=C sort)
+-               -type d 2>/dev/null | LC_ALL=C sort)
 -        XSLT=$(basename ${DOCBOOK_XSL_PATH})
--        for d in ${DIRS}; do
+-        for d in ${DIRS}
+-        do
 -            if test -f "${d}/${XSLT}"; then
 -                 MANPAGE_XSLT="${d}/${XSLT}"
 -                 break
@@ -26,6 +27,6 @@
 -    fi
 -fi
 +MANPAGE_XSLT="/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
- AC_MSG_RESULT($MANPAGE_XSLT)
+ AC_MSG_RESULT([$MANPAGE_XSLT])
  AC_SUBST(MANPAGE_XSLT)
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pacemaker.git/commitdiff/4f1c009c80f852e3770832249b050f090ae3ceb7

More information about the pld-cvs-commit mailing list