- disable autoconf config.site processing in builds (#962837)
This commit is contained in:
parent
4cf31cb6ea
commit
b1b48bd8b0
12
rpm-4.11.x-siteconfig.patch
Normal file
12
rpm-4.11.x-siteconfig.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up rpm-4.11.0.1/macros.in.siteconfig rpm-4.11.0.1/macros.in
|
||||||
|
--- rpm-4.11.0.1/macros.in.siteconfig 2013-06-11 14:45:01.446979922 +0300
|
||||||
|
+++ rpm-4.11.0.1/macros.in 2013-06-11 14:45:22.148930246 +0300
|
||||||
|
@@ -654,6 +654,8 @@ package or when debugging this package.\
|
||||||
|
export CLASSPATH}\
|
||||||
|
PKG_CONFIG_PATH=\"%{_libdir}/pkgconfig:%{_datadir}/pkgconfig\"\
|
||||||
|
export PKG_CONFIG_PATH\
|
||||||
|
+ CONFIG_SITE=NONE\
|
||||||
|
+ export CONFIG_SITE\
|
||||||
|
\
|
||||||
|
%{verbose:set -x}%{!verbose:exec > /dev/null}\
|
||||||
|
umask 022\
|
8
rpm.spec
8
rpm.spec
@ -22,7 +22,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}.}2%{?dist}
|
Release: %{?snapver:0.%{snapver}.}3%{?dist}
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Url: http://www.rpm.org/
|
Url: http://www.rpm.org/
|
||||||
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
|
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
|
||||||
@ -33,6 +33,8 @@ BuildRequires: libdb-devel
|
|||||||
%endif
|
%endif
|
||||||
Source10: libsymlink.attr
|
Source10: libsymlink.attr
|
||||||
|
|
||||||
|
# Disable autoconf config.site processing (#962837)
|
||||||
|
Patch1: rpm-4.11.x-siteconfig.patch
|
||||||
# Fedora specspo is setup differently than what rpm expects, considering
|
# Fedora specspo is setup differently than what rpm expects, considering
|
||||||
# this as Fedora-specific patch for now
|
# this as Fedora-specific patch for now
|
||||||
Patch2: rpm-4.9.90-fedora-specspo.patch
|
Patch2: rpm-4.9.90-fedora-specspo.patch
|
||||||
@ -222,6 +224,7 @@ packages on a system.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{srcver} %{?with_int_bdb:-a 1}
|
%setup -q -n %{name}-%{srcver} %{?with_int_bdb:-a 1}
|
||||||
|
%patch1 -p1 -b .siteconfig
|
||||||
%patch2 -p1 -b .fedora-specspo
|
%patch2 -p1 -b .fedora-specspo
|
||||||
%patch3 -p1 -b .no-man-dirs
|
%patch3 -p1 -b .no-man-dirs
|
||||||
%patch4 -p1 -b .use-gpg2
|
%patch4 -p1 -b .use-gpg2
|
||||||
@ -461,6 +464,9 @@ exit 0
|
|||||||
%doc COPYING doc/librpm/html/*
|
%doc COPYING doc/librpm/html/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jun 11 2013 Panu Matilainen <pmatilai@redhat.com> - 4.11.1-0.rc1.3
|
||||||
|
- disable autoconf config.site processing in builds (#962837)
|
||||||
|
|
||||||
* Tue Jun 11 2013 Panu Matilainen <pmatilai@redhat.com> - 4.11.1-0.rc1.2
|
* Tue Jun 11 2013 Panu Matilainen <pmatilai@redhat.com> - 4.11.1-0.rc1.2
|
||||||
- fix regression on addressing main package by its name (#972994)
|
- fix regression on addressing main package by its name (#972994)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user