[CVS] RPM: rpm/ devtool.conf
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: 28-Aug-2010 18:05:44 Branch: HEAD Handle: 2010082816054400 Modified files: rpm devtool.conf Log: - devtool: change from --with-db-sql -> --with-dbsql (very annoying). Summary: RevisionChanges Path 2.343 +1 -1 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.342 -r2.343 devtool.conf --- rpm/devtool.conf 27 Aug 2010 18:12:16 - 2.342 +++ rpm/devtool.conf 28 Aug 2010 16:05:44 - 2.343 @@ -74,7 +74,7 @@ --verbose \ --prefix=/usr \ --with-db=internal \ ---with-db-sql=internal \ +--with-dbsql=internal \ --with-db-tools-integrated \ --with-zlib=external \ --with-bzip2=external \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/build/ files.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: 28-Aug-2010 18:07:04
Branch: HEAD Handle: 2010082816070400
Modified files:
rpm/build files.c
Log:
- whitespace.
Summary:
RevisionChanges Path
1.369 +0 -1 rpm/build/files.c
patch -p0 <<'@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.368 -r1.369 files.c
--- rpm/build/files.c 12 Aug 2010 18:57:09 - 1.368
+++ rpm/build/files.c 28 Aug 2010 16:07:04 - 1.369
@@ -2731,7 +2731,6 @@
char * _srcdefattr = rpmExpand("%{?_srcdefattr}", NULL);
int xx;
-
*sfp = rpmiobNew(0);
x = initSourceHeader(spec, sfp);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ rpmbag.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: 28-Aug-2010 18:07:38
Branch: HEAD Handle: 2010082816073700
Modified files:
rpm/rpmio rpmbag.c
Log:
- remove compiler warning.
Summary:
RevisionChanges Path
2.3 +1 -1 rpm/rpmio/rpmbag.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmbag.c
$ cvs diff -u -r2.2 -r2.3 rpmbag.c
--- rpm/rpmio/rpmbag.c13 Aug 2010 21:34:03 - 2.2
+++ rpm/rpmio/rpmbag.c28 Aug 2010 16:07:37 - 2.3
@@ -64,7 +64,7 @@
int rpmbagAdd(rpmbag bag, void *_db, int dbmode)
{
-if (bag && bag->sdbp && bag->nsdbp >= 0 && bag->nsdbp < _maxnsdbp) {
+if (bag && bag->sdbp && (int)bag->nsdbp >= 0 && bag->nsdbp < _maxnsdbp) {
rpmsdb * sdbp = bag->sdbp;
int i = bag->nsdbp++; /* XXX find empty slot */
sdbp[i] = xcalloc(1, sizeof(*sdbp[i]));
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/db3/sql/ .cvsignore
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: 28-Aug-2010 18:43:08 Branch: HEAD Handle: 2010082816430700 Added files: rpm/db3/sql .cvsignore Log: - dbsql: ensure that db3/sql exists (so that devtool runs). Summary: RevisionChanges Path 1.1 BLOBrpm/db3/sql/.cvsignore (cd rpm/db3/sql && \ uudecode <<'@@ .' && \ xdelta patch .cvsignore.xdelta /dev/null .cvsignore && \ rm -f .cvsignore.xdelta) Index: rpm/db3/sql/.cvsignore begin 664 .cvsignore.xdelta M)5A$6C`P-"4(`!$`$`!S:&EE;&$N.#`V.3DN M;G5L;'-H:65L82XX,#8Y.2YA;&p...@#`p```!^+"``` M``-C8&a...@9f!@\...@bvw.sgv$3r\l&SAEO?CC5`<48`(Z3P[(< )52581%HP,#0E ` end @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/tests/ macros.in
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: 28-Aug-2010 20:53:48
Branch: HEAD Handle: 2010082818534800
Modified files:
rpm/tests macros.in
Log:
- comment added.
Summary:
RevisionChanges Path
1.29+2 -1 rpm/tests/macros.in
patch -p0 <<'@@ .'
Index: rpm/tests/macros.in
$ cvs diff -u -r1.28 -r1.29 macros.in
--- rpm/tests/macros.in 28 Aug 2010 15:36:58 - 1.28
+++ rpm/tests/macros.in 28 Aug 2010 18:53:48 - 1.29
@@ -43,8 +43,9 @@
# XXX uncomment if solvedb headers don't have RPMTAG_PACKAGEORIGIN
#%_solve_pkgsdir %{_topdir}/edos-test/
#%_solve_name_fmt%{?_solve_pkgsdir}%{___NVRA}.rpm
-
+
%find_lang %{_testdir}/../scripts/find-lang.sh %{buildroot}
+# XXX uncomment for --with-file=internal
#%_rpmfc_magic_path %{_testdir}/../file/magic/magic
%__libtool_provides %{nil}
%__libtool_requires %{nil}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/tools/ 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: 28-Aug-2010 22:39:19
Branch: HEAD Handle: 2010082820391801
Modified files:
rpm CHANGES
rpm/tools Makefile.am
Log:
- rpmbin: install /usr/lib/rpm/bin/{sqlite3,dbsql} (both for now).
Summary:
RevisionChanges Path
1.3428 +1 -0 rpm/CHANGES
2.166 +2 -2 rpm/tools/Makefile.am
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3427 -r1.3428 CHANGES
--- rpm/CHANGES 28 Aug 2010 15:36:58 - 1.3427
+++ rpm/CHANGES 28 Aug 2010 20:39:18 - 1.3428
@@ -1,4 +1,5 @@
5.3.3 -> 5.4a1:
+- jbj: rpmbin: install /usr/lib/rpm/bin/{sqlite3,dbsql} (both for now).
- jbj: tests: rescusitate: --with-file=external --with-dbsql=internal
churn.
- jbj: permit --with-dbsql=internal as sqlite replacement.
- jbj: permit building --without-sqlite again.
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/Makefile.am
$ cvs diff -u -r2.165 -r2.166 Makefile.am
--- rpm/tools/Makefile.am 23 Aug 2010 13:27:53 - 2.165
+++ rpm/tools/Makefile.am 28 Aug 2010 20:39:19 - 2.166
@@ -54,8 +54,8 @@
pkgbindir = @USRLIBRPM@/bin
pkgbin_PROGRAMS =\
- @WITH_AUGEAS_AUGTOOL@ chroot cp @WITH_CUDF_CUDFTOOL@ find mtree \
- @WITH_SEMANAGE_SEMODULE@ wget \
+ @WITH_AUGEAS_AUGTOOL@ chroot cp @WITH_CUDF_CUDFTOOL@ dbsql find mtree \
+ @WITH_SEMANAGE_SEMODULE@ sqlite3 wget \
rpmcache rpmdigest rpmrepo rpmspecdump \
rpmcmp rpmdeps sqlite3 @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@
dist_man_MANS = rpmgrep.1
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
