diff --git a/debugedit-riscv.patch b/debugedit-riscv.patch new file mode 100644 index 0000000..d75e440 --- /dev/null +++ b/debugedit-riscv.patch @@ -0,0 +1,27 @@ +From 86ec4c03de2b7cc6af6ba5b10dd686002e0b588c Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +Date: Mon, 26 Feb 2018 10:34:26 +0100 +Subject: [PATCH] debugedit: handle RISC-V relocation + +Resolves #407 +--- + tools/debugedit.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +Index: tools/debugedit.c +=================================================================== +--- tools/debugedit.c.orig ++++ tools/debugedit.c +@@ -1985,6 +1985,12 @@ edit_dwarf2 (DSO *dso) + if (rtype != R_68K_32) + goto fail; + break; ++#if defined(EM_RISCV) && defined(R_RISCV_32) ++ case EM_RISCV: ++ if (rtype != R_RISCV_32) ++ goto fail; ++ break; ++#endif + default: + fail: + error (1, 0, "%s: Unhandled relocation %d in .debug_info section", diff --git a/python-rpm.changes b/python-rpm.changes index aca340c..724aedc 100644 --- a/python-rpm.changes +++ b/python-rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 20 13:59:45 UTC 2018 - tchvatal@suse.com + +- Switch really to singlespec thus allowing us to build without + python2-devel present in the distribution + ------------------------------------------------------------------- Wed Jan 31 14:45:33 CET 2018 - mls@suse.de diff --git a/python-rpm.spec b/python-rpm.spec index 2915945..eac0b12 100644 --- a/python-rpm.spec +++ b/python-rpm.spec @@ -17,14 +17,16 @@ # +# Enable Python build sourced from rpm spec +%global with_python 1 Name: python-rpm Version: 4.14.1 Release: 0 -#!BuildIgnore: rpmlint-Factory Summary: Python Bindings for Manipulating RPM Packages -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Libraries/Python Source99: rpm.spec +BuildRequires: %{python_module devel} BuildRequires: file-devel BuildRequires: libacl-devel BuildRequires: libbz2-devel @@ -37,22 +39,15 @@ BuildRequires: lua-devel BuildRequires: ncurses-devel BuildRequires: popt-devel BuildRequires: python-rpm-macros -BuildRequires: python2-devel -BuildRequires: python3-devel BuildRequires: xz-devel BuildRequires: zlib-devel +#!BuildIgnore: rpmlint-Factory Requires: rpm = %{version} - +%{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%{_sourcedir}/rpm.spec)} %if "%{python_flavor}" == "python2" Obsoletes: rpm-python < %{version}-%{release} Provides: rpm-python = %{version}-%{release} %endif - -# Enable Python build sourced from rpm spec -%global with_python 1 - -%{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%_sourcedir/rpm.spec)} - %python_subpackages %description @@ -64,7 +59,7 @@ This package should be installed if you want to develop Python programs that will manipulate RPM packages and databases. %prep -%{expand:%(sed -n -e '/^%%prep/,/^%%install/p' <%_sourcedir/rpm.spec | sed -e '1d' -e '$d')} +%{expand:%(sed -n -e '/^%%prep/,/^%%install/p' <%{_sourcedir}/rpm.spec | sed -e '1d' -e '$d')} # The build stage is already declared and pulled in from rpm.spec pushd python diff --git a/rpm.changes b/rpm.changes index 8458b2f..6e973ea 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Mar 27 14:31:28 CEST 2018 - mls@suse.de + +- do not use the source date epoch as buildtime by default + [bnc#1087065] + new patch: source_date_epoch_buildtime.diff + +------------------------------------------------------------------- +Mon Mar 5 09:23:16 UTC 2018 - schwab@suse.de + +- handle RISC-V relocation in debugedit + new patch: debugedit-riscv.patch + ------------------------------------------------------------------- Thu Mar 1 16:42:07 CET 2018 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index 80b67ad..4d6a1ae 100644 --- a/rpm.spec +++ b/rpm.spec @@ -49,7 +49,7 @@ BuildRequires: zlib-devel Provides: rpminst Requires(post): %fillup_prereq Summary: The RPM Package Manager -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Packages Version: 4.14.1 Release: 0 @@ -130,6 +130,8 @@ Patch108: debugedit-macro.diff Patch109: pythondistdeps.diff Patch111: debugedit-bnc1076819.diff Patch112: hardlinks.diff +Patch113: debugedit-riscv.patch +Patch114: source_date_epoch_buildtime.diff Patch6464: auto-config-update-aarch64-ppc64le.diff Patch6465: auto-config-update-riscv64.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -227,7 +229,7 @@ rm -f rpmdb/db.h %patch -P 85 %patch -P 93 -P 94 -P 99 %patch -P 100 -P 102 -P 103 -P 108 -%patch -P 109 -P 111 -P 112 +%patch -P 109 -P 111 -P 112 -P 113 -P 114 %ifarch aarch64 ppc64le riscv64 %patch6464 diff --git a/source_date_epoch_buildtime.diff b/source_date_epoch_buildtime.diff new file mode 100644 index 0000000..78fa800 --- /dev/null +++ b/source_date_epoch_buildtime.diff @@ -0,0 +1,11 @@ +--- ./build/pack.c.orig 2018-03-27 12:21:03.036841297 +0000 ++++ ./build/pack.c 2018-03-27 12:29:56.050400820 +0000 +@@ -161,7 +161,7 @@ static rpm_time_t * getBuildTime(void) + + if (buildTime[0] == 0) { + srcdate = getenv("SOURCE_DATE_EPOCH"); +- if (srcdate) { ++ if (srcdate && rpmExpandNumeric("%{?use_source_date_epoch_as_buildtime}")) { + errno = 0; + epoch = strtol(srcdate, &endptr, 10); + if (srcdate == endptr || *endptr || errno != 0)