瀏覽代碼

rpm: 4.8.1-1
- update to 4.8.1
- add patch1320 to force gpg v3 signature on package signing
- add --force-v3-sigs to gpg option
- use internal dependency generator (upstream default)



git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1838 ec354946-7b23-47d6-9f5a-488ba84defc7

daisuke 14 年之前
父節點
當前提交
46eb521580
共有 1 個文件被更改,包括 14 次插入10 次删除
  1. 14 10
      r/rpm/rpm-vl.spec

+ 14 - 10
r/rpm/rpm-vl.spec

@@ -23,13 +23,13 @@
 Summary: The RPM package management system.
 Summary(ja): RPM パッケージ管理システム
 Name: rpm
-Version: 4.8.0
+Version: 4.8.1
 %{expand: %%define rpm_version %{version}}
-Release: 6%{_dist_release}
+Release: 1%{_dist_release}
 Group: System Environment/Base
 License: GPL
 
-Source: http://rpm.org/releases/rpm-4.7.x/rpm-%{version}.tar.bz2
+Source: http://rpm.org/releases/rpm-4.8.x/rpm-%{version}.tar.bz2
 Source100: rpm-4.4.2-ja.po
 Source110: GROUPS_for_vine.txt
 Source120: GROUPS-DESC_for_vine.txt
@@ -42,8 +42,7 @@ Patch1: rpm-4.5.90-pkgconfig-path.patch
 Patch2: rpm-4.5.90-gstreamer-provides.patch
 
 # Patches already in upstream
-Patch200: rpm-4.8.0-url-segfault.patch
-Patch201: rpm-4.8.0-verify-exitcode.patch
+
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
@@ -57,7 +56,7 @@ Patch1140: rpm-4.8.0-shortcircuit.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
-Patch1200: rpm-4.4.2-use-external-depgen.patch
+#Patch1200: rpm-4.4.2-use-external-depgen.patch
 Patch1210: rpm-4.4.2-deadlock-ppc.patch
 Patch1220: rpm-4.8.0-disable-debug.patch
 Patch1230: rpm-4.8.0-optflags.patch
@@ -68,6 +67,7 @@ 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
+Patch1320: rpm-4.8.1-force-v3-sigs.patch
 
 Conflicts: patch < 2.5
 Requires(post): coreutils, shadow-utils
@@ -208,9 +208,6 @@ rpm-python パッケージには,RPM パッケージマネージャのライ
 %patch1 -p1 -b .pkgconfig-path
 %patch2 -p1 -b .gstreamer-prov
 
-%patch200 -p1 -b .url-segfault
-%patch201 -p1 -b .verify-exitcode
-
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
 
@@ -222,7 +219,7 @@ rpm-python パッケージには,RPM パッケージマネージャのライ
 %patch1170 -p1 -b .legacyaliases
 %patch1180 -p1 -b .no-terminate_build
 %patch1190 -p1 -b .disable-pythonreq
-%patch1200 -p1 -b .use-external-depgen
+#%patch1200 -p1 -b .use-external-depgen
 %ifarch ppc
 %patch1210 -p1 -b .deadlock-ppc
 %endif
@@ -235,6 +232,7 @@ rpm-python パッケージには,RPM パッケージマネージャのライ
 %patch1290 -p1 -b .mono-dependencies
 %patch1300 -p1 -b .xz-support
 %patch1310 -p1 -b .find-a-only
+%patch1320 -p1 -b .force-v3-sigs
 
 # install updated japanese message catalogue
 cp -f po/ja.po po/ja.po.orig
@@ -550,6 +548,12 @@ exit 0
 
 
 %changelog
+* Sun Sep 19 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 4.8.1-1
+- update to 4.8.1
+- add patch1320 to force gpg v3 signature on package signing
+  - add --force-v3-sigs to gpg option
+- use internal dependency generator (upstream default)
+
 * 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)