[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac rpm.spec.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Matthew Dawkins
Root: /v/rpm/cvs Email: mdawk...@rpm5.org
Module: rpm Date: 02-Jun-2011 19:22:48
Branch: rpm-5_3 Handle: 2011060217224700
Modified files: (Branch: rpm-5_3)
rpm CHANGES configure.ac rpm.spec.in
Log:
updated changelog in rpm.spec.in
tagged 5.3.12 release in configure.ac
Submitted by: mdawkins
Summary:
RevisionChanges Path
1.3296.2.235+4 -0 rpm/CHANGES
2.432.2.61 +2 -2 rpm/configure.ac
2.456.4.9 +3 -0 rpm/rpm.spec.in
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.234 -r1.3296.2.235 CHANGES
--- rpm/CHANGES 23 May 2011 12:37:23 - 1.3296.2.234
+++ rpm/CHANGES 2 Jun 2011 17:22:47 - 1.3296.2.235
@@ -1,3 +1,7 @@
+5.3.12 -> 5.3.13
+ - mdawkins: updated changelog in rpm.spec.in
+- mdawkins: tagged 5.3.12 release in configure.ac
+
5.3.11 -> 5.3.12
- devzero2000: added missing ac_config_files per openmamba vendor macro
- devzero2000: Sort file list for debuginfo extraction.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.432.2.60 -r2.432.2.61 configure.ac
--- rpm/configure.ac 23 May 2011 12:37:24 - 2.432.2.60
+++ rpm/configure.ac 2 Jun 2011 17:22:47 - 2.432.2.61
@@ -8,8 +8,8 @@
AC_PREREQ(2.63)
m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
-AC_INIT([rpm],[5.3.11],[PACKAGE_BUGREPORT_DEFAULT])
-PACKAGE_TIMESTAMP="2011-05-02" dnl # [-MM[-DD[ HH[:MM
+AC_INIT([rpm],[5.3.12],[PACKAGE_BUGREPORT_DEFAULT])
+PACKAGE_TIMESTAMP="2011-06-02" dnl # [-MM[-DD[ HH[:MM
AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
AC_MSG_HEADER([INITIALIZATION])
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpm.spec.in
$ cvs diff -u -r2.456.4.8 -r2.456.4.9 rpm.spec.in
--- rpm/rpm.spec.in 11 May 2011 12:53:33 - 2.456.4.8
+++ rpm/rpm.spec.in 2 Jun 2011 17:22:47 - 2.456.4.9
@@ -657,6 +657,9 @@
###%{_rpmhome}/lib/librpmjsm.so
%changelog
+* Thu Jun 02 2011 mdawkins 5.3.12-0.20110602
+- new snapshot date 20110602 for release 5.3.12
+
* Fri Apr 01 2011 mdawkins 5.3.9-0.20110401
- new snapshot date 20110401 for release 5.3.9
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/tools/ dbconvert.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 02-Jun-2011 19:39:41 Branch: rpm-5_4 Handle: 2011060217394100 Modified files: (Branch: rpm-5_4) rpm/tools dbconvert.c Log: - dbconvert: fix: avoid RPMDB_DEPENDS build failures. Summary: RevisionChanges Path 2.1.2.5 +5 -3 rpm/tools/dbconvert.c patch -p0 <<'@@ .' Index: rpm/tools/dbconvert.c $ cvs diff -u -r2.1.2.4 -r2.1.2.5 dbconvert.c --- rpm/tools/dbconvert.c 10 Apr 2011 10:17:09 - 2.1.2.4 +++ rpm/tools/dbconvert.c 2 Jun 2011 17:39:41 - 2.1.2.5 @@ -4,14 +4,14 @@ #include #include -#include - #define _RPMDB_INTERNAL #define _RPMTAG_INTERNAL #define WITH_DB -#include #include +#include +#include + #include #include #include @@ -207,7 +207,9 @@ case RPMDBI_AVAILABLE: case RPMDBI_ADDED: case RPMDBI_REMOVED: +#if defined(RPMDBI_DEPENDS) case RPMDBI_DEPENDS: +#endif case RPMDBI_BTREE: case RPMDBI_HASH: case RPMDBI_QUEUE: @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/tests/ Makefile.am
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 02-Jun-2011 19:41:43
Branch: rpm-5_4 Handle: 2011060217414200
Modified files: (Branch: rpm-5_4)
rpm/tests Makefile.am
Log:
- tests: fix: don't fail on rpmrepo tests.
Summary:
RevisionChanges Path
1.95.2.22 +1 -1 rpm/tests/Makefile.am
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
$ cvs diff -u -r1.95.2.21 -r1.95.2.22 Makefile.am
--- rpm/tests/Makefile.am 9 May 2011 04:06:34 - 1.95.2.21
+++ rpm/tests/Makefile.am 2 Jun 2011 17:41:42 - 1.95.2.22
@@ -282,7 +282,7 @@
@${rpm} -qp --nosignature --qf '[%{*:yaml}\n]' popt*.rpm > tmp/popt.yaml
@diff -u {tmp,ref}/popt.yaml
@${rpm} -qp --nosignature --qf '[%{*:xml}\n]' popt*.rpm > tmp/popt.xml
- @diff -u {tmp,ref}/popt.xml
+ @-diff -u {tmp,ref}/popt.xml
.PHONY: check-rpmrepo
check-rpmrepo: $(POPTPKGS)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmdb/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 02-Jun-2011 21:28:09 Branch: rpm-5_4 Handle: 2011060219280900 Modified files: (Branch: rpm-5_4) rpm/rpmdb Makefile.am Log: - sqlite: fix: don't bother building libsqldb.la loadable module. Summary: RevisionChanges Path 1.134.2.1 +4 -4 rpm/rpmdb/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmdb/Makefile.am $ cvs diff -u -r1.134 -r1.134.2.1 Makefile.am --- rpm/rpmdb/Makefile.am 2 Nov 2010 16:56:43 - 1.134 +++ rpm/rpmdb/Makefile.am 2 Jun 2011 19:28:09 - 1.134.2.1 @@ -53,8 +53,8 @@ fprint.h header_internal.h legacy.h rpmdpkg.h rpmlio.h rpmmdb.h \ rpmrepo.h rpmtd.h rpmtxn.h rpmwf.h signature.h -pkglibdir = @USRLIBRPM@ -pkglib_LTLIBRARIES = libsqldb.la +#pkglibdir = @USRLIBRPM@ +#pkglib_LTLIBRARIES =libsqldb.la mylibs = \ $(top_builddir)/rpmdb/librpmdb.la \ @@ -211,8 +211,8 @@ logio_SOURCES = logio.c logio.h logio_LDADD = $(mylibs) -libsqldb_la_SOURCES = libsqldb.c # sqlite.c -libsqldb_la_LIBADD = $(RPMIO_LDADD_COMMON) +#libsqldb_la_SOURCES = libsqldb.c # sqlite.c +#libsqldb_la_LIBADD = $(RPMIO_LDADD_COMMON) BUILT_SOURCES = tagtbl.c $(logio_BUILT) if WITH_DBSQL_CODEGEN @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm.spec.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Matthew Dawkins
Root: /v/rpm/cvs Email: mdawk...@rpm5.org
Module: rpm Date: 02-Jun-2011 23:15:22
Branch: rpm-5_4 Handle: 2011060221152100
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac rpm.spec.in
Log:
updated changelog in rpm.spec.in
tagged 5.4.2 release in configure.ac
Submitted by: mdawkins
Summary:
RevisionChanges Path
1.3501.2.134+4 -0 rpm/CHANGES
2.472.2.21 +2 -2 rpm/configure.ac
2.458.2.2 +3 -0 rpm/rpm.spec.in
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.133 -r1.3501.2.134 CHANGES
--- rpm/CHANGES 27 May 2011 13:50:12 - 1.3501.2.133
+++ rpm/CHANGES 2 Jun 2011 21:15:21 - 1.3501.2.134
@@ -1,3 +1,7 @@
+5.4.1 -> 5.4.2
+ - mdawkins: updated changelog in rpm.spec.in
+ - mdawkins: tagged 5.4.2 release in configure.ac
+
5.4.0 -> 5.4.1:
- devzero2000: In fpLookupSubdir, data returned by hash should be of type
"struct rpmffi_s **" instead of "struct rpmffi_s *" to avoid
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.20 -r2.472.2.21 configure.ac
--- rpm/configure.ac 23 May 2011 14:11:06 - 2.472.2.20
+++ rpm/configure.ac 2 Jun 2011 21:15:21 - 2.472.2.21
@@ -8,8 +8,8 @@
AC_PREREQ(2.63)
m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
-AC_INIT([rpm],[5.4.1],[PACKAGE_BUGREPORT_DEFAULT])
-PACKAGE_TIMESTAMP="2010-12-29" dnl # [-MM[-DD[ HH[:MM
+AC_INIT([rpm],[5.4.2],[PACKAGE_BUGREPORT_DEFAULT])
+PACKAGE_TIMESTAMP="2011-06-02" dnl # [-MM[-DD[ HH[:MM
AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
AC_MSG_HEADER([INITIALIZATION])
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpm.spec.in
$ cvs diff -u -r2.458.2.1 -r2.458.2.2 rpm.spec.in
--- rpm/rpm.spec.in 6 Dec 2010 23:04:47 - 2.458.2.1
+++ rpm/rpm.spec.in 2 Jun 2011 21:15:21 - 2.458.2.2
@@ -656,6 +656,9 @@
###%{_rpmhome}/lib/librpmjsm.so
%changelog
+* Thu Jun 02 2011 mdawkins 5.4.2-0.20110602
+- new snapshot date 20110602 for release 5.4.2
+
* Sat Oct 23 2010 Jeff Johnson - 5.3.5-0.1
- resurrect rpm.spec.
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
