Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2019-07-13 13:33:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm" Sat Jul 13 13:33:16 2019 rev:272 rq:709948 version:4.14.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2019-05-03 22:06:29.910811904 +0200 +++ /work/SRC/openSUSE:Factory/.rpm.new.4615/rpm.changes 2019-07-13 13:33:19.883352766 +0200 @@ -1,0 +2,12 @@ +Fri Jun 7 15:03:15 UTC 2019 - Jan Engelhardt <[email protected]> + +- Enable decompression and creation of zstd-based payloads. +- Add homepage and repo URL. + +------------------------------------------------------------------- +Tue May 14 10:11:34 UTC 2019 - Martin Liška <[email protected]> + +- Add adopt-language-specific-build_fooflags-macros-from-F.patch + (9a50846ceeef2add2344dd463c5562bd69496a23) from master. + +------------------------------------------------------------------- New: ---- adopt-language-specific-build_fooflags-macros-from-F.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-rpm.spec ++++++ --- /var/tmp/diff_new_pack.2bWn59/_old 2019-07-13 13:33:21.579352339 +0200 +++ /var/tmp/diff_new_pack.2bWn59/_new 2019-07-13 13:33:21.583352338 +0200 @@ -26,6 +26,8 @@ Summary: Python Bindings for Manipulating RPM Packages License: GPL-2.0-or-later Group: Development/Libraries/Python +URL: https://rpm.org/ +#Git-Clone: https://github.com/rpm-software-management/rpm Source99: rpm.spec BuildRequires: %{python_module devel} BuildRequires: file-devel @@ -42,6 +44,7 @@ BuildRequires: python-rpm-macros BuildRequires: xz-devel BuildRequires: zlib-devel +BuildRequires: pkgconfig(libzstd) Requires: rpm = %{version} %{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%{_sourcedir}/rpm.spec)} %if "%{python_flavor}" == "python2" ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.2bWn59/_old 2019-07-13 13:33:21.615352330 +0200 +++ /var/tmp/diff_new_pack.2bWn59/_new 2019-07-13 13:33:21.615352330 +0200 @@ -45,6 +45,7 @@ BuildRequires: rpm-build BuildRequires: xz-devel BuildRequires: zlib-devel +BuildRequires: pkgconfig(libzstd) #!BuildIgnore: rpmlint-Factory Provides: rpminst Requires(post): %fillup_prereq @@ -56,6 +57,8 @@ Group: System/Packages Version: 4.14.2.1 Release: 0 +URL: https://rpm.org/ +#Git-Clone: https://github.com/rpm-software-management/rpm Source: http://ftp.rpm.org/releases/rpm-4.14.x/rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source5: rpmsort @@ -129,6 +132,7 @@ Patch118: dwz-compression.patch Patch119: getncpus.diff Patch120: rpmfc-push-name-epoch-version-release-macro-before-invoking-depgens.patch +Patch121: adopt-language-specific-build_fooflags-macros-from-F.patch Patch6464: auto-config-update-aarch64-ppc64le.diff Patch6465: auto-config-update-riscv64.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -228,6 +232,7 @@ %patch -P 100 -P 102 -P 103 -P 108 %patch -P 109 -P 114 -P 117 -P 118 %patch -P 119 -P 120 +%patch121 -p1 %ifarch aarch64 ppc64le riscv64 %patch6464 ++++++ adopt-language-specific-build_fooflags-macros-from-F.patch ++++++ >From 9a50846ceeef2add2344dd463c5562bd69496a23 Mon Sep 17 00:00:00 2001 From: Panu Matilainen <[email protected]> Date: Mon, 6 May 2019 14:44:30 +0300 Subject: [PATCH] Adopt language-specific %build_fooflags macros from Fedora %{optflags} has been the catchall for all compiler options but this is quite limiting as there's no way to add for example C++ specific options distro-wide. This adds separate %build_cflags, %build_cxxflags, %build_fflags for the gcc-supported languages, and additionally %build_ldflags for distro-wide LDFLAGS setting. Based on Florian Weimer's work in Fedoras redhat-rpm-config macros. --- macros.in | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/macros.in b/macros.in index 2ab108776..b6cb52951 100644 --- a/macros.in +++ b/macros.in @@ -999,6 +999,24 @@ package or when debugging this package.\ %_target_vendor %{_host_vendor} %_target_os %{_host_os} +#============================================================================== +# ---- compiler flags. + +# C compiler flags. This is traditionally called CFLAGS in makefiles. +# Historically also available as %%{optflags}, and %%build sets the +# environment variable RPM_OPT_FLAGS to this value. +%build_cflags %{optflags} + +# C++ compiler flags. This is traditionally called CXXFLAGS in makefiles. +%build_cxxflags %{optflags} + +# Fortran compiler flags. Makefiles use both FFLAGS and FCFLAGS as +# the corresponding variable names. +%build_fflags %{optflags} %{?_fmoddir:-I%{_fmoddir}} + +# Link editor flags. This is usually called LDFLAGS in makefiles. +#%build_ldflags -Wl,-z,relro %{?_lto_cflags} + #============================================================================== # ---- specfile macros. # Macro(s) here can be used reliably for reproducible builds. @@ -1010,9 +1028,11 @@ package or when debugging this package.\ # %_configure ./configure %configure \ - CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ - CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ - FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \ + CFLAGS="${CFLAGS:-%{?build_cflags}}" ; export CFLAGS ; \ + CXXFLAGS="${CXXFLAGS:-%{?build_cxxflags}}" ; export CXXFLAGS ; \ + FFLAGS="${FFLAGS:-%{?build_fflags}}" ; export FFLAGS ; \ + FCFLAGS="${FCFLAGS:-%{?build_fflags}}" ; export FCFLAGS ; \ + LDFLAGS="${LDFLAGS:-%{?build_ldflags}}" ; export LDFLAGS ; \ %{_configure} --host=%{_host} --build=%{_build} \\\ --program-prefix=%{?_program_prefix} \\\ --disable-dependency-tracking \\\ -- 2.21.0
