- Revert using %%configure, it causes problems
- Temporary set %%_gnu macro explictly, just for one build - Resolves: #1303265
This commit is contained in:
parent
6f4d9623c3
commit
3d139e0cf5
19
rpm.spec
19
rpm.spec
@ -29,7 +29,7 @@
|
|||||||
Summary: The RPM package management system
|
Summary: The RPM package management system
|
||||||
Name: rpm
|
Name: rpm
|
||||||
Version: %{rpmver}
|
Version: %{rpmver}
|
||||||
Release: %{?snapver:0.%{snapver}.}19%{?dist}
|
Release: %{?snapver:0.%{snapver}.}20%{?dist}
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Url: http://www.rpm.org/
|
Url: http://www.rpm.org/
|
||||||
Source0: http://rpm.org/releases/rpm-4.12.x/%{name}-%{srcver}.tar.bz2
|
Source0: http://rpm.org/releases/rpm-4.12.x/%{name}-%{srcver}.tar.bz2
|
||||||
@ -333,9 +333,20 @@ export CPPFLAGS CFLAGS LDFLAGS
|
|||||||
|
|
||||||
autoreconf -i -f
|
autoreconf -i -f
|
||||||
|
|
||||||
|
%ifarch %{arm}
|
||||||
|
%global _gnu -gnueabi
|
||||||
|
%endif
|
||||||
|
|
||||||
# Using configure macro has some unwanted side-effects on rpm platform
|
# Using configure macro has some unwanted side-effects on rpm platform
|
||||||
# setup, use the old-fashioned way for now only defining minimal paths.
|
# 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-vendor=redhat \
|
||||||
%{!?with_int_bdb: --with-external-db} \
|
%{!?with_int_bdb: --with-external-db} \
|
||||||
%{!?with_plugins: --disable-plugins} \
|
%{!?with_plugins: --disable-plugins} \
|
||||||
@ -564,6 +575,10 @@ exit 0
|
|||||||
%doc doc/librpm/html/*
|
%doc doc/librpm/html/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 01 2016 Lubos Kardos <lkardos@redhat.com> - 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 <lkardos@redhat.com> - 4.13.0-0.rc1.19
|
* Fri Jan 29 2016 Lubos Kardos <lkardos@redhat.com> - 4.13.0-0.rc1.19
|
||||||
- Use %%configure macro, harden rpm package (#1289734)
|
- Use %%configure macro, harden rpm package (#1289734)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user