packages: rpm/rpm-compress-doc.patch, rpm/rpm.spec, rpm/rpm-am.patch (NEW) ...

cactus cactus at pld-linux.org
Fri Oct 23 22:02:46 CEST 2009 

Author: cactus                       Date: Fri Oct 23 20:02:46 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.1.9 rel 0.1 some patches to rewrite

---- Files affected:
packages/rpm:
   rpm-compress-doc.patch (1.7 -> 1.8) , rpm.spec (1.921 -> 1.922) , rpm-am.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/rpm/rpm-compress-doc.patch
diff -u packages/rpm/rpm-compress-doc.patch:1.7 packages/rpm/rpm-compress-doc.patch:1.8
--- packages/rpm/rpm-compress-doc.patch:1.7	Tue Oct  2 14:29:05 2007
+++ packages/rpm/rpm-compress-doc.patch	Fri Oct 23 22:02:40 2009
@@ -1,22 +1,3 @@
---- rpm-4.4.8/build/files.c.orig	2007-02-01 23:21:51.000000000 +0100
-+++ rpm-4.4.8/build/files.c	2007-04-08 16:10:27.849202243 +0200
-@@ -1044,6 +1044,16 @@
- 	    appendStringBuf(pkg->specialDoc, "cp -pr ");
- 	    appendStringBuf(pkg->specialDoc, specialDocBuf);
- 	    appendLineStringBuf(pkg->specialDoc, " \"$DOCDIR\"");
-+
-+	    {
-+	        char *compress_doc;
-+
-+		compress_doc = rpmExpand("%{__compress_doc}", NULL);
-+		if (compress_doc && *compress_doc != '%')
-+	    	    appendLineStringBuf(pkg->specialDoc, compress_doc);
-+		if (compress_doc)
-+		  free(compress_doc);
-+	    }
- 	}
-     }
- 
 diff -ur rpm-4.0.4/macros.in rpm-4.0.4-/macros.in
 --- rpm-4.0.4/macros.in	Fri May 17 11:18:12 2002
 +++ rpm-4.0.4-/macros.in	Fri May 17 11:17:44 2002

================================================================
Index: packages/rpm/rpm.spec
diff -u packages/rpm/rpm.spec:1.921 packages/rpm/rpm.spec:1.922
--- packages/rpm/rpm.spec:1.921	Wed Feb 11 16:45:02 2009
+++ packages/rpm/rpm.spec	Fri Oct 23 22:02:40 2009
@@ -52,7 +52,7 @@
 
 # versions of required libraries
 %define		reqdb_ver	4.7.25
-%define		reqpopt_ver	1.10.8
+%define		reqpopt_ver	1.15
 %define		beecrypt_ver	2:4.1.2-4
 %define		sover	5.0
 
@@ -64,12 +64,12 @@
 Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
-Version:	5.1.6
+Version:	5.1.9
 Release:	0.1
 License:	LGPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-5.1/%{name}-%{version}.tar.gz
-# Source0-md5:	5eb40d7b756fcf04aad7d00a5b3d5b69
+# Source0-md5:	2b6ff8f7abb1fe919402f00cc0ca56f7
 Source1:	%{name}.groups
 Source2:	%{name}.platform
 Source3:	%{name}-install-tree
@@ -117,6 +117,7 @@
 Patch9:		%{name}-gettext-in-header.patch
 Patch10:	%{name}-compress-doc.patch
 Patch11:	%{name}-lua.patch
+Patch12:	%{name}-am.patch
 
 Patch14:	%{name}-etc_dir.patch
 Patch16:	%{name}-php-deps.patch
@@ -666,12 +667,14 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
+#%patch6 -p1 // in upstream
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+# compress doc in upstream
 %patch10 -p1
 %{?with_system_lua:%patch11 -p1}
+%patch12 -p1
 # CHECK ME - macrofiles: ~/etc could be used
 #%%patch14 -p1
 %patch16 -p1
@@ -685,14 +688,16 @@
 install %{SOURCE9} scripts/php.prov.in
 install %{SOURCE10} scripts/php.req.in
 install %{SOURCE12} scripts/perl.prov
-%patch23 -p1
+# looks like upstream??
+#%patch23 -p1
 
 %ifarch i386 i486
 # disable TSC
 %patch26 -p1
 %endif
 %patch27 -p1
-%patch32 -p1
+# to port 
+#%patch32 -p1
 %patch34 -p1
 %patch35 -p0
 %patch36 -p1
@@ -702,7 +707,8 @@
 %patch40 -p1
 %patch42 -p1
 %patch46 -p1
-%patch47 -p1
+# port to new implementation
+#%patch47 -p1
 # OLD COMMENTED OUT
 #%%patch52 -p1 -- morearchs (rpmrc patch) adds ppc7400, ppc7400
 %patch55 -p1
@@ -711,7 +717,8 @@
 %patch18 -p1
 # Maybe, at last we can remove this?
 #patch19 -p1
-%patch60 -p1
+# port to new implementation
+#%patch60 -p1
 %ifarch sparc64
 %patch61 -p1
 %endif
