[packages/rpmrebuild] - up to 2.16

[baggins]

commit 7eccf9d9e88de82f927443090cd673fa7a37d783
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Feb 24 22:55:10 2021 +0100

    - up to 2.16

 locales.patch   |  6 +++---
 rpmrebuild.spec | 51 ++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 37 insertions(+), 20 deletions(-)
---
diff --git a/rpmrebuild.spec b/rpmrebuild.spec
index e4b6da2..24debb2 100644
--- a/rpmrebuild.spec
+++ b/rpmrebuild.spec
@@ -1,14 +1,11 @@
-# TODO
-# - broken because rpm5 still does not support BuildArch: %{_target_cpu} on top level package (rpm4 works fine)
-#   http://comments.gmane.org/gmane.comp.package-management.rpm.devel/2681 (reported in 16 Jun 2008)
 Summary:	A tool to build rpm file from rpm database
 Name:		rpmrebuild
-Version:	2.11
-Release:	0.1
+Version:	2.16
+Release:	1
 License:	GPL v2+
 Group:		Development/Tools
 Source0:	http://downloads.sourceforge.net/rpmrebuild/%{name}-%{version}.tar.gz
-# Source0-md5:	cb762d14484795986fd909b48f1207b9
+# Source0-md5:	f924f30767dd87ab321e887fcea1cc57
 Patch0:		locales.patch
 Patch1:		%{name}-spec-arch.patch
 URL:		http://rpmrebuild.sourceforge.net/
@@ -16,7 +13,7 @@ BuildRequires:	sed >= 4.0
 Requires:	bash
 Requires:	cpio
 Requires:	grep
-Requires:	rpm >= 4.0
+Requires:	rpm >= 1:4.0
 Requires:	rpm-build
 Requires:	textutils
 BuildArch:	noarch
@@ -34,17 +31,36 @@ installed.
 %patch1 -p1
 
 # remove non-UTF8 man files
-rm -rf locale/fr_FR
-rm -rf man/fr_FR
-rm -rf plugins/man/fr_FR
+%{__rm} -r locale/fr_FR
+%{__rm} -r man/fr_FR
+%{__rm} -r plugins/man/fr_FR
 
 # move UTF8 man files to the correct location
-mv locale/{fr_FR.UTF-8,fr}
-mv man/{fr_FR.UTF-8,fr}
-mv plugins/man/{fr_FR.UTF-8,fr}
+%{__mv} locale/{fr_FR.UTF-8,fr}
+%{__mv} man/{fr_FR.UTF-8,fr}
+%{__mv} plugins/man/{fr_FR.UTF-8,fr}
 
-# fix for .src without shebangs
-%{__sed} -i -e '1i#!/bin/bash' rpmrebuild_parser.src
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+(bash|sh)(\s|$),#!/bin/bash\1,' \
+      plugins/compat_digest.sh \
+      plugins/demo.sh \
+      plugins/demofiles.sh \
+      plugins/file2pacDep.sh \
+      plugins/nodoc.sh \
+      plugins/set_tag.sh \
+      plugins/un_prelink.sh \
+      plugins/uniq.sh \
+      plugins/unset_tag.sh \
+      processing_func.src \
+      rpmrebuild \
+      rpmrebuild.sh \
+      rpmrebuild_buildroot.sh \
+      rpmrebuild_extract_tags.sh \
+      rpmrebuild_files.sh \
+      rpmrebuild_ghost.sh \
+      rpmrebuild_lib.src \
+      rpmrebuild_parser.src \
+      rpmrebuild_rpmqf.src \
+      spec_func.src
 
 %build
 %{__make}
@@ -62,9 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS Changelog COPYING COPYRIGHT News Todo README
 %attr(755,root,root) %{_bindir}/rpmrebuild
 %{_mandir}/man1/*.1*
-%lang(fr) %{_mandir}/fr/man1/*.1*
 %dir %{_appdir}
-%{_appdir}/VERSION
+%{_appdir}/Version
+%{_appdir}/optional_tags.cfg
 %attr(755,root,root) %{_appdir}/*.sh
 %attr(755,root,root) %{_appdir}/*.src
 %dir %{_appdir}/plugins
@@ -73,5 +89,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_appdir}/locale
 %dir %{_appdir}/locale/en
 %{_appdir}/locale/en/rpmrebuild.lang
+%lang(fr) %{_mandir}/fr/man1/*.1*
 %lang(fr) %dir %{_appdir}/locale/fr
 %lang(fr) %{_appdir}/locale/fr/rpmrebuild.lang
diff --git a/locales.patch b/locales.patch
index 85ed8c4..5075428 100644
--- a/locales.patch
+++ b/locales.patch
@@ -1,11 +1,11 @@
 --- rpmrebuild-2.11/Makefile.include~	2011-10-07 16:30:16.000000000 +0300
 +++ rpmrebuild-2.11/Makefile.include	2015-02-17 17:19:30.297118057 +0200
 @@ -13,7 +13,7 @@
- TARGET_LOCALE := $(DESTDIR)/usr/lib/rpmrebuild/locale
  TARGET_MAN    := $(DESTDIR)/usr/share/man
  
+ # all languages (locale, man, plugins)
 -LANGS := en fr_FR fr_FR.UTF-8
 +LANGS := en fr
+ # default language for html pages
+ LANG_DEF := en
  
- # add current version in man pages
- define MakeManPage
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpmrebuild.git/commitdiff/7eccf9d9e88de82f927443090cd673fa7a37d783