[rpm] - update to pre-4.10 upstream snapshot - drop/adjust patches as necessary
Panu Matilainen
pmatilai at fedoraproject.org
Tue Mar 20 09:57:10 UTC 2012
commit ae9bea02d8bcb01f17e1d91e441d7553cebb4e48
Author: Panu Matilainen <pmatilai at redhat.com>
Date: Tue Mar 20 11:55:51 2012 +0200
- update to pre-4.10 upstream snapshot
- drop/adjust patches as necessary
.gitignore | 1 +
rpm-4.8.0-no-man-dirs.patch | 13 ---
rpm-4.9.0-armhfp.patch | 73 ---------------
rpm-4.9.0-debuginfo-allnames.patch | 55 -----------
rpm-4.9.1.2-perl-python-attr.patch | 35 -------
rpm-4.9.1.2-perl-script.patch | 12 ---
rpm-4.9.90-armhfp.patch | 61 ++++++++++++
...pecspo.patch => rpm-4.9.90-fedora-specspo.patch | 2 +-
rpm-4.9.90-no-man-dirs.patch | 12 +++
rpm-4.9.x-debugedit-stabs-warn.patch | 13 ---
rpm-4.9.x-elfattr.patch | 16 ---
rpm-4.9.x-exclude-warn.patch | 59 ------------
rpm-4.9.x-fontattr.patch | 15 ---
rpm-4.9.x-gnome-help.patch | 19 ----
rpm-4.9.x-include-cond.patch | 21 ----
rpm-4.9.x-mpsize.patch | 28 ------
rpm-4.9.x-python-memleaks.patch | 66 -------------
rpm-4.9.x-rpmdb-dsi.patch | 98 --------------------
rpm-4.9.x-tstest-fileinfo.patch | 43 ---------
rpm-4.9.x-verify-output.patch | 62 ------------
rpm.spec | 53 +++--------
sources | 2 +-
22 files changed, 89 insertions(+), 670 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 568136d..d757575 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ rpm-4.8.1.tar.bz2
/rpm-4.9.1.tar.bz2
/rpm-4.9.1.1.tar.bz2
/rpm-4.9.1.2.tar.bz2
+/rpm-4.9.90.git11505.tar.bz2
diff --git a/rpm-4.9.90-armhfp.patch b/rpm-4.9.90-armhfp.patch
new file mode 100644
index 0000000..95b452e
--- /dev/null
+++ b/rpm-4.9.90-armhfp.patch
@@ -0,0 +1,61 @@
+diff -uNr rpm-4.9.0-orig//macros.in rpm-4.9.0/macros.in
+--- rpm-4.9.0-orig//macros.in 2011-08-05 12:23:04.000000000 -0500
++++ rpm-4.9.0/macros.in 2011-08-05 12:25:13.000000000 -0500
+@@ -1032,7 +1032,7 @@
+
+ #------------------------------------------------------------------------------
+ # arch macro for all supported ARM processors
+-%arm armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv7l
++%arm armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv7l armv7hl armv7hnl
+
+ #------------------------------------------------------------------------------
+ # arch macro for all supported Sparc processors
+diff -uNr rpm-4.9.0-orig//rpmrc.in rpm-4.9.0/rpmrc.in
+--- rpm-4.9.0-orig//rpmrc.in 2011-08-05 12:23:04.000000000 -0500
++++ rpm-4.9.0/rpmrc.in 2011-08-05 12:26:34.000000000 -0500
+@@ -66,6 +66,8 @@
+ optflags: armv5tejl -O2 -g -march=armv5te
+ optflags: armv6l -O2 -g -march=armv6
+ optflags: armv7l -O2 -g -march=armv7
++optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mthumb
++optflags: armv7hnl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon -mthumb
+
+ optflags: atarist -O2 -g -fomit-frame-pointer
+ optflags: atariste -O2 -g -fomit-frame-pointer
+@@ -140,6 +142,8 @@
+ arch_canon: armv5tejl: armv5tejl 12
+ arch_canon: armv6l: armv6l 12
+ arch_canon: armv7l: armv7l 12
++arch_canon: armv7hl: armv7hl 12
++arch_canon: armv7hnl: armv7hnl 12
+
+ arch_canon: m68kmint: m68kmint 13
+ arch_canon: atarist: m68kmint 13
+@@ -248,6 +252,8 @@
+ buildarchtranslate: armv5tejl: armv5tejl
+ buildarchtranslate: armv6l: armv6l
+ buildarchtranslate: armv7l: armv7l
++buildarchtranslate: armv7hl: armv7hl
++buildarchtranslate: armv7hnl: armv7hnl
+
+ buildarchtranslate: atarist: m68kmint
+ buildarchtranslate: atariste: m68kmint
+@@ -336,6 +342,8 @@
+ arch_compat: armv4tl: armv4l
+ arch_compat: armv4l: armv3l
+ arch_compat: armv3l: noarch
++arch_compat: armv7hnl: armv7hl
++arch_compat: armv7hl: noarch
+
+ arch_compat: atarist: m68kmint noarch
+ arch_compat: atariste: m68kmint noarch
+@@ -441,6 +449,9 @@
+ buildarch_compat: armv4l: armv3l
+ buildarch_compat: armv3l: noarch
+
++buildarch_compat: armv7hnl: armv7hl
++buildarch_compat: armv7hl: noarch
++
+ buildarch_compat: hppa2.0: hppa1.2
+ buildarch_compat: hppa1.2: hppa1.1
+ buildarch_compat: hppa1.1: hppa1.0
diff --git a/rpm-4.8.90-fedora-specspo.patch b/rpm-4.9.90-fedora-specspo.patch
similarity index 98%
rename from rpm-4.8.90-fedora-specspo.patch
rename to rpm-4.9.90-fedora-specspo.patch
index 6920e75..61394cf 100644
--- a/rpm-4.8.90-fedora-specspo.patch
+++ b/rpm-4.9.90-fedora-specspo.patch
@@ -69,7 +69,7 @@ index dc0e0fb..e0a5d1f 100644
+ free(dstring);
}
-
-- dstring = _free(dstring);
+- free(dstring);
#endif
- rc = headerGet(h, tag, td, HEADERGET_ALLOC);
diff --git a/rpm-4.9.90-no-man-dirs.patch b/rpm-4.9.90-no-man-dirs.patch
new file mode 100644
index 0000000..04f276a
--- /dev/null
+++ b/rpm-4.9.90-no-man-dirs.patch
@@ -0,0 +1,12 @@
+diff -up rpm-4.9.90.git11486/scripts/find-lang.sh.no-man-dirs rpm-4.9.90.git11486/scripts/find-lang.sh
+--- rpm-4.9.90.git11486/scripts/find-lang.sh.no-man-dirs 2012-03-07 11:31:10.000000000 +0200
++++ rpm-4.9.90.git11486/scripts/find-lang.sh 2012-03-07 15:11:57.465801075 +0200
+@@ -181,7 +181,7 @@ s:%lang(C) ::
+ find "$TOP_DIR" -type d|sed '
+ s:'"$TOP_DIR"'::
+ '"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+/\)::
+-'"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+$\):%lang(\2) \1*:
++'"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+$\):%lang(\2) \1/*:
+ s:^\([^%].*\)::
+ s:%lang(C) ::
+ /^$/d' >> $MO_NAME
diff --git a/rpm.spec b/rpm.spec
index fe92207..41f5c93 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -11,8 +11,9 @@
%define rpmhome /usr/lib/rpm
-%define rpmver 4.9.1.2
-%define srcver %{rpmver}%{?snapver:-%{snapver}}
+%define rpmver 4.9.90
+%define snapver git11505
+%define srcver %{rpmver}%{?snapver:.%{snapver}}
%define bdbname libdb
%define bdbver 5.2.36
@@ -21,10 +22,10 @@
Summary: The RPM package management system
Name: rpm
Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}14%{?dist}
+Release: %{?snapver:0.%{snapver}.}1%{?dist}
Group: System Environment/Base
Url: http://www.rpm.org/
-Source0: http://rpm.org/releases/rpm-4.9.x/%{name}-%{srcver}.tar.bz2
+Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
%if %{with int_bdb}
Source1: db-%{bdbver}.tar.gz
%endif
@@ -33,42 +34,24 @@ Source10: libsymlink.attr
Patch1: rpm-4.5.90-pkgconfig-path.patch
# Fedora specspo is setup differently than what rpm expects, considering
# this as Fedora-specific patch for now
-Patch2: rpm-4.8.90-fedora-specspo.patch
+Patch2: rpm-4.9.90-fedora-specspo.patch
# In current Fedora, man-pages pkg owns all the localized man directories
-Patch3: rpm-4.8.0-no-man-dirs.patch
+Patch3: rpm-4.9.90-no-man-dirs.patch
# gnupg2 comes installed by default, avoid need to drag in gnupg too
Patch4: rpm-4.8.1-use-gpg2.patch
-Patch5: rpm-4.9.0-armhfp.patch
+Patch5: rpm-4.9.90-armhfp.patch
#conditionally applied patch for arm hardware floating point
Patch6: rpm-4.9.0-armhfp-logic.patch
# Patches already in upstream
-Patch100: rpm-4.9.x-fontattr.patch
-Patch101: rpm-4.9.x-elfattr.patch
-Patch102: rpm-4.9.1.2-perl-python-attr.patch
-Patch103: rpm-4.9.x-mpsize.patch
-Patch104: rpm-4.9.x-rpmdb-dsi.patch
-Patch105: rpm-4.9.x-python-memleaks.patch
-Patch106: rpm-4.9.x-verify-output.patch
-Patch107: rpm-4.9.x-include-cond.patch
-Patch108: rpm-4.9.x-exclude-warn.patch
-Patch109: rpm-4.9.x-tstest-fileinfo.patch
# These are not yet upstream
Patch301: rpm-4.6.0-niagara.patch
Patch302: rpm-4.7.1-geode-i686.patch
-# To be upstreamed after rawhide-testdrive (#641377)
-Patch303: rpm-4.9.0-debuginfo-allnames.patch
# Probably to be upstreamed in slightly different form
Patch304: rpm-4.9.1.1-ld-flags.patch
-# Based on patch from OpenSUSE, without the C-lang related enhancements
-Patch305: rpm-4.9.x-gnome-help.patch
-# Just warn on STABS instead of failing for now
-Patch306: rpm-4.9.x-debugedit-stabs-warn.patch
# Temporary Patch to provide support for updates
Patch400: rpm-4.9.1.2-rpmlib-filesystem-check.patch
-# Recognize Perl script as Perl code
-Patch401: rpm-4.9.1.2-perl-script.patch
# Partially GPL/LGPL dual-licensed and some bits with BSD
# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
@@ -230,26 +213,11 @@ packages on a system.
%patch3 -p1 -b .no-man-dirs
%patch4 -p1 -b .use-gpg2
-%patch100 -p1 -b .fontattr
-%patch101 -p1 -b .elfattr
-%patch102 -p1 -b .perl-python-attr
-%patch103 -p1 -b .mpsize
-%patch104 -p1 -b .rpmdb-dsi
-%patch105 -p1 -b .python-memleaks
-%patch106 -p1 -b .verify-output
-%patch107 -p1 -b .include-cond
-%patch108 -p1 -b .exclude-warn
-%patch109 -p1 -b .tstest-fileinfo
-
%patch301 -p1 -b .niagara
%patch302 -p1 -b .geode
-%patch303 -p1 -b .debuginfo-allnames
%patch304 -p1 -b .ldflags
-%patch305 -p1 -b .gnome-help
-%patch306 -p1 -b .debugedit-stabs-warn
%patch400 -p1 -b .rpmlib-filesystem-check
-%patch401 -p1 -b .perl-script
%patch5 -p1 -b .armhfp
# this patch cant be applied on softfp builds
@@ -278,6 +246,7 @@ export CPPFLAGS CFLAGS LDFLAGS
--localstatedir=%{_var} \
--sharedstatedir=%{_var}/lib \
--libdir=%{_libdir} \
+ --with-vendor=redhat \
%{!?with_int_bdb: --with-external-db} \
%{!?with_plugins: --disable-plugins} \
--with-lua \
@@ -469,6 +438,10 @@ exit 0
%doc COPYING doc/librpm/html/*
%changelog
+* Tue Mar 20 2012 Panu Matilainen <pmatilai at redhat.com> - 4.9.90-0.git11505.1
+- update to 4.10.0 alpha (http://rpm.org/wiki/Releases/4.10.0)
+- drop/adjust patches as necessary
+
* Wed Mar 07 2012 Panu Matilainen <pmatilai at redhat.com> - 4.9.1.2-14
- fix backport thinko in the exclude patch
diff --git a/sources b/sources
index 65ac0c9..3db9f2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85cc5b7adb5806b5abf5b538b088dbdc rpm-4.9.1.2.tar.bz2
+9206167147441cda84a56c338de9ebaa rpm-4.9.90.git11505.tar.bz2
More information about the scm-commits
mailing list