Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2018-04-03 12:11:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm" Tue Apr 3 12:11:00 2018 rev:259 rq:591876 version:4.14.1 Changes: -------- --- /work/SRC/openSUSE:Factory/rpm/python-rpm.changes 2018-02-08 14:02:27.548198952 +0100 +++ /work/SRC/openSUSE:Factory/.rpm.new/python-rpm.changes 2018-04-03 12:11:04.125610923 +0200 @@ -1,0 +2,6 @@ +Tue Mar 20 13:59:45 UTC 2018 - [email protected] + +- Switch really to singlespec thus allowing us to build without + python2-devel present in the distribution + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2018-03-07 10:29:05.434570379 +0100 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2018-04-03 12:11:06.613521405 +0200 @@ -1,0 +2,13 @@ +Tue Mar 27 14:31:28 CEST 2018 - [email protected] + +- 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 - [email protected] + +- handle RISC-V relocation in debugedit + new patch: debugedit-riscv.patch + +------------------------------------------------------------------- New: ---- debugedit-riscv.patch source_date_epoch_buildtime.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-rpm.spec ++++++ --- /var/tmp/diff_new_pack.tm9Pql/_old 2018-04-03 12:11:08.781443401 +0200 +++ /var/tmp/diff_new_pack.tm9Pql/_new 2018-04-03 12:11:08.785443256 +0200 @@ -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: 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 @@ 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 ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.tm9Pql/_old 2018-04-03 12:11:08.817442106 +0200 +++ /var/tmp/diff_new_pack.tm9Pql/_new 2018-04-03 12:11:08.817442106 +0200 @@ -49,7 +49,7 @@ 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 @@ 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 @@ %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 ++++++ debugedit-riscv.patch ++++++ >From 86ec4c03de2b7cc6af6ba5b10dd686002e0b588c Mon Sep 17 00:00:00 2001 From: Andreas Schwab <[email protected]> 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", ++++++ source_date_epoch_buildtime.diff ++++++ --- ./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)
