From 3d139e0cf5bc8dc9667013d3e08a62a2bb29ceb8 Mon Sep 17 00:00:00 2001 From: Lubos Kardos Date: Feb 01 2016 13:15:28 +0000 Subject: - Revert using %%configure, it causes problems - Temporary set %%_gnu macro explictly, just for one build - Resolves: #1303265 --- diff --git a/rpm.spec b/rpm.spec index 418cf2d..dced482 100644 --- a/rpm.spec +++ b/rpm.spec @@ -29,7 +29,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}19%{?dist} +Release: %{?snapver:0.%{snapver}.}20%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/rpm-4.12.x/%{name}-%{srcver}.tar.bz2 @@ -333,9 +333,20 @@ export CPPFLAGS CFLAGS LDFLAGS autoreconf -i -f +%ifarch %{arm} +%global _gnu -gnueabi +%endif + # Using configure macro has some unwanted side-effects on rpm platform # setup, use the old-fashioned way for now only defining minimal paths. -%configure \ +./configure \ + --prefix=%{_usr} \ + --sysconfdir=%{_sysconfdir} \ + --localstatedir=%{_var} \ + --sharedstatedir=%{_var}/lib \ + --libdir=%{_libdir} \ + --build=%{_target_platform} \ + --host=%{_target_platform} \ --with-vendor=redhat \ %{!?with_int_bdb: --with-external-db} \ %{!?with_plugins: --disable-plugins} \ @@ -564,6 +575,10 @@ exit 0 %doc doc/librpm/html/* %changelog +* Mon Feb 01 2016 Lubos Kardos - 4.13.0-0.rc1.20 +- Revert using %%configure, it causes problems +- Temporary set %%_gnu macro explictly, just for one build (#1303265) + * Fri Jan 29 2016 Lubos Kardos - 4.13.0-0.rc1.19 - Use %%configure macro, harden rpm package (#1289734)