testing/rpm
SHA256
3
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

Accepting request 576971 from home:Andreas_Schwab:Factory

Browse Source 
- auto-config-update-aarch64-ppc64le.diff: Update for riscv64 and enable
  it there

OBS-URL: https://build.opensuse.org/request/show/576971
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=444
This commit is contained in:
Michael Schröder 2018-02-15 12:14:27 +00:00 committed by Git OBS Bridge
parent 63d6cf9855
commit 69e0ecaa4f
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
auto-config-update-aarch64-ppc64le.diff
View File

@ -2,7 +2,7 @@ Index: build/parseBuildInstallClean.c
=================================================================== ===================================================================
--- build/parseBuildInstallClean.c.orig --- build/parseBuildInstallClean.c.orig
+++ build/parseBuildInstallClean.c +++ build/parseBuildInstallClean.c
@@ -46,7 +46,22 @@ int parseBuildInstallClean(rpmSpec spec, @@ -46,7 +46,23 @@ int parseBuildInstallClean(rpmSpec spec,
} else if (rc < 0) { } else if (rc < 0) {
goto exit; goto exit;
} }
@ -16,6 +16,7 @@ Index: build/parseBuildInstallClean.c
+ " grep -q config-patches@ $c || continue\n" + " grep -q config-patches@ $c || continue\n"
+ " grep -q aarch64 $c || install -m 755 $ref/config.$s $c\n" + " grep -q aarch64 $c || install -m 755 $ref/config.$s $c\n"
+ " grep -q ppc64le $c || install -m 755 $ref/config.$s $c\n" + " grep -q ppc64le $c || install -m 755 $ref/config.$s $c\n"
+ " grep -q 'riscv64[-:]' $c || install -m 755 $ref/config.$s $c\n"
+ " done\n" + " done\n"
+ "done\n" + "done\n"
+ ); + );

2
python-rpm.spec
View File

@ -22,7 +22,7 @@ Version: 4.14.1
Release: 0 Release: 0
#!BuildIgnore: rpmlint-Factory #!BuildIgnore: rpmlint-Factory
Summary: Python Bindings for Manipulating RPM Packages Summary: Python Bindings for Manipulating RPM Packages
License: GPL-2.0+ License: GPL-2.0-or-later
Group: Development/Libraries/Python Group: Development/Libraries/Python
Source99: rpm.spec Source99: rpm.spec
BuildRequires: file-devel BuildRequires: file-devel

6
rpm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 15 11:11:21 UTC 2018 - schwab@suse.de
- auto-config-update-aarch64-ppc64le.diff: Update for riscv64 and enable
it there
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 14 10:45:25 CET 2018 - mls@suse.de Wed Feb 14 10:45:25 CET 2018 - mls@suse.de

6
rpm.spec
View File

@ -49,7 +49,7 @@ BuildRequires: zlib-devel
Provides: rpminst Provides: rpminst
Requires(post): %fillup_prereq Requires(post): %fillup_prereq
Summary: The RPM Package Manager Summary: The RPM Package Manager
License: GPL-2.0+ License: GPL-2.0-or-later
Group: System/Packages Group: System/Packages
Version: 4.14.1 Version: 4.14.1
Release: 0 Release: 0
@ -229,7 +229,7 @@ rm -f rpmdb/db.h
%patch -P 100 -P 102 -P 103 -P 108 %patch -P 100 -P 102 -P 103 -P 108
%patch -P 109 -P 111 -P 112 %patch -P 109 -P 111 -P 112
%ifarch aarch64 ppc64le %ifarch aarch64 ppc64le riscv64
%patch6464 %patch6464
%endif %endif
@ -352,7 +352,7 @@ for i in /usr/share/automake-*/*; do
fi fi
done done
popd popd
%ifarch aarch64 ppc64le %ifarch aarch64 ppc64le riscv64
install -m 755 config.guess %{buildroot}/usr/lib/rpm install -m 755 config.guess %{buildroot}/usr/lib/rpm
install -m 755 config.sub %{buildroot}/usr/lib/rpm install -m 755 config.sub %{buildroot}/usr/lib/rpm
%endif %endif