rpms
/
redhat-rpm-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- new version, lose merged patches (fixes #521141, #455279, #496522, 

#458648)
- require rpm for parent dir, version >= 4.6.0 for sane keyserver behavior
- buildrequire libtool to grab copies of config.guess and config.sub
- add URL to the git repo and upstream changelog as documentation
This commit is contained in:
Panu Matilainen 2010-02-02 09:49:38 +00:00
parent 33faa3a023
commit 7a4a80afb5
13 changed files with 17 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
redhat-rpm-config-9.0.3.tar.bz2
redhat-rpm-config-9.1.0.tar.bz2

56
redhat-rpm-config-9.0.3-F-11-Architectures.patch
View File

@ -1,56 +0,0 @@
diff -Nur redhat-rpm-config-9.0.3-orig/rpmrc redhat-rpm-config-9.0.3/rpmrc
--- redhat-rpm-config-9.0.3-orig/rpmrc 2008-05-06 18:08:20.000000000 -0500
+++ redhat-rpm-config-9.0.3/rpmrc 2009-02-17 14:38:12.000000000 -0600
@@ -2,7 +2,7 @@
optflags: i386 %{__global_cflags} -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables
optflags: i486 %{__global_cflags} -m32 -march=i486 -fasynchronous-unwind-tables
-optflags: i586 %{__global_cflags} -m32 -march=i586 -fasynchronous-unwind-tables
+optflags: i586 %{__global_cflags} -m32 -march=i586 -mtune=generic -fasynchronous-unwind-tables
optflags: i686 %{__global_cflags} -m32 -march=i686 -mtune=generic -fasynchronous-unwind-tables
optflags: athlon %{__global_cflags} -m32 -march=athlon -fasynchronous-unwind-tables
optflags: ia64 %{__global_cflags}
@@ -18,7 +18,9 @@
optflags: sparc %{__global_cflags} -m32 -mcpu=v7 -mtune=ultrasparc
optflags: sparcv8 %{__global_cflags} -m32 -mcpu=v8
optflags: sparcv9 %{__global_cflags} -m32 -mcpu=ultrasparc
+optflags: sparcv9v %{__global_cflags} -m32 -mcpu=niagara
optflags: sparc64 %{__global_cflags} -m64 -mcpu=ultrasparc
+optflags: sparc64v %{__global_cflags} -m64 -mcpu=niagara
optflags: m68k %{__global_cflags}
@@ -47,6 +49,7 @@
optflags: armv5tel %{__global_cflags} -march=armv5te
optflags: armv5tejl %{__global_cflags} -march=armv5te
optflags: armv6l %{__global_cflags} -march=armv6
+optflags: armv7l %{__global_cflags} -march=armv7
optflags: atarist %{__global_cflags}
optflags: atariste %{__global_cflags}
@@ -56,7 +59,23 @@
optflags: milan %{__global_cflags}
optflags: hades %{__global_cflags}
-optflags: s390 %{__global_cflags} -m31
-optflags: s390x %{__global_cflags} -m64
+optflags: s390 %{__global_cflags} -m31 -march=z9-109 -mtune=z10
+optflags: s390x %{__global_cflags} -m64 -march=z9-109 -mtune=z10
+
+# set build arch to fedora buildarches on hardware capable of running it
+# saves having to do rpmbuild --target=
+buildarchtranslate: athlon: i586
+buildarchtranslate: geode: i586
+buildarchtranslate: pentium4: i586
+buildarchtranslate: pentium3: i586
+buildarchtranslate: i686: i586
+buildarchtranslate: i586: i586
+
+buildarchtranslate: sparcv9: sparcv9
+buildarchtranslate: sparcv9v: sparcv9
+
+buildarchtranslate: armv5tejl: armv5tel
+buildarchtranslate: armv6l: armv5tel
+buildarchtranslate: armv7l: armv5tel
macrofiles: /usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:/usr/lib/rpm/redhat/macros:/etc/rpm/macros.*:/etc/rpm/macros:/etc/rpm/%{_target}/macros:~/.rpmmacros

14
redhat-rpm-config-9.0.3-F-11-StrongerHashes.patch
View File

@ -1,14 +0,0 @@
diff -urNp redhat-rpm-config-9.0.3_orig/macros redhat-rpm-config-9.0.3/macros
--- redhat-rpm-config-9.0.3_orig/macros 2009-02-23 12:40:33.000000000 -0500
+++ redhat-rpm-config-9.0.3/macros 2009-02-23 12:47:04.000000000 -0500
@@ -158,6 +158,10 @@ unset DISPLAY\
# Should unpackaged files in a build root terminate a build?
%_unpackaged_files_terminate_build 1
+# Use SHA-256 for FILEDIGESTS instead of default MD5
+%_source_filedigest_algorithm 8
+%_binary_filedigest_algorithm 8
+
%__find_provides /usr/lib/rpm/redhat/find-provides
%__find_requires /usr/lib/rpm/redhat/find-requires

29
redhat-rpm-config-9.0.3-F-12-Architectures.patch
View File

@ -1,29 +0,0 @@
diff -up redhat-rpm-config-9.0.3/rpmrc.foo redhat-rpm-config-9.0.3/rpmrc
--- redhat-rpm-config-9.0.3/rpmrc.foo 2009-07-17 15:47:00.000000000 -0400
+++ redhat-rpm-config-9.0.3/rpmrc 2009-07-17 15:48:46.000000000 -0400
@@ -3,7 +3,7 @@ include: /usr/lib/rpm/rpmrc
optflags: i386 %{__global_cflags} -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables
optflags: i486 %{__global_cflags} -m32 -march=i486 -fasynchronous-unwind-tables
optflags: i586 %{__global_cflags} -m32 -march=i586 -mtune=generic -fasynchronous-unwind-tables
-optflags: i686 %{__global_cflags} -m32 -march=i686 -mtune=generic -fasynchronous-unwind-tables
+optflags: i686 %{__global_cflags} -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables
optflags: athlon %{__global_cflags} -m32 -march=athlon -fasynchronous-unwind-tables
optflags: ia64 %{__global_cflags}
optflags: x86_64 %{__global_cflags} -m64 -mtune=generic
@@ -64,11 +64,11 @@ optflags: s390x %{__global_cflags} -m64
# set build arch to fedora buildarches on hardware capable of running it
# saves having to do rpmbuild --target=
-buildarchtranslate: athlon: i586
-buildarchtranslate: geode: i586
-buildarchtranslate: pentium4: i586
-buildarchtranslate: pentium3: i586
-buildarchtranslate: i686: i586
+buildarchtranslate: athlon: i686
+buildarchtranslate: geode: i686
+buildarchtranslate: pentium4: i686
+buildarchtranslate: pentium3: i686
+buildarchtranslate: i686: i686
buildarchtranslate: i586: i586
buildarchtranslate: sparcv9: sparcv9

21
redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch
View File

@ -1,21 +0,0 @@
diff -up redhat-rpm-config-9.0.3/macros.BAD redhat-rpm-config-9.0.3/macros
--- redhat-rpm-config-9.0.3/macros.BAD 2009-07-21 13:22:43.427201497 -0400
+++ redhat-rpm-config-9.0.3/macros 2009-07-21 13:23:57.692440712 -0400
@@ -73,6 +73,17 @@
#==============================================================================
# ---- Build policy macros.
#
+#
+#---------------------------------------------------------------------
+# Expanded at beginning of %install scriptlet.
+#
+
+%__spec_install_pre %{___build_pre}\
+ [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "${RPM_BUILD_ROOT}"\
+ mkdir -p `dirname "$RPM_BUILD_ROOT"`\
+ mkdir "$RPM_BUILD_ROOT"\
+%{nil}
+
#---------------------------------------------------------------------
# Expanded at end of %install scriptlet.
#

12
redhat-rpm-config-9.0.3-brpssa-speedup.patch
View File

@ -1,12 +0,0 @@
diff -up redhat-rpm-config-9.0.3/brp-strip-static-archive.jx redhat-rpm-config-9.0.3/brp-strip-static-archive
--- redhat-rpm-config-9.0.3/brp-strip-static-archive.jx 2008-05-06 19:08:20.000000000 -0400
+++ redhat-rpm-config-9.0.3/brp-strip-static-archive 2009-08-12 10:52:07.000000000 -0400
@@ -8,7 +8,7 @@ fi
[ -z "$STRIP" ] && STRIP=strip
# Strip static libraries.
-for f in `find $RPM_BUILD_ROOT -type f -a -exec file {} \; | \
+for f in `find $RPM_BUILD_ROOT -name \*.a -a -exec file {} \; | \
grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \
grep 'current ar archive' | \
sed -n -e 's/^\(.*\):[ ]*current ar archive/\1/p'`; do

16
redhat-rpm-config-9.0.3-configure.patch
View File

@ -1,16 +0,0 @@
--- redhat-rpm-config-9.0.3/macros.configure 2008-05-06 17:08:20.000000000 -0600
+++ redhat-rpm-config-9.0.3/macros 2009-11-23 16:08:26.823551835 -0700
@@ -27,11 +27,12 @@
#==============================================================================
# ---- configure and makeinstall.
#
+%_configure ./configure
%configure \
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
- ./configure --build=%{_build} --host=%{_host} \\\
+ %{_configure} --build=%{_build} --host=%{_host} \\\
--target=%{_target_platform} \\\
--program-prefix=%{?_program_prefix} \\\
--prefix=%{_prefix} \\\

40
redhat-rpm-config-9.0.3-filtering-macros.patch
View File

@ -1,40 +0,0 @@
--- redhat-rpm-config-9.0.3/macros.orig 2009-08-07 08:48:50.925412526 -0700
+++ redhat-rpm-config-9.0.3/macros 2009-08-07 08:55:16.374536719 -0700
@@ -243,3 +243,37 @@ kernel_module_package_release 1
fi \
kmp_override_filelist="$filelist" kmp_override_preamble="$preamble" kmp_nobuildreqs="$buildreqs" %{kmodtool} rpmtemplate_kmp %{-n*}%{!-n:%name} %{kverrel} $flavors_to_build 2>/dev/null \
)}
+
+#==============================================================================
+# ---- Generic auto req/prov filtering macros
+#
+# http://fedoraproject.org/wiki/PackagingDrafts/AutoProvidesAndRequiresFiltering
+
+# prevent anything matching from being scanned for provides
+%filter_provides_in(P) %{expand: \
+%global __filter_prov_cmd %{?__filter_prov_cmd} %{__grep} -v %{-P} '%*' | \
+}
+
+# prevent anything matching from being scanned for requires
+%filter_requires_in(P) %{expand: \
+%global __filter_req_cmd %{?__filter_req_cmd} %{__grep} -v %{-P} '%*' | \
+}
+
+# filter anything matching out of the provides stream
+%filter_from_provides() %{expand: \
+%global __filter_from_prov %{?__filter_from_prov} | %{__sed} -e '%*' \
+}
+
+# filter anything matching out of the requires stream
+%filter_from_requires() %{expand: \
+%global __filter_from_req %{?__filter_from_req} | %{__sed} -e '%*' \
+}
+
+# actually set up the filtering bits
+%filter_setup %{expand: \
+%global _use_internal_dependency_generator 0 \
+%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u \
+%global __find_provides /bin/sh -c "%{?__filter_prov_cmd} %{__deploop P} %{?__filter_from_prov}" \
+%global __find_requires /bin/sh -c "%{?__filter_req_cmd} %{__deploop R} %{?__filter_from_req}" \
+}
+

18
redhat-rpm-config-9.0.3-fix-requires.patch
View File

@ -1,18 +0,0 @@
--- find-requires.orig 2008-08-11 09:41:48.000000000 +0300
+++ find-requires 2008-08-11 09:42:25.000000000 +0300
@@ -106,6 +106,7 @@
print $2 ;
}
}
+ (START==2) && /^[A-Za-z]/ { START=3; }
/^Version References:$/ { START=2; }
(START==2) && /required from/ {
sub(/:/, "", $3);
@@ -114,7 +115,6 @@
(START==2) && (LIBNAME!="") && ($4!="") {
print LIBNAME "(" $4 ")'$lib64'";
}
- /^[A-Za-z]/ { START=3; }
'
done | sort -u

32
redhat-rpm-config-9.0.3-jars-with-spaces.patch
View File

@ -1,32 +0,0 @@
--- /usr/lib/rpm/redhat/brp-java-repack-jars.orig 2009-04-20 09:56:37.000000000 -0600
+++ /usr/lib/rpm/redhat/brp-java-repack-jars 2009-04-20 10:01:14.000000000 -0600
@@ -38,8 +38,8 @@
rm -f $j
# Create the directories first.
- for d in `find -type d | LC_ALL=C sort`; do
- mkdir -p $JARDIR/$d
+ find -type d | LC_ALL=C sort | while read d; do
+ mkdir -p "$JARDIR/$d"
done
# Get the modtime from the newest ChangeLog. If the project
@@ -64,14 +64,14 @@
# move the contents over to the a new directory in order and set
# the times.
- for f in `find -type f | LC_ALL=C sort`; do
- cp $f $JARDIR/$f
- touch --date="$DATE" $JARDIR/$f
+ find -type f | LC_ALL=C sort | while read f; do
+ cp "$f" "$JARDIR/$f"
+ touch --date="$DATE" "$JARDIR/$f"
done
popd > /dev/null
# Set the times of the directories.
- touch --date="$DATE" `find $JARDIR -type d`
+ find $JARDIR -type d -print0 | xargs -0 touch --date="$DATE"
# make the jar
pushd $JARDIR > /dev/null

13
redhat-rpm-config-9.0.3-xz-payload.patch
View File

@ -1,13 +0,0 @@
diff -up redhat-rpm-config-9.0.3/macros.fu redhat-rpm-config-9.0.3/macros
--- redhat-rpm-config-9.0.3/macros.fu 2009-07-22 16:23:55.000000000 -0400
+++ redhat-rpm-config-9.0.3/macros 2009-07-22 16:24:24.000000000 -0400
@@ -173,6 +173,9 @@ unset DISPLAY\
%_source_filedigest_algorithm 8
%_binary_filedigest_algorithm 8
+# Use XZ compression for binary payloads
+%_binary_payload w2.xzdio
+
%__find_provides /usr/lib/rpm/redhat/find-provides
%__find_requires /usr/lib/rpm/redhat/find-requires

39
redhat-rpm-config.spec
View File

@ -1,24 +1,16 @@
Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config
Version: 9.0.3
Release: 19%{?dist}
Version: 9.1.0
Release: 1%{?dist}
# No version specified.
License: GPL+
Group: Development/System
URL: http://git.fedoraproject.org/git/redhat-rpm-config
Source: redhat-rpm-config-%{version}.tar.bz2
Patch0: redhat-rpm-config-9.0.3-fix-requires.patch
Patch1: limit-smp-16-threads.patch
Patch2: redhat-rpm-config-9.0.3-F-11-Architectures.patch
Patch3: redhat-rpm-config-9.0.3-F-11-StrongerHashes.patch
Patch4: redhat-rpm-config-9.0.3-F-12-Architectures.patch
Patch5: redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch
Patch6: redhat-rpm-config-9.0.3-xz-payload.patch
Patch7: redhat-rpm-config-9.0.3-jars-with-spaces.patch
Patch8: redhat-rpm-config-9.0.3-brpssa-speedup.patch
Patch9: redhat-rpm-config-9.0.3-filtering-macros.patch
Patch10: redhat-rpm-config-9.0.3-configure.patch
BuildArch: noarch
Requires: mktemp
Requires: rpm >= 4.6.0
BuildRequires: libtool
BuildRoot: %{_tmppath}/%{name}-root
%description
@ -26,32 +18,31 @@ Red Hat specific rpm configuration files.
%prep
%setup -q
%patch0 -p0
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p5
%patch8 -p1
%patch9 -p1
%patch10 -p1
%build
%install
make DESTDIR=${RPM_BUILD_ROOT} install
cp -p %{_datadir}/libtool/config/config.{guess,sub} ${RPM_BUILD_ROOT}/usr/lib/rpm/redhat/
find ${RPM_BUILD_ROOT} -name \*.orig -delete
# buggy makefile in 9.1.0 leaves changelog in wrong place
find ${RPM_BUILD_ROOT} -name ChangeLog -delete
%clean
rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(-,root,root)
%doc ChangeLog
%{_prefix}/lib/rpm/redhat
%changelog
* Tue Feb 2 2010 Panu Matilainen <pmatilai@redhat.com> - 9.1.0-1
- new version, lose merged patches (fixes #521141, #455279, #496522, #458648)
- require rpm for parent dir, version >= 4.6.0 for sane keyserver behavior
- buildrequire libtool to grab copies of config.guess and config.sub
- add URL to the git repo and upstream changelog as documentation
* Mon Nov 23 2009 Orion Poplawski <orion@cora.nwra.com> - 9.0.3-19
- Change configure macro to use _configure to allow override (bug #489942)

2
sources
View File

@ -1 +1 @@
d96d1b209248ddbfb7a943bb5782f522 redhat-rpm-config-9.0.3.tar.bz2
3b71c9d0ccc938989778e3c3892e6b94 redhat-rpm-config-9.1.0.tar.bz2