rpm:

- update to 4.9.1.2
- add patch1330 to enable xz payload (binary payload)
- add BR: file-devel



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

r/rpm/rpm-vl.spec

@@ -23,51 +23,60 @@
 Summary: The RPM package management system.
 Summary(ja): RPM パッケージ管理システム
 Name: rpm
-Version: 4.8.1
+Version: 4.9.1.2
 %{expand: %%define rpm_version %{version}}
-Release: 3%{_dist_release}
+Release: 1%{_dist_release}
 Group: System Environment/Base
 License: GPL
 
 Source: http://rpm.org/releases/rpm-4.8.x/rpm-%{version}.tar.bz2
-Source100: rpm-4.4.2-ja.po
+Source100: rpm-4.9.1.2-ja.po
 Source110: GROUPS_for_vine.txt
 Source120: GROUPS-DESC_for_vine.txt
 Source130: COMPAT32_for_vine
 
 Source200: rpm44-perldeps.pl
 
-Patch0: rpm-4.7.90-devel-autodep.patch
 Patch1: rpm-4.5.90-pkgconfig-path.patch
-Patch2: rpm-4.5.90-gstreamer-provides.patch
 
-# Patches already in upstream
+#conditionally applied patch for arm hardware floating point
+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
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
 Patch302: rpm-4.7.1-geode-i686.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
+
 
 # Patches for Vine Linux
 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
-Patch1170: rpm-4.8.0-legacyaliases.patch
+Patch1140: rpm-4.9.1.2-shortcircuit.patch
+Patch1170: rpm-4.9.1.2-legacyaliases.patch
 Patch1180: rpm-4.4.3-no-terminate_build.patch
-Patch1190: rpm-4.8.0-disable-python-requires.patch
+Patch1190: rpm-4.9.1.2-disable-python-requires.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
+Patch1220: rpm-4.9.1.2-disable-debug.patch
+Patch1230: rpm-4.9.1.2-optflags.patch
 Patch1240: rpm-4.8.0-default-buildarch.patch
 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
-Patch1320: rpm-4.8.1-force-v3-sigs.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
 
 Conflicts: patch < 2.5
 Requires(post): coreutils, shadow-utils
@@ -100,6 +109,7 @@ BuildRequires: libacl-devel
 BuildRequires: nss-devel
 BuildRequires: db4-devel >= 4.8
 BuildRequires: xz-devel
+BuildRequires: file-devel
 
 %if %{with_python_subpackage}
 BuildRequires: python-devel >= %{with_python_version}
@@ -205,12 +215,21 @@ rpm-python パッケージには，RPM パッケージマネージャのライ
 
 %prep
 %setup -q
-%patch0 -p1 -b .devel-autodep
 %patch1 -p1 -b .pkgconfig-path
-%patch2 -p1 -b .gstreamer-prov
+
+%patch100 -p1 -b .fontattr
+%patch101 -p1 -b .elfattr
 
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
+%patch304 -p1 -b .ldflags
+%patch305 -p1 -b .gnome-help
+%patch306 -p1 -b .debugedit-stabs-warn
+
+# this patch cant be applied on softfp builds
+%ifnarch armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv7l
+%patch5 -p1 -b .armhfp
+%endif
 
 # vine patch
 %patch1100 -p1 -b .vine
@@ -231,9 +250,9 @@ 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
 %patch1320 -p1 -b .force-v3-sigs
+%patch1330 -p1 -b .enable-xz-payload
 
 # install updated japanese message catalogue
 cp -f po/ja.po po/ja.po.orig
@@ -275,9 +294,11 @@ export CPPFLAGS CFLAGS
     --with-external-db \
     --without-javaglue \
     --without-perl \
-    --without-selinux
+    --without-selinux \
+    --disable-plugins
 
 make %{?_smp_mflags}
+make -C po ja.gmo
 
 %install
 # XXX rpm needs functioning nptl for configure tests
@@ -435,6 +456,7 @@ exit 0
 %rpmattr	%{__bindir}/rpmsign
 %rpmattr	%{__bindir}/rpmquery
 %rpmattr	%{__bindir}/rpmverify
+%rpmattr	%{__bindir}/rpmkeys
 
 %attr(0755, rpm, rpm)	%dir %{__prefix}/lib/rpm
 %rpmattr	%{__prefix}/lib/rpm/config.guess
@@ -483,6 +505,9 @@ exit 0
 %{__mandir}/man1/gendiff.1*
 %{__mandir}/man8/rpm.8*
 %{__mandir}/man8/rpm2cpio.8*
+%{__mandir}/man8/rpmsign.8*
+%{__mandir}/man8/rpmkeys.8*
+%{__mandir}/man8/rpmdb.8*
 %lang(ja)	%{__mandir}/ja/man[18]/*.[18]*
 %lang(pl)	%{__mandir}/pl/man[18]/*.[18]*
 %lang(ru)	%{__mandir}/ru/man[18]/*.[18]*
@@ -493,10 +518,12 @@ exit 0
 %{__libdir}/librpm.so.*
 %{__libdir}/librpmio.so.*
 %{__libdir}/librpmbuild.so.*
+%{__libdir}/librpmsign.so.*
 
 %files build
 %defattr(-,root,root)
 %rpmattr	%{__bindir}/rpmbuild
+%rpmattr	%{__bindir}/rpmspec
 %rpmattr	%{__prefix}/lib/rpm/brp-*
 %rpmattr	%{__prefix}/lib/rpm/check-files
 %rpmattr	%{__prefix}/lib/rpm/check-prereqs
@@ -511,6 +538,7 @@ exit 0
 %rpmattr	%{__prefix}/lib/rpm/find-requires
 %rpmattr	%{__prefix}/lib/rpm/fontconfig.prov
 %rpmattr	%{__prefix}/lib/rpm/javadeps
+%rpmattr	%{__prefix}/lib/rpm/elfdeps
 %rpmattr	%{__prefix}/lib/rpm/libtooldeps.sh
 %rpmattr	%{__prefix}/lib/rpm/mono-find-provides
 %rpmattr	%{__prefix}/lib/rpm/mono-find-requires
@@ -521,11 +549,16 @@ exit 0
 %rpmattr	%{__prefix}/lib/rpm/perldeps.pl
 %rpmattr	%{__prefix}/lib/rpm/perl.prov
 %rpmattr	%{__prefix}/lib/rpm/perl.req
+%rpmattr	%{__prefix}/lib/rpm/script.req
 %rpmattr	%{__prefix}/lib/rpm/pythondeps.sh
 
+%attr(0755, rpm, rpm)	%dir %{__prefix}/lib/rpm/fileattrs
+%rpmattr	%{__prefix}/lib/rpm/fileattrs/*
+
 %rpmattr	%{__prefix}/lib/rpm/rpmdeps
 
 %{__mandir}/man8/rpmbuild.8*
+%{__mandir}/man8/rpmspec.8*
 %{__mandir}/man8/rpmdeps.8*
 
 %if %{with_python_subpackage}
@@ -543,12 +576,18 @@ exit 0
 %{__libdir}/librpm.so
 %{__libdir}/librpmio.so
 %{__libdir}/librpmbuild.so
+%{__libdir}/librpmsign.so
 %{__mandir}/man8/rpmgraph.8*
 %{__libdir}/pkgconfig/rpm.pc
 %rpmattr	%{__bindir}/rpmgraph
 
 
 %changelog
+* 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)
+- add BR: file-devel
+
 * Mon Jan 10 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.8.1-3
 - rebuild package (fix typo in /usr/lib/rpm/macros on i686)