|
|
@@ -25,7 +25,7 @@ Summary(ja): RPM パッケージ管理システム
|
|
|
Name: rpm
|
|
|
Version: 4.9.1.2
|
|
|
%{expand: %%define rpm_version %{version}}
|
|
|
-Release: 3%{_dist_release}
|
|
|
+Release: 4%{_dist_release}
|
|
|
Group: System Environment/Base
|
|
|
License: GPL
|
|
|
|
|
|
@@ -45,6 +45,14 @@ Patch5: rpm-4.9.0-armhfp.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
|
|
|
@@ -55,6 +63,8 @@ Patch304: rpm-4.9.1.1-ld-flags.patch
|
|
|
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
|
|
|
+# Recognize Perl script as Perl code
|
|
|
+Patch401: rpm-4.9.1.2-perl-script.patch
|
|
|
|
|
|
|
|
|
# Patches for Vine Linux
|
|
|
@@ -220,6 +230,14 @@ rpm-python パッケージには，RPM パッケージマネージャのライ
|
|
|
|
|
|
%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
|
|
|
@@ -227,6 +245,8 @@ rpm-python パッケージには，RPM パッケージマネージャのライ
|
|
|
%patch305 -p1 -b .gnome-help
|
|
|
%patch306 -p1 -b .debugedit-stabs-warn
|
|
|
|
|
|
+%patch401 -p1 -b .perl-script
|
|
|
+
|
|
|
# this patch cant be applied on softfp builds
|
|
|
%ifnarch armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv7l
|
|
|
%patch5 -p1 -b .armhfp
|
|
|
@@ -585,6 +605,9 @@ exit 0
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Mar 13 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 4.9.1.2-4
|
|
|
+- add patch102-109 from upstream
|
|
|
+
|
|
|
* Wed Feb 15 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.9.1.2-3
|
|
|
- rebuild with python-2.7.2
|
|
|
|
daisuke