[packages/rpmrebuild] - fix ARCH tag in generated spec file

adwol adwol at pld-linux.org
Thu Oct 18 23:38:11 CEST 2018


commit 42c79e5193c10ecb43897e18e18068235eece2ae
Author: Adam Osuchowski <adwol at pld-linux.org>
Date:   Thu Oct 18 23:37:09 2018 +0200

    - fix ARCH tag in generated spec file

 rpmrebuild-spec-arch.patch | 12 ++++++++++++
 rpmrebuild.spec            |  2 ++
 2 files changed, 14 insertions(+)
---
diff --git a/rpmrebuild.spec b/rpmrebuild.spec
index 26419b6..e4b6da2 100644
--- a/rpmrebuild.spec
+++ b/rpmrebuild.spec
@@ -10,6 +10,7 @@ Group:		Development/Tools
 Source0:	http://downloads.sourceforge.net/rpmrebuild/%{name}-%{version}.tar.gz
 # Source0-md5:	cb762d14484795986fd909b48f1207b9
 Patch0:		locales.patch
+Patch1:		%{name}-spec-arch.patch
 URL:		http://rpmrebuild.sourceforge.net/
 BuildRequires:	sed >= 4.0
 Requires:	bash
@@ -30,6 +31,7 @@ installed.
 %prep
 %setup -qc
 %patch0 -p1
+%patch1 -p1
 
 # remove non-UTF8 man files
 rm -rf locale/fr_FR
diff --git a/rpmrebuild-spec-arch.patch b/rpmrebuild-spec-arch.patch
new file mode 100644
index 0000000..53819ef
--- /dev/null
+++ b/rpmrebuild-spec-arch.patch
@@ -0,0 +1,12 @@
+diff -ruNp rpmrebuild-2.11.orig/rpmrebuild_rpmqf.src rpmrebuild-2.11/rpmrebuild_rpmqf.src
+--- rpmrebuild-2.11.orig/rpmrebuild_rpmqf.src	2013-07-27 17:52:08.000000000 +0200
++++ rpmrebuild-2.11/rpmrebuild_rpmqf.src	2018-10-18 23:33:54.080468041 +0200
+@@ -45,7 +45,7 @@ echo '%|BUILDHOST?{#dummy}|\
+ %|SIZE?{[#SIZE:           %{SIZE}]}|\
+ %|ARCHIVESIZE?{[#ARCHIVESIZE:           %{ARCHIVESIZE}]}|\
+ %|ARCH?{[#ARCH:         %{ARCH}]}:{#ARCH:        noarch}|\
+-%|ARCH?{[BuildArch:     %{ARCH}]}:{BuildArch:    noarch}|\
++%|ARCH?{[]}:{BuildArch:    noarch}|\
+ %|NAME?{[Name:          %{NAME}]}|\
+ %|VERSION?{[Version:       %{VERSION}]}|\
+ %|RELEASE?{[Release:       %{RELEASE}]}|\
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpmrebuild.git/commitdiff/42c79e5193c10ecb43897e18e18068235eece2ae



More information about the pld-cvs-commit mailing list