SPECS (Titanium): rpm.spec - merged from rpm-4_4_9 branch: - add...

[hawk]

Author: hawk                         Date: Sun Dec  2 13:41:05 2007 GMT
Module: SPECS                         Tag: Titanium
---- Log message:
- merged from rpm-4_4_9 branch:
  - added rpm-lzma-size_t.patch, to use system size_t, fixes sparc64 lzma
    compressed packages installation
  - chroot workarounds from rpm5
  - use rpm provided check files (checks symlinks, too)
  - fix --root --rebuilddb
  - added the tar_as_secondary_source.patch
  - drop pie; add chroot hack from pld-devel ml
  - versioned Provides rpmbuild(find_lang)

---- Files affected:
SPECS:
   rpm.spec (1.837.4.2 -> 1.837.4.3) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.4.2 SPECS/rpm.spec:1.837.4.3
--- SPECS/rpm.spec:1.837.4.2	Sun Nov 25 00:06:34 2007
+++ SPECS/rpm.spec	Sun Dec  2 14:41:00 2007
@@ -48,7 +48,7 @@
 Source5:	%{name}-find-lang
 Source6:	%{name}-groups-po.awk
 Source7:	%{name}-compress-doc
-Source8:	%{name}-check-files
+
 Source9:	%{name}-php-provides
 Source10:	%{name}-php-requires
 Source11:	%{name}.sysinfo
@@ -89,6 +89,7 @@
 Patch27:	%{name}-hack-norpmlibdep.patch
 Patch28:	%{name}-makefile-no_myLDADD_deps.patch
 Patch29:	%{name}-macros-dbhash.patch
+Patch30:	%{name}-rpm5-patchset-8784.patch
 Patch31:	%{name}-missing-prototypes.patch
 Patch32:	%{name}-pld-autodep.patch
 Patch33:	%{name}-arch-x86_64.patch
@@ -99,26 +100,28 @@
 Patch38:	%{name}-rpm5-patchset-8021.patch
 Patch41:	%{name}-reduce-stack-usage.patch
 Patch42:	%{name}-old-fileconflicts-behaviour.patch
-
+Patch43:	%{name}-rpm5-patchset-8637.patch
 Patch44:	%{name}-no-neon.patch
 Patch45:	%{name}-no-sqlite.patch
 Patch46:	%{name}-mono.patch
 Patch47:	%{name}-javadeps.patch
-
+Patch48:	%{name}-nopie.patch
 Patch49:	%{name}-p4.patch
 Patch50:	%{name}-macros.patch
 Patch51:	%{name}-cleanlibdirs.patch
 Patch52:	%{name}-morearchs.patch
-
+Patch53:	%{name}-chroot-hack.patch
 Patch55:	%{name}-truncate-cvslog.patch
-
+Patch56:	%{name}-rpm5-patchset-8413.patch
 Patch57:	%{name}-as_needed-fix.patch
 Patch58:	%{name}-repackage-wo-lzma.patch
 Patch59:	%{name}-libtool-deps.patch
 Patch60:	%{name}-obsolete-rpmrc.patch
 Patch61:	%{name}-sparc64.patch
 Patch62:	%{name}-rpmdb.patch
-Patch63:	%{name}-man_pl.patch
+Patch63:	%{name}-lzma-size_t.patch
+Patch64:	%{name}-tar_as_secondary_source.patch
+Patch65:	%{name}-man_pl.patch
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.4
@@ -472,6 +475,7 @@
 Requires:	sh-utils
 Requires:	tar
 Requires:	textutils
+Provides:	rpmbuild(find_lang) = 1.23
 Provides:	rpmbuild(monoautodeps)
 Provides:	rpmbuild(noauto) = 3
 %ifarch %{x8664}
@@ -659,6 +663,7 @@
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
@@ -669,15 +674,19 @@
 %patch38 -p1
 %patch41 -p1
 %patch42 -p1
+%patch43 -p1
 %{!?with_neon:%patch44 -p1}
 %patch45 -p1
 %patch46 -p1
 %patch47 -p1
+%patch48 -p1
 %patch49 -p1
 %patch50 -p1
 %patch51 -p1
 #%patch52 -p1
+%patch53 -p1
 %patch55 -p1
+%patch56 -p1
 %patch57 -p1
 %patch58 -p1
 %patch59 -p1
@@ -687,6 +696,8 @@
 %endif
 %patch62 -p1
 %patch63 -p1
+%patch64 -p1
+%patch65 -p1
 
 cd scripts
 mv -f perl.req perl.req.in
@@ -841,7 +852,6 @@
 install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
 install %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond
 install %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc
-install %{SOURCE8} $RPM_BUILD_ROOT%{_rpmlibdir}/check-files
 install %{SOURCE13} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh
 install %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires
 install scripts/find-php*	$RPM_BUILD_ROOT%{_rpmlibdir}
@@ -1206,6 +1216,17 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.4.3  2007-12-02 13:41:00  hawk
+- merged from rpm-4_4_9 branch:
+  - added rpm-lzma-size_t.patch, to use system size_t, fixes sparc64 lzma
+    compressed packages installation
+  - chroot workarounds from rpm5
+  - use rpm provided check files (checks symlinks, too)
+  - fix --root --rebuilddb
+  - added the tar_as_secondary_source.patch
+  - drop pie; add chroot hack from pld-devel ml
+  - versioned Provides rpmbuild(find_lang)
+
 Revision 1.837.4.2  2007-11-24 23:06:34  ankry
 - added rpm-man_pl.patch, rel. 10
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.4.2&r2=1.837.4.3&f=u