|
|
@@ -25,7 +25,7 @@ Summary(ja): RPM パッケージ管理システム
|
|
|
Name: rpm
|
|
|
Version: 4.8.0
|
|
|
%{expand: %%define rpm_version %{version}}
|
|
|
-Release: 5%{_dist_release}
|
|
|
+Release: 6%{_dist_release}
|
|
|
Group: System Environment/Base
|
|
|
License: GPL
|
|
|
|
|
|
@@ -54,7 +54,6 @@ Patch1100: rpm-4.8.0-vine.patch
|
|
|
Patch1120: rpm-4.0.4-langC.patch
|
|
|
#Patch1130: rpm-4.8.0-home.patch
|
|
|
Patch1140: rpm-4.8.0-shortcircuit.patch
|
|
|
-Patch1160: rpm-4.8.0-strip-shared.patch
|
|
|
Patch1170: rpm-4.8.0-legacyaliases.patch
|
|
|
Patch1180: rpm-4.4.3-no-terminate_build.patch
|
|
|
Patch1190: rpm-4.8.0-disable-python-requires.patch
|
|
|
@@ -67,6 +66,8 @@ Patch1250: rpm-4.4.2-add-default-srcdefattr.patch
|
|
|
Patch1260: rpm-4.4.2-man-fix-typo.patch
|
|
|
Patch1270: rpm-4.4.2-vine-groups.patch
|
|
|
Patch1290: rpm-4.4.2.3-find-mono-dependencies.patch
|
|
|
+Patch1300: rpm-4.8.0-brp-compress-xz-support.patch
|
|
|
+Patch1310: rpm-4.8.0-brp-strip-static-archive-find-a-only.patch
|
|
|
|
|
|
Conflicts: patch < 2.5
|
|
|
Requires(post): coreutils, shadow-utils
|
|
|
@@ -218,7 +219,6 @@ rpm-python パッケージには，RPM パッケージマネージャのライ
|
|
|
%patch1120 -p1 -b .langC
|
|
|
#%patch1130 -p1 -b .home
|
|
|
%patch1140 -p1 -b .shortcircuit
|
|
|
-%patch1160 -p1 -b .strip-shared
|
|
|
%patch1170 -p1 -b .legacyaliases
|
|
|
%patch1180 -p1 -b .no-terminate_build
|
|
|
%patch1190 -p1 -b .disable-pythonreq
|
|
|
@@ -233,6 +233,8 @@ rpm-python パッケージには，RPM パッケージマネージャのライ
|
|
|
%patch1260 -p1 -b .man-fix-typo
|
|
|
%patch1270 -p1 -b .vine-groups
|
|
|
%patch1290 -p1 -b .mono-dependencies
|
|
|
+%patch1300 -p1 -b .xz-support
|
|
|
+%patch1310 -p1 -b .find-a-only
|
|
|
|
|
|
# install updated japanese message catalogue
|
|
|
cp -f po/ja.po po/ja.po.orig
|
|
|
@@ -548,6 +550,12 @@ exit 0
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Mar 11 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 4.8.0-6
|
|
|
+- drop patch1160 to disable brp-strip-shared (<BTS:954>)
|
|
|
+- update patch1170 (enable legacymacros again)
|
|
|
+- add patch1300 to brp-compress xz/lzma support
|
|
|
+- add patch1310 to find static libs only on brp-strip-static-archive
|
|
|
+
|
|
|
* Tue Feb 16 2010 KOBAYASHI Taizo <tkoba@vinelinux.org> - 4.8.0-5
|
|
|
- drop Requires: beecrypt and BuildRequires: beecrypt-devel
|
|
|
- added Requires: nss
|
daisuke