From 45f1315a7aa4bf42fa6602a11d845e9634f68614eace7bd7da928dc88193c0d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 3 Oct 2024 17:09:51 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main docbook_5 revision 8c4ce43c4183299f9246570af80ad408 --- docbook_5.changes | 11 +++++++++++ docbook_5.spec | 20 ++++++-------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/docbook_5.changes b/docbook_5.changes index 8e52d21..0e1765b 100644 --- a/docbook_5.changes +++ b/docbook_5.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +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 + +- 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..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,24 +87,16 @@ 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 -%patch501 +%patch -P 501 %build # Nothing to build