update to 4.10.0

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

r/rpm/rpm-vl.spec

@@ -23,7 +23,7 @@
 Summary: The RPM package management system.
 Summary(ja): RPM パッケージ管理システム
 Name: rpm
-Version: 4.9.1.3
+Version: 4.10.0
 %{expand: %%define rpm_version %{version}}
 Release: 1%{_dist_release}
 Group: System Environment/Base
@@ -40,35 +40,26 @@ Source200: rpm44-perldeps.pl
 Patch1: rpm-4.5.90-pkgconfig-path.patch
 
 #conditionally applied patch for arm hardware floating point
-Patch5: rpm-4.9.0-armhfp.patch
+Patch5: rpm-4.9.90-armhfp.patch
+Patch6: rpm-4.9.0-armhfp-logic.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
+Patch100: rpm-4.10.0-ppc64p7-fixes.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
-# Recognize Perl script as Perl code
-Patch401: rpm-4.9.1.2-perl-script.patch
-
+# Compressed debuginfo support (#833311)
+Patch305: rpm-4.10.0-dwz-debuginfo.patch
+# Minidebuginfo support (#834073)
+Patch306: rpm-4.10.0-minidebuginfo.patch
+# Temporary Patch to provide support for updates
+Patch400: rpm-4.9.1.2-rpmlib-filesystem-check.patch
 
 # Patches for Vine Linux
-Patch1100: rpm-4.9.1.2-vine.patch
+Patch1100: rpm-4.10.0-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,14 +68,13 @@ Patch1180: rpm-4.4.3-no-terminate_build.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.9.1.2-disable-debug.patch
-Patch1230: rpm-4.9.1.2-optflags.patch
+Patch1220: rpm-4.10.0-disable-debug.patch
+Patch1230: rpm-4.10.0-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
-Patch1310: rpm-4.9.1.2-brp-strip-static-archive-find-a-only.patch
+Patch1310: rpm-4.10.0-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
@@ -223,33 +213,34 @@ rpm-python パッケージには，RPM パッケージマネージャのライ
 
 %endif
 
+%package apidocs
+Summary: API documentation for RPM libraries
+Summary(ja): RPM ライブラリの API ドキュメント
+Group: Documentation
+BuildArch: noarch
+
+%description apidocs
+This package contains API documentation for developing applications
+that will manipulate RPM packages and databases.
+
 
 %prep
 %setup -q
 %patch1 -p1 -b .pkgconfig-path
 
-%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
+%patch100 -p1 -b .ppc647p-fixes
 
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
 %patch304 -p1 -b .ldflags
-%patch305 -p1 -b .gnome-help
-%patch306 -p1 -b .debugedit-stabs-warn
-
-%patch401 -p1 -b .perl-script
+%patch305 -p1 -b .dwz-debuginfo
+%patch306 -p1 -b .minidebuginfo
+%patch400 -p1 -b .rpmlib-filesystem-check
 
+%patch5 -p1 -b .armhfp
 # this patch cant be applied on softfp builds
 %ifnarch armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv7l
-%patch5 -p1 -b .armhfp
+%patch6 -p1 -b .armhfp-logic
 %endif
 
 # vine patch
@@ -268,7 +259,6 @@ rpm-python パッケージには，RPM パッケージマネージャのライ
 %patch1230 -p1 -b .optflags
 %patch1240 -p1 -b .default-buildarch
 %patch1250 -p1 -b .default-srcdefattr
-%patch1260 -p1 -b .man-fix-typo
 %patch1270 -p1 -b .vine-groups
 %patch1290 -p1 -b .mono-dependencies
 %patch1310 -p1 -b .find-a-only
@@ -303,11 +293,14 @@ CFLAGS="$RPM_OPT_FLAGS"
 export CPPFLAGS CFLAGS
 ./configure \
     --prefix=%{__prefix} \
-	--libdir=%{_libdir} \
+    --libdir=%{_libdir} \
     --sysconfdir=/etc \
     --localstatedir=/var \
     --infodir='%{__share}/info' \
     --mandir='%{__share}/man' \
+    --build=%{_target_platform} \
+    --host=%{_target_platform} \
+    --with-vendor=vine \
     $WITH_PYTHON \
     --with-lua \
     --with-cap \
@@ -363,10 +356,6 @@ do
 done
 #ln -s ../../bin/berkeley_db_svc $RPM_BUILD_ROOT/%{rpmhome}/rpmdb_svc
 
-%if %{with_apidocs}
-gzip -9n apidocs/man/man*/* || :
-%endif
-
 # set i386 for _arch in i?86-linux/macros
 %ifarch x86_64
 for macro in $RPM_BUILD_ROOT%{__prefix}/lib/rpm/platform/i[3456]86-linux/macros \
@@ -559,7 +548,6 @@ exit 0
 %rpmattr	%{__prefix}/lib/rpm/find-provides
 %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
@@ -591,9 +579,6 @@ exit 0
 
 %files devel
 %defattr(-,root,root)
-%if %{with_apidocs}
-%doc apidocs
-%endif
 %{__includedir}/rpm
 %{__libdir}/librpm.so
 %{__libdir}/librpmio.so
@@ -603,8 +588,16 @@ exit 0
 %{__libdir}/pkgconfig/rpm.pc
 %rpmattr	%{__bindir}/rpmgraph
 
+%files apidocs
+%defattr(-,root,root)
+%doc COPYING doc/librpm/html/*
+
 
 %changelog
+* Mon Sep 17 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 4.10.0-1
+- update to 4.10.0
+- add apidocs subpackage
+
 * Fri Apr 06 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 4.9.1.3-1
 - update to 4.9.1.3