@@ -1145,6 +1152,7 @@
 #%attr(755,root,root) %{_rpmlibdir}/rpmk
 #%attr(755,root,root) %{_rpmlibdir}/rpm[qv]
 
+%{_rpmlibdir}/qf
 %{_rpmlibdir}/rpmpopt*
 %{_rpmlibdir}/macros
 %{_rpmlibdir}/macros.pld
@@ -1208,6 +1216,7 @@
 %{_mandir}/man1/rpmgrep.1*
 %{_mandir}/man8/rpm2cpio.8*
 %{_mandir}/man8/rpmcache.8*
+%{_mandir}/man8/rpmconstant.8*
 %{_mandir}/man8/rpmdeps.8*
 %{_mandir}/man8/rpmmtree.8*
 %lang(ja) %{_mandir}/ja/man8/rpm2cpio.8*
@@ -1240,6 +1249,7 @@
 %attr(755,root,root) %{_rpmlibdir}/cross-build
 %attr(755,root,root) %{_rpmlibdir}/find-spec-bcond
 %attr(755,root,root) %{_rpmlibdir}/getpo.sh
+%attr(755,root,root) %{_rpmlibdir}/install-sh
 %attr(755,root,root) %{_rpmlibdir}/install-build-tree
 %attr(755,root,root) %{_rpmlibdir}/mkinstalldirs
 %attr(755,root,root) %{_rpmlibdir}/u_pkg.sh
@@ -1250,6 +1260,7 @@
 %attr(755,root,root) %{_rpmlibdir}/pkgconfigdeps.sh
 #%attr(755,root,root) %{_rpmlibdir}/rpmb
 #%attr(755,root,root) %{_rpmlibdir}/rpmt
+%attr(755,root,root) %{_rpmlibdir}/vcheck
 %{_rpmlibdir}/noarch-*
 %ifarch %{ix86}
 %{_rpmlibdir}/i?86*
@@ -1282,15 +1293,21 @@
 %{_rpmlibdir}/macros.perl
 %{_rpmlibdir}/macros.php
 # not used yet ... these six depend on perl
-#%attr(755,root,root) %{_rpmlibdir}/http.req
+%attr(755,root,root) %{_rpmlibdir}/http.req
 #%attr(755,root,root) %{_rpmlibdir}/magic.prov
 #%attr(755,root,root) %{_rpmlibdir}/magic.req
 #%{_rpmlibdir}/sql.prov
 #%{_rpmlibdir}/sql.req
 #%{_rpmlibdir}/tcl.req
+%attr(755,root,root) %{_rpmlibdir}/mono*
 
 %attr(755,root,root) %{_bindir}/gendiff
 %attr(755,root,root) %{_bindir}/rpmbuild
+%attr(755,root,root) %{_bindir}/rpmspecdump
+%attr(755,root,root) %{_bindir}/rpmwget
+
+%dir %{_rpmlibdir}/helpers
+%attr(755,root,root) %{_rpmlibdir}/helpers/makeshlibs
 
 %{_mandir}/man1/gendiff.1*
 %{_mandir}/man8/rpmbuild.8*
@@ -1307,7 +1324,8 @@
 %files perlprov
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_rpmlibdir}/perl.*
-#%attr(755,root,root) %{_rpmlibdir}/perldeps.pl
+%attr(755,root,root) %{_rpmlibdir}/osgideps.pl
+%attr(755,root,root) %{_rpmlibdir}/perldeps.pl
 #%attr(755,root,root) %{_rpmlibdir}/find-perl-*
 #%attr(755,root,root) %{_rpmlibdir}/find-*.perl
 #%attr(755,root,root) %{_rpmlibdir}/find-prov.pl
@@ -1344,6 +1362,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.922  2009/10/23 20:02:40  cactus
+- up to 5.1.9 rel 0.1 some patches to rewrite
+
 Revision 1.921  2009/02/11 15:45:02  blues
 - gendiff patch added
 

================================================================
Index: packages/rpm/rpm-am.patch
diff -u /dev/null packages/rpm/rpm-am.patch:1.1
--- /dev/null	Fri Oct 23 22:02:46 2009
+++ packages/rpm/rpm-am.patch	Fri Oct 23 22:02:40 2009
@@ -0,0 +1,11 @@
+--- rpm-5.1.9/rpmdb/Makefile.am.orig	2009-04-12 21:46:28.000000000 +0200
++++ rpm-5.1.9/rpmdb/Makefile.am	2009-10-23 21:35:13.000000000 +0200
+@@ -108,7 +108,7 @@
+ 
+ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(pkgincdir)
+-	$(pkgincHEADERS_INSTALL) $(my_DB_HEADER) $(DESTDIR)$(pkgincdir)/db.h
++	$(install_sh_DATA) $(my_DB_HEADER) $(DESTDIR)$(pkgincdir)/db.h
+ 
+ clean-local:
+ 	rm -f *.o tagtbl.c
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-compress-doc.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm.spec?r1=1.921&r2=1.922&f=u

More information about the pld-cvs-commit mailing list