|
|
@@ -25,7 +25,7 @@ Summary(ja): RPM パッケージ管理システム
|
|
|
Name: rpm
|
|
|
Version: 4.9.1.2
|
|
|
%{expand: %%define rpm_version %{version}}
|
|
|
-Release: 1%{_dist_release}
|
|
|
+Release: 2%{_dist_release}
|
|
|
Group: System Environment/Base
|
|
|
License: GPL
|
|
|
|
|
|
@@ -58,7 +58,7 @@ Patch306: rpm-4.9.x-debugedit-stabs-warn.patch
|
|
|
|
|
|
|
|
|
# Patches for Vine Linux
|
|
|
-Patch1100: rpm-4.8.0-vine.patch
|
|
|
+Patch1100: rpm-4.9.1.2-vine.patch
|
|
|
Patch1120: rpm-4.0.4-langC.patch
|
|
|
#Patch1130: rpm-4.8.0-home.patch
|
|
|
Patch1140: rpm-4.9.1.2-shortcircuit.patch
|
|
|
@@ -77,6 +77,7 @@ Patch1290: rpm-4.4.2.3-find-mono-dependencies.patch
|
|
|
Patch1310: rpm-4.9.1.2-brp-strip-static-archive-find-a-only.patch
|
|
|
Patch1320: rpm-4.9.1.2-force-v3-sigs.patch
|
|
|
Patch1330: rpm-4.9.1.2-enable-xz-payload.patch
|
|
|
+Patch1340: rpm-4.9.1.2-disable-rpmbuild-sign.patch
|
|
|
|
|
|
Conflicts: patch < 2.5
|
|
|
Requires(post): coreutils, shadow-utils
|
|
|
@@ -253,6 +254,7 @@ rpm-python パッケージには，RPM パッケージマネージャのライ
|
|
|
%patch1310 -p1 -b .find-a-only
|
|
|
%patch1320 -p1 -b .force-v3-sigs
|
|
|
%patch1330 -p1 -b .enable-xz-payload
|
|
|
+%patch1340 -p1 -b .disable-rpmbuild-sign
|
|
|
|
|
|
# install updated japanese message catalogue
|
|
|
cp -f po/ja.po po/ja.po.orig
|
|
|
@@ -583,6 +585,11 @@ exit 0
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Dec 23 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 4.9.1.2-2
|
|
|
+- fix vine patch
|
|
|
+ - remove broken/dupreacted macro (__id_u)
|
|
|
+- add patch1340 to disable rpmbuild --sign functionality
|
|
|
+
|
|
|
* Thu Dec 22 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 4.9.1.2-1
|
|
|
- update to 4.9.1.2
|
|
|
- add patch1330 to enable xz payload (binary payload)
|
daisuke