packages: rpm/openmp.patch, rpm/rpm-configure-autoconf.patch, rpm/rpm-macro...

baggins baggins at pld-linux.org
Wed Aug 24 11:03:49 CEST 2011 

Author: baggins                      Date: Wed Aug 24 09:03:49 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.3.5

---- Files affected:
packages/rpm:
   openmp.patch (1.1 -> 1.2) , rpm-configure-autoconf.patch (1.3 -> 1.4) , rpm-macros.patch (1.49 -> 1.50) , rpm-rpmpopt.patch (1.26 -> 1.27) , rpm-scripts-closefds.patch (1.3 -> 1.4) , rpm.spec (1.931 -> 1.932) 

---- Diffs:

================================================================
Index: packages/rpm/openmp.patch
diff -u packages/rpm/openmp.patch:1.1 packages/rpm/openmp.patch:1.2
--- packages/rpm/openmp.patch:1.1	Tue Jun  1 22:31:22 2010
+++ packages/rpm/openmp.patch	Wed Aug 24 11:03:43 2011
@@ -12,11 +12,11 @@
 --- rpm-5.3.1/tools/Makefile.am.wiget	2010-06-01 21:49:05.274449585 +0200
 +++ rpm-5.3.1/tools/Makefile.am	2010-06-01 21:49:56.576943304 +0200
 @@ -281,7 +281,7 @@ if WITH_DBSQL
+ if WITH_DBSQL
  pkgbin_PROGRAMS +=	dbsql
  dbsql_SOURCES	= dbsql.c
- dbsql_CFLAGS	= $(CFLAGS) -I../db3/sql -I../db/sql/generated
 -dbsql_LDFLAGS	= @LDFLAGS_STATIC@ $(LDFLAGS)
 +dbsql_LDFLAGS	= @LDFLAGS_STATIC@ $(LDFLAGS) $(OPENMP_CFLAGS)
  dbsql_LDADD = \
- 	$(top_builddir)/db3/libdb_sql-5.0.la \
  	$(RPMIO_LDADD_COMMON)
+ endif

================================================================
Index: packages/rpm/rpm-configure-autoconf.patch
diff -u packages/rpm/rpm-configure-autoconf.patch:1.3 packages/rpm/rpm-configure-autoconf.patch:1.4
--- packages/rpm/rpm-configure-autoconf.patch:1.3	Tue Jun  1 22:34:10 2010
+++ packages/rpm/rpm-configure-autoconf.patch	Wed Aug 24 11:03:43 2011
@@ -4,8 +4,8 @@
  
  AC_PREREQ(2.63)
  m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-devel at rpm5.org])
--AC_INIT([rpm],[5.3.1],[PACKAGE_BUGREPORT_DEFAULT])
-+AC_INIT([rpm],[5.3.1],PACKAGE_BUGREPORT_DEFAULT)
- PACKAGE_TIMESTAMP="2009" dnl # YYYY[-MM[-DD[ HH[:MM]]]]
+-AC_INIT([rpm],[5.3.5],[PACKAGE_BUGREPORT_DEFAULT])
++AC_INIT([rpm],[5.3.5],PACKAGE_BUGREPORT_DEFAULT)
+ PACKAGE_TIMESTAMP="2010-09-18" dnl # YYYY[-MM[-DD[ HH[:MM]]]]
  AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
  

================================================================
Index: packages/rpm/rpm-macros.patch
diff -u packages/rpm/rpm-macros.patch:1.49 packages/rpm/rpm-macros.patch:1.50
--- packages/rpm/rpm-macros.patch:1.49	Tue Jun  1 22:34:10 2010
+++ packages/rpm/rpm-macros.patch	Wed Aug 24 11:03:44 2011
@@ -90,5 +90,6 @@
 +%x8664	x86_64 amd64 ia32e
 +%ppc	ppc ppc7400 ppc7450
 +  
- # \endverbatim
- #*/
+ #==============================================================================
+ # XXX Caveat:
+ # XXX With %{load:...} being interpreted immediately -- not lazily --

================================================================
Index: packages/rpm/rpm-rpmpopt.patch
diff -u packages/rpm/rpm-rpmpopt.patch:1.26 packages/rpm/rpm-rpmpopt.patch:1.27
--- packages/rpm/rpm-rpmpopt.patch:1.26	Tue Oct  2 14:26:06 2007
+++ packages/rpm/rpm-rpmpopt.patch	Wed Aug 24 11:03:44 2011
@@ -16,7 +16,7 @@
  #==============================================================================
  rpmbuild	alias --dbpath		--define '_dbpath !#:+' \
  	--POPTdesc=$"use database in DIRECTORY" \
-@@ -240,5 +249,15 @@
+@@ -240,6 +249,16 @@
  	--POPTdesc=$"override build root" \
  	--POPTargs=$"DIRECTORY"
  
@@ -30,8 +30,9 @@
 +rpmbuild exec  --bcond find-spec-bcond \
 +	--POPTdesc=$"find all --with/--without values"
 +
- # \endverbatim
- #*/
+ rpmbuild alias --lsb --noautoreq --noautoprov \
+ 	--define '_use_internal_dependency_generator 0' \
+ 	--notinlsb
 ;--- rpm-4.4.9/po/pl.po.orig	2007-05-22 01:10:34.875893544 +0200
 ;+++ rpm-4.4.9/po/pl.po	2007-05-22 08:08:41.253484731 +0200
 ;@@ -4509,6 +4509,18 @@

================================================================
Index: packages/rpm/rpm-scripts-closefds.patch
diff -u packages/rpm/rpm-scripts-closefds.patch:1.3 packages/rpm/rpm-scripts-closefds.patch:1.4
--- packages/rpm/rpm-scripts-closefds.patch:1.3	Tue Jan 13 21:25:07 2004
+++ packages/rpm/rpm-scripts-closefds.patch	Wed Aug 24 11:03:44 2011
@@ -14,6 +14,6 @@
 + 		Fcntl(fd, F_SETFD, (void*)oldfl);
 + 	    }
 + 	}
- 	/*@=type@*/
- 	return fd;
- 	/*@notreached@*/ break;
+ 
+ #if defined(POSIX_FADV_WILLNEED)
+ 	(void) Fadvise(fd, 0, 0, POSIX_FADV_WILLNEED);

================================================================
Index: packages/rpm/rpm.spec
diff -u packages/rpm/rpm.spec:1.931 packages/rpm/rpm.spec:1.932
--- packages/rpm/rpm.spec:1.931	Thu Jun  3 02:53:05 2010
+++ packages/rpm/rpm.spec	Wed Aug 24 11:03:44 2011
@@ -64,12 +64,12 @@
 Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
-Version:	5.3.1
+Version:	5.3.5
 Release:	0.1
 License:	LGPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-5.3/%{name}-%{version}.tar.gz
-# Source0-md5:	ee172f54e9b596056f8ecf13ae6afa9e
+# Source0-md5:	7a5112fd208bfda7a1cab20b9ce17a02
 Source1:	%{name}.groups
 Source2:	%{name}.platform
 Source3:	%{name}-install-tree
@@ -156,7 +156,6 @@
 Patch62:	%{name}-gendiff.patch
 Patch63:	%{name}-lua-exit-chroot-correctly.patch
 Patch70:	%{name}-configure-autoconf.patch
-Patch71:	db.patch
 Patch72:	openmp.patch
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.60
@@ -735,7 +734,6 @@
 %patch62 -p1
 #patch63 -p1 applied upstream
 %patch70 -p1
-%patch71 -p1
 %patch72 -p1 -b .wiget
 
 cd scripts
@@ -1394,6 +1392,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.932  2011/08/24 09:03:44  baggins
+- up to 5.3.5
+
 Revision 1.931  2010/06/03 00:53:05  sparky
 - BR: tcl
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/openmp.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-configure-autoconf.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-macros.patch?r1=1.49&r2=1.50&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-rpmpopt.patch?r1=1.26&r2=1.27&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-scripts-closefds.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm.spec?r1=1.931&r2=1.932&f=u

More information about the pld-cvs-commit mailing list