Djam/rpm
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/rpm.git synced 2025-02-23 10:23:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatic import for version 5.4.10-10

Browse source
This commit is contained in:
Rosa 2012-11-07 04:01:59 +00:00
parent 3c350c26f0
commit 5581635214
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rpm-5.4.10-fix-ldflags-passing.patch Normal file
View file

@ -0,0 +1,12 @@
--- rpm-5.4.10/macros/mandriva.in.ldflags~ 2012-10-30 09:49:34.586248202 +0100
+++ rpm-5.4.10/macros/mandriva.in 2012-10-31 13:12:19.439849728 +0100
@@ -349,7 +349,8 @@ GCONF_CONFIG_SOURCE=`%{_gconftool_bin} -
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
- %(if [ -n '%ldflags' ]; then echo 'LDFLAGS="$LDFLAGS%ldflags"; export LDFLAGS ;'; fi)
+ %{?ldflags:LDFLAGS="${LDFLAGS:-%{ldflags}}"; export LDFLAGS ;} \
+ %{nil}
%before_configure \
%setup_compile_flags \

16
rpm.spec
View file

@ -59,7 +59,7 @@ Summary: The RPM package management system
Name: rpm
Epoch: 1
Version: %{libver}.%{minorver}
Release: %{?prereldate:0.%{prereldate}.}8
Release: %{?prereldate:0.%{prereldate}.}10
License: LGPLv2.1+
Group: System/Configuration/Packaging
URL: http://rpm5.org/
@ -362,6 +362,9 @@ Patch164: rpm-5.4.10-configure-disable-silent-rules.patch
# fixed for find-debuginfo.sh to properly strip them
# status: ready as they only modify our own distribution specific macros..
Patch165: rpm-5.4.10-post-install-helper-order.patch
# fixes issue with ldflags getting duplicated when configure is run more than once
# status: ready
Patch166: rpm-5.4.10-fix-ldflags-passing.patch
BuildRequires: autoconf >= 2.57
BuildRequires: bzip2-devel
@ -700,7 +703,7 @@ This package contains the RPM API documentation generated in HTML format.
%patch137 -p1 -b .slash~
#patch138 -p1 -b .trigtrans~
%patch139 -p1 -b .fix_verify~
%patch140 -p1 -b .rpmv3~
#patch140 -p1 -b .rpmv3~
%patch143 -p1 -b .mono_newline~
%patch144 -p1 -b .urpm~
%patch146 -p1 -b .nosig~
@ -723,6 +726,7 @@ This package contains the RPM API documentation generated in HTML format.
#patch163 -p1 -b .mdk~
%patch164 -p1 -b .verbosebuilds~
%patch165 -p1 -b .helper_order~
%patch166 -p1 -b .ldflags~
#required by P55, P80, P81, P94..
./autogen.sh
@ -1167,9 +1171,17 @@ ln -f %{buildroot}%{_rpmhome}/bin/{rpmluac,luac}
%changelog
* Mon Nov 05 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.4.10-10
+ Revision: 821918
- drop rpmv3 compatibility patch due to security concerns
- fix %%ldflags issue when %%configure is used more than once within a spec (P166)
* Tue Oct 30 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.4.10-8
+ Revision: 820705
- darnfudgit, forgot to remove exclusivearch workaround..
* Tue Oct 30 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.4.10-7
+ Revision: 820703
- fix so that spec-helper scripts gets run before find-debuginfo.sh so that any
file permissions fixed it relies gets done first (P165)