[packages/pacemaker/DEVEL-pacemaker-2] - up to 2.0.5

qboosh qboosh at pld-linux.org
Mon Feb 7 20:13:01 CET 2022


commit 2c0aec8ba65e2eb8fb306371f5dbc13f9e10ed7f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Feb 7 20:14:30 2022 +0100

    - up to 2.0.5

 pacemaker-inkscape.patch | 19 -------------------
 pacemaker.spec           | 10 ++++------
 2 files changed, 4 insertions(+), 25 deletions(-)
---
diff --git a/pacemaker.spec b/pacemaker.spec
index 4d774a4..825bbc4 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -14,20 +14,19 @@
 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.3
+Version:	2.0.5
 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:	4fee89ca3485f3bf27689ad9bd1670cb
+# Source0-md5:	c36c8ed401e39ff3e727ba4bf5fcc2e7
 Source1:	%{name}.tmpfiles
 Source2:	%{name}.init
 Source3:	%{name}.service
-Patch0:		%{name}-inkscape.patch
 Patch1:		%{name}-manpage_xslt.patch
 Patch2:		%{name}-update.patch
-URL:		http://clusterlabs.org/wiki/Main_Page
+URL:		https://wiki.clusterlabs.org/wiki/Pacemaker
 %{?with_ipmi:BuildRequires:	OpenIPMI-devel}
 BuildRequires:	asciidoc
 BuildRequires:	autoconf >= 2.64
@@ -185,7 +184,6 @@ Dokumentacja do Pacemakera.
 
 %prep
 %setup -qn pacemaker-Pacemaker-%{version}
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
@@ -221,7 +219,7 @@ touch $RPM_BUILD_ROOT/var/log/pacemaker.log
 
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/pacemaker/tests
 # package as %doc
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/pacemaker/{COPYING,README.markdown,acls.*,crm_fencing.*,licenses}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/pacemaker/{COPYING,README.markdown,crm_fencing.*,licenses}
 
 install -D %{SOURCE1} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 %if %{with corosync}
diff --git a/pacemaker-inkscape.patch b/pacemaker-inkscape.patch
deleted file mode 100644
index 39f5e64..0000000
--- a/pacemaker-inkscape.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- pacemaker-Pacemaker-2.0.3/doc/Makefile.am.orig	2019-11-25 23:54:47.000000000 +0100
-+++ pacemaker-Pacemaker-2.0.3/doc/Makefile.am	2020-05-28 06:15:03.122900431 +0200
-@@ -85,13 +85,13 @@
- graphics: $(PNGS)
- 
- %.png: %.svg
--	$(AM_V_GEN)$(INKSCAPE) --file=$< --export-dpi=90 -C --export-png=$@ $(PCMK_quiet)
-+	$(AM_V_GEN)$(INKSCAPE) $< --export-dpi=90 -C -o $@ $(PCMK_quiet)
- 
- %-small.png: %.svg
--	$(AM_V_GEN)$(INKSCAPE) --file=$< --export-dpi=45 -C --export-png=$@ $(PCMK_quiet)
-+	$(AM_V_GEN)$(INKSCAPE) $< --export-dpi=45 -C -o $@ $(PCMK_quiet)
- 
- %-large.png: %.svg
--	$(AM_V_GEN)$(INKSCAPE) --file=$< --export-dpi=180 -C --export-png=$@ $(PCMK_quiet)
-+	$(AM_V_GEN)$(INKSCAPE) $< --export-dpi=180 -C -o $@ $(PCMK_quiet)
- 
- if IS_ASCIIDOC
- ASCIIDOC_HTML_ARGS	= --unsafe --backend=xhtml11
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pacemaker.git/commitdiff/2c0aec8ba65e2eb8fb306371f5dbc13f9e10ed7f



More information about the pld-cvs-commit mailing list