From 735bf913a3686a085510deb6386da3ffe5b615024a894d9686e021e43943534e Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 26 Feb 2024 13:48:53 +0000 Subject: [PATCH 1/2] Accepting request 1150593 from home:dimstar:rpm4.20:d Prepare for RPM 4.20 OBS-URL: https://build.opensuse.org/request/show/1150593 OBS-URL: https://build.opensuse.org/package/show/Publishing/docbook_5?expand=0&rev=44 --- docbook_5.changes | 5 +++++ docbook_5.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docbook_5.changes b/docbook_5.changes index 8e52d21..dc0a0ae 100644 --- a/docbook_5.changes +++ b/docbook_5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 26 07:50:47 UTC 2024 - Dominique Leuenberger + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Fri Mar 3 06:54:34 UTC 2023 - Thomas Schraitle - 5.2CR5 diff --git a/docbook_5.spec b/docbook_5.spec index 1655b14..f575197 100644 --- a/docbook_5.spec +++ b/docbook_5.spec @@ -104,7 +104,7 @@ chmod -R a+rX,g-w,o-w . find . -type f | xargs chmod a-x # Patching -%patch501 +%patch -P 501 %build # Nothing to build From 9bf4b45df96874be3521d12db36fbffc2ca8ee5baf95dda214d44cac2a2c0166 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 27 Feb 2024 07:38:52 +0000 Subject: [PATCH 2/2] Accepting request 1151928 from home:jengelh:branches:Publishing - Shorten %prep code, utilize everything %setup has to offer. - Avoid piping to xargs when that is not necessary. OBS-URL: https://build.opensuse.org/request/show/1151928 OBS-URL: https://build.opensuse.org/package/show/Publishing/docbook_5?expand=0&rev=45 --- docbook_5.changes | 6 ++++++ docbook_5.spec | 18 +++++------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/docbook_5.changes b/docbook_5.changes index dc0a0ae..0e1765b 100644 --- a/docbook_5.changes +++ b/docbook_5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 26 18:42:00 UTC 2024 - Jan Engelhardt + +- Shorten %prep code, utilize everything %setup has to offer. +- Avoid piping to xargs when that is not necessary. + ------------------------------------------------------------------- Mon Feb 26 07:50:47 UTC 2024 - Dominique Leuenberger diff --git a/docbook_5.spec b/docbook_5.spec index f575197..4985f80 100644 --- a/docbook_5.spec +++ b/docbook_5.spec @@ -1,7 +1,7 @@ # # spec file for package docbook_5 # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -52,7 +52,7 @@ BuildRequires: unzip BuildRequires: xmlstarlet Requires: sgml-skel >= 0.7 Requires(post): sgml-skel >= 0.7 -Requires(postun):sgml-skel >= 0.7 +Requires(postun): sgml-skel >= 0.7 BuildArch: noarch %description @@ -87,21 +87,13 @@ The documentation for the DocBook 5.x specification (%{schemaversions}) %define xml_sysconf_dir %{_sysconfdir}/xml %prep -%setup -q -n %{name} -c -T +%setup -Tcqn %{name} -a3 -a4 -a500 -a510 -a520 sed -i 's_@VERSION@_%{realversion}_g' %{SOURCE1} # Copy catalog, README, and Makefile cp -p %{SOURCE1} %{SOURCE2} %{SOURCE6} . -# Unpack the sources: -tar -xf %{SOURCE500} -tar -xf %{SOURCE510} -unzip %{SOURCE520} -# Unpack the documentation: -tar -xf %{SOURCE3} -tar -xf %{SOURCE4} - -chmod -R a+rX,g-w,o-w . -find . -type f | xargs chmod a-x +find . -type d -exec chmod a+rx {} + +find . -type f -exec chmod u+w,a+r {} + # Patching %patch -P 501