[CVS] RPM: rpm-5_1: rpm/lib/ rpmlib.h
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Arkadiusz Miskiewicz Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 29-Jul-2008 16:34:35 Branch: rpm-5_1 Handle: 2008072914343500 Modified files: (Branch: rpm-5_1) rpm/lib rpmlib.h Log: Include rpmio.h (needed due to rpmRC). Summary: RevisionChanges Path 2.462.2.1 +1 -0 rpm/lib/rpmlib.h patch -p0 '@@ .' Index: rpm/lib/rpmlib.h $ cvs diff -u -r2.462 -r2.462.2.1 rpmlib.h --- rpm/lib/rpmlib.h 26 Mar 2008 20:59:14 - 2.462 +++ rpm/lib/rpmlib.h 29 Jul 2008 14:34:35 - 2.462.2.1 @@ -10,6 +10,7 @@ #include rpmtag.h #include rpmversion.h +#include rpmio.h #define RPM_FORMAT_VERSION 5 #define RPM_MAJOR_VERSION 0 @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/lib/ rpmlib.h
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Arkadiusz Miskiewicz Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 29-Jul-2008 16:51:36 Branch: HEAD Handle: 2008072914513600 Modified files: rpm/lib rpmlib.h Log: Include rpmio.h (needed due to rpmRC). Summary: RevisionChanges Path 2.463 +1 -0 rpm/lib/rpmlib.h patch -p0 '@@ .' Index: rpm/lib/rpmlib.h $ cvs diff -u -r2.462 -r2.463 rpmlib.h --- rpm/lib/rpmlib.h 26 Mar 2008 20:59:14 - 2.462 +++ rpm/lib/rpmlib.h 29 Jul 2008 14:51:36 - 2.463 @@ -10,6 +10,7 @@ #include rpmtag.h #include rpmversion.h +#include rpmio.h #define RPM_FORMAT_VERSION 5 #define RPM_MAJOR_VERSION 0 @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmdb/ Makefile.am rpmdb.h
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Arkadiusz Miskiewicz Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 29-Jul-2008 16:54:31 Branch: HEAD Handle: 2008072914543000 Modified files: rpm/rpmdb Makefile.am rpmdb.h Log: Partial workaround for: #if defined(WITH_DB) #include something #else #include somethingelse #endif. Doing this type of checks in public header is wrong because WITH_DB won't be defined in some custom program (that uses this public header) build process. TODO: add make dependency so db.h will be generated at build time instead of install time. Summary: RevisionChanges Path 1.100 +4 -1 rpm/rpmdb/Makefile.am 1.75+1 -5 rpm/rpmdb/rpmdb.h patch -p0 '@@ .' Index: rpm/rpmdb/Makefile.am $ cvs diff -u -r1.99 -r1.100 Makefile.am --- rpm/rpmdb/Makefile.am 19 Jul 2008 13:52:23 - 1.99 +++ rpm/rpmdb/Makefile.am 29 Jul 2008 14:54:30 - 1.100 @@ -105,7 +105,10 @@ if WITH_DB_INTERNAL my_DB_HEADER = $(top_builddir)/$(WITH_DB_SUBDIR)/db.h else -my_DB_HEADER = $(srcdir)/db_emu.h +my_DB_HEADER = $(srcdir)/db.h + +$(my_DB_HEADER): $(srcdir)/db_emu.h + $(pkgincHEADERS_INSTALL) $(srcdir)/db_emu.h $(srcdir)/db.h endif install-data-local: @@ . patch -p0 '@@ .' Index: rpm/rpmdb/rpmdb.h $ cvs diff -u -r1.74 -r1.75 rpmdb.h --- rpm/rpmdb/rpmdb.h 23 May 2008 16:26:19 - 1.74 +++ rpm/rpmdb/rpmdb.h 29 Jul 2008 14:54:30 - 1.75 @@ -10,11 +10,7 @@ #include assert.h #include rpmlib.h #include mire.h -#if defined(WITH_DB) -#include db.h -#else -#include db_emu.h -#endif +#include db.h /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ argv.h
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Arkadiusz Miskiewicz Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 29-Jul-2008 17:00:20 Branch: HEAD Handle: 2008072915002000 Modified files: rpm/rpmio argv.h Log: Include stdint.h for uintXX_t types. Summary: RevisionChanges Path 1.10+2 -0 rpm/rpmio/argv.h patch -p0 '@@ .' Index: rpm/rpmio/argv.h $ cvs diff -u -r1.9 -r1.10 argv.h --- rpm/rpmio/argv.h 22 May 2008 14:44:09 - 1.9 +++ rpm/rpmio/argv.h 29 Jul 2008 15:00:20 - 1.10 @@ -5,6 +5,8 @@ * \file rpmio/argv.h */ +#include stdint.h + typedef const char * ARGstr_t; typedef ARGstr_t * ARGV_t; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/rpmio/ rpmurl.h
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Arkadiusz Miskiewicz Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 29-Jul-2008 17:02:44 Branch: rpm-5_1 Handle: 2008072915024400 Modified files: (Branch: rpm-5_1) rpm/rpmio rpmurl.h Log: Include rpmio.h for FD_t type. Summary: RevisionChanges Path 1.25.2.2+1 -0 rpm/rpmio/rpmurl.h patch -p0 '@@ .' Index: rpm/rpmio/rpmurl.h $ cvs diff -u -r1.25.2.1 -r1.25.2.2 rpmurl.h --- rpm/rpmio/rpmurl.h31 May 2008 16:59:03 - 1.25.2.1 +++ rpm/rpmio/rpmurl.h29 Jul 2008 15:02:44 - 1.25.2.2 @@ -6,6 +6,7 @@ */ #include assert.h +#include rpmio.h /** * Supported URL types. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ rpmurl.h
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Arkadiusz Miskiewicz Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 29-Jul-2008 17:03:05 Branch: HEAD Handle: 2008072915030500 Modified files: rpm/rpmio rpmurl.h Log: Include rpmio.h for FD_t type. Summary: RevisionChanges Path 1.33+1 -0 rpm/rpmio/rpmurl.h patch -p0 '@@ .' Index: rpm/rpmio/rpmurl.h $ cvs diff -u -r1.32 -r1.33 rpmurl.h --- rpm/rpmio/rpmurl.h18 Jul 2008 01:31:56 - 1.32 +++ rpm/rpmio/rpmurl.h29 Jul 2008 15:03:05 - 1.33 @@ -6,6 +6,7 @@ */ #include assert.h +#include rpmio.h #include rpmsw.h /** @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/tools/ Makefile.am rpmspecdump.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Arkadiusz Miskiewicz
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 29-Jul-2008 17:36:09
Branch: HEAD Handle: 2008072915360900
Added files:
rpm/tools rpmspecdump.c
Modified files:
rpm/tools Makefile.am
Log:
Tool for dumping spec tags.
Summary:
RevisionChanges Path
2.113 +4 -1 rpm/tools/Makefile.am
2.1 +359 -0 rpm/tools/rpmspecdump.c
patch -p0 '@@ .'
Index: rpm/tools/Makefile.am
$ cvs diff -u -r2.112 -r2.113 Makefile.am
--- rpm/tools/Makefile.am 16 Jun 2008 18:47:20 - 2.112
+++ rpm/tools/Makefile.am 29 Jul 2008 15:36:09 - 2.113
@@ -40,7 +40,7 @@
$(top_builddir)/build/librpmbuild.la \
$(RPM_LDADD_COMMON)
-bin_PROGRAMS = rpm2cpio rpmcache rpmdigest rpmmtree rpmrepo
+bin_PROGRAMS = rpm2cpio rpmcache rpmdigest rpmmtree rpmrepo
rpmspecdump
pkglibdir = @USRLIBRPM@
pkglib_PROGRAMS =rpmcmp rpmdeps @WITH_LIBELF_DEBUGEDIT@
@@ -66,6 +66,9 @@
rpmrepo_SOURCES =rpmrepo.c
rpmrepo_LDADD = $(RPM_LDADD_COMMON)
+rpmspecdump_SOURCES =rpmspecdump.c
+rpmspecdump_LDADD = $(RPM_LDADD_COMMON)
+
##
## Traditional rpm2cpio
##
@@ .
patch -p0 '@@ .'
Index: rpm/tools/rpmspecdump.c
$ cvs diff -u -r0 -r2.1 rpmspecdump.c
--- /dev/null 2008-07-29 17:36:08 +0200
+++ rpmspecdump.c 2008-07-29 17:36:09 +0200
@@ -0,0 +1,359 @@
+/*
+ * $Id: rpmspecdump.c,v 2.1 2008/07/29 15:36:09 arekm Exp $
+ *
+ * Prints out following information in same format as %dump for builder:
+ * $ rpmbuild --nodigest --nosignature --nobuild -bp --define 'prep
%{echo:dummy: PACKAGE_NAME %{name} }%dump' qemu.spec 21 | awk '$2 ~
/^SOURCEURL/ {print} $2 ~ /^PATCHURL/ {print} $2 ~ /^nosource/ {print} $2 ~
/^PACKAGE_/ {print}'
+ * dummy: PACKAGE_NAME qemu
+ * -2: PACKAGE_RELEASE[EMAIL PROTECTED]
+ * -1: PACKAGE_VERSION1.3.0pre11
+ * -3: PATCHURL0 qemu-nostatic.patch
+ * -3: PATCHURL1 qemu-cc.patch
+ * -3: PATCHURL11 qemu-0.7.2-gcc4-opts.patch
+ * -3: PATCHURL13 qemu-dosguest.patch
+ * -3: PATCHURL3 qemu-dot.patch
+ * -3: PATCHURL4 qemu-gcc4_x86.patch
+ * -3: PATCHURL5 qemu-gcc4_ppc.patch
+ * -3: PATCHURL6 qemu-nosdlgui.patch
+ * -3: PATCHURL8 qemu-kde_virtual_workspaces_hack.patch
+ * -3: PATCHURL9 qemu-0.8.0-gcc4-hacks.patch
+ * -3: SOURCEURL0 http://fabrice.bellard.free.fr/qemu/qemu-0.9.0.tar.gz
+ * -3: SOURCEURL1 http://fabrice.bellard.free.fr/qemu/kqemu-1.3.0pre11.tar.gz
+ *
+ * $ rpm-specdump qemu.spec
+ * h PACKAGE_NAME qemu
+ * h PACKAGE_VERSION 0.9.0
+ * h PACKAGE_RELEASE 60k
+ * s PATCHURL13 qemu-dosguest.patch
+ * s PATCHURL11 qemu-0.7.2-gcc4-opts.patch
+ * s PATCHURL9 qemu-0.8.0-gcc4-hacks.patch
+ * s PATCHURL8 qemu-kde_virtual_workspaces_hack.patch
+ * s PATCHURL6 qemu-nosdlgui.patch
+ * s PATCHURL5 qemu-gcc4_ppc.patch
+ * s PATCHURL4 qemu-gcc4_x86.patch
+ * s PATCHURL3 qemu-dot.patch
+ * s PATCHURL1 qemu-cc.patch
+ * s PATCHURL0 qemu-nostatic.patch
+ * s SOURCEURL1 http://fabrice.bellard.free.fr/qemu/kqemu-1.3.0pre11.tar.gz
+ * s SOURCEURL0 http://fabrice.bellard.free.fr/qemu/qemu-0.9.0.tar.gz
+ *
+ * And with NoSource: 1, NoSource: 2
+ *
+ * $ rpmbuild --nodigest --nosignature --nobuild -bp --define 'prep
%{echo:dummy: PACKAGE_NAME %{name} }%dump' ZendDebugger.spec 21 | awk '$2 ~
/^SOURCEURL/ {print} $2 ~ /^PATCHURL/ {print} $2 ~ /^nosource/ {print} $2 ~
/^PACKAGE_/ {print}'
+ * dummy: PACKAGE_NAME ZendDebugger
+ * -2: PACKAGE_RELEASE0.4
+ * -1: PACKAGE_VERSION5.2.10
+ * -3: SOURCEURL0
http://downloads.zend.com/pdt/server-debugger/ZendDebugger-5.2.10-linux-glibc21-i386.tar.gz
+ * -3: SOURCEURL1
http://downloads.zend.com/pdt/server-debugger/ZendDebugger-5.2.10-linux-glibc23-x86_64.tar.gz
+ * -3: nosource 1
+ *
+ * $ rpm-specdump ZendDebugger.spec
+ * h PACKAGE_NAME ZendDebugger
+ * h PACKAGE_VERSION 5.2.10
+ * h PACKAGE_RELEASE 0.4
+ * s SOURCEURL1
http://downloads.zend.com/pdt/server-debugger/ZendDebugger-5.2.10-linux-glibc23-x86_64.tar.gz
+ * s nosource 1
+ * s SOURCEURL0
http://downloads.zend.com/pdt/server-debugger/ZendDebugger-5.2.10-linux-glibc21-i386.tar.gz
+ * s nosource 0
+ *
+ * Compile with:
+ * gcc -lrpm
[CVS] RPM: rpm/tools/ rpmspecdump.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Arkadiusz Miskiewicz
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 29-Jul-2008 17:37:44
Branch: HEAD Handle: 2008072915374400
Modified files:
rpm/tools rpmspecdump.c
Log:
Drop compat.
Summary:
RevisionChanges Path
2.2 +25 -59 rpm/tools/rpmspecdump.c
patch -p0 '@@ .'
Index: rpm/tools/rpmspecdump.c
$ cvs diff -u -r2.1 -r2.2 rpmspecdump.c
--- rpm/tools/rpmspecdump.c 29 Jul 2008 15:36:09 - 2.1
+++ rpm/tools/rpmspecdump.c 29 Jul 2008 15:37:44 - 2.2
@@ -1,5 +1,5 @@
/*
- * $Id: rpmspecdump.c,v 2.1 2008/07/29 15:36:09 arekm Exp $
+ * $Id: rpmspecdump.c,v 2.2 2008/07/29 15:37:44 arekm Exp $
*
* Prints out following information in same format as %dump for builder:
* $ rpmbuild --nodigest --nosignature --nobuild -bp --define 'prep
%{echo:dummy: PACKAGE_NAME %{name} }%dump' qemu.spec 21 | awk '$2 ~
/^SOURCEURL/ {print} $2 ~ /^PATCHURL/ {print} $2 ~ /^nosource/ {print} $2 ~
/^PACKAGE_/ {print}'
@@ -64,10 +64,6 @@
#define _GNU_SOURCE
-// macros from kernel
-#define RPM_VERSION(a,b,c) (((a) 16) + ((b) 8) + (c))
-#define RPM_VERSION_CODE RPM_VERSION(RPM_FORMAT_VERSION,
RPM_MAJOR_VERSION, RPM_MINOR_VERSION)
-
#ifdef HAVE_CONFIG_H
# include config.h
#endif
@@ -83,9 +79,6 @@
#include rpmbuild.h
#include rpmlib.h
-#if RPM_VERSION_CODE RPM_VERSION(5,0,0)
-#include header.h
-#endif
#include rpmts.h
#define ARG_WITH 1024
@@ -97,11 +90,6 @@
#define ARG_UID 1030
#define ARG_GID 1031
-// RPM 4.4.2
-#if RPM_VERSION_CODE RPM_VERSION(4,4,9)
-#define RPMFILE_SOURCE RPMBUILD_ISSOURCE
-#endif
-
static struct option const
CMDLINE_OPTIONS[] = {
{ help, no_argument, 0, 'h' },
@@ -274,11 +262,7 @@
setMacros(args.macros.values, args.macros.cnt);
rpmts ts = rpmtsCreate();
-#if RPM_VERSION_CODE = RPM_VERSION(4,4,9)
if (parseSpec(ts, args.specfile, NULL, 0, NULL, NULL, 1, 1, 0) != 0) {
-#else
- if (parseSpec(ts, args.specfile, NULL, NULL, 1, NULL, NULL, 1, 1) != 0)
{
-#endif
return EXIT_FAILURE;
}
@@ -287,56 +271,38 @@
// here starts the code for builder
const char *name = NULL, *version = NULL, *release = NULL;
-#if RPM_VERSION_CODE = RPM_VERSION(4,4,9)
initSourceHeader(s, NULL);
-#else
- initSourceHeader(s);
-#endif
Header h = s-sourceHeader;
-#if RPM_VERSION_CODE RPM_VERSION(5,0,0)
- if (
- headerGetEntryMinMemory(h, RPMTAG_NAME, NULL, (void *)name,
NULL) == 0 ||
- headerGetEntryMinMemory(h, RPMTAG_VERSION, NULL, (void
*)version, NULL) == 0 ||
- headerGetEntryMinMemory(h, RPMTAG_RELEASE, NULL, (void
*)release, NULL) == 0
- ) {
- fprintf(stderr, NVR query failed\n);
+ HE_t he;
+ int rc;
+
+ he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
+ he-tag = (rpmTag) RPMTAG_NAME;
+ rc = headerGet(h, he, 0);
+ if (!rc) {
+ fprintf(stderr, Name (NVR) query failed\n);
return EXIT_FAILURE;
}
+ name = (char *)he-p.ptr;
-#else
- {
- HE_t he;
- int rc;
-
- he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
- he-tag = (rpmTag) RPMTAG_NAME;
- rc = headerGet(h, he, 0);
- if (!rc) {
- fprintf(stderr, Name (NVR) query failed\n);
- return EXIT_FAILURE;
- }
- name = (char *)he-p.ptr;
-
- he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
- he-tag = (rpmTag) RPMTAG_VERSION;
- rc = headerGet(h, he, 0);
- if (!rc) {
- fprintf(stderr, Version (NVR) query failed\n);
- return EXIT_FAILURE;
- }
- version = (char *)he-p.ptr;
+ he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
+ he-tag = (rpmTag) RPMTAG_VERSION;
+ rc = headerGet(h, he, 0);
+ if (!rc) {
+ fprintf(stderr, Version (NVR) query failed\n);
+ return EXIT_FAILURE;
+ }
+ version = (char *)he-p.ptr;
- he = (HE_s*)memset(alloca(sizeof(*he)), 0, sizeof(*he));
- he-tag = (rpmTag) RPMTAG_RELEASE;
-
[CVS] RPM: rpm/ macros.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Arkadiusz Miskiewicz
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 29-Jul-2008 17:42:49
Branch: HEAD Handle: 2008072915424900
Modified files:
rpm macros.in
Log:
Protect against weird values on env: LC_ALL, LINGUAS, LANGUAGE.
Summary:
RevisionChanges Path
1.251 +6 -1 rpm/macros.in
patch -p0 '@@ .'
Index: rpm/macros.in
$ cvs diff -u -r1.250 -r1.251 macros.in
--- rpm/macros.in 20 Jul 2008 00:04:51 - 1.250
+++ rpm/macros.in 29 Jul 2008 15:42:49 - 1.251
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.250 2008/07/20 00:04:51 jbj Exp $
+# $Id: macros.in,v 1.251 2008/07/29 15:42:49 arekm Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -1115,9 +1115,14 @@
%{?_javaclasspath:CLASSPATH=\%{_javaclasspath}\\
export CLASSPATH}\
unset PERL_MM_OPT || :\
+ LC_ALL=C\
+ export LC_ALL\
LANG=C\
export LANG\
unset DISPLAY || :\
+ unset LINGUAS || :\
+ unset LANGUAGE || :\
+ unset LC_MESSAGES || :\
\
%{verbose:set -x}%{!verbose:exec /dev/null}\
umask 022\
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Arkadiusz Miskiewicz Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 29-Jul-2008 18:00:41 Branch: rpm-5_1 Handle: 2008072916004100 Modified files: (Branch: rpm-5_1) rpm configure.ac Log: Explictly use AC_PROG_CXX to get @CXX@ subsitution in macros.in. Summary: RevisionChanges Path 2.289.2.6 +1 -0 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.289.2.5 -r2.289.2.6 configure.ac --- rpm/configure.ac 18 Jul 2008 09:29:14 - 2.289.2.5 +++ rpm/configure.ac 29 Jul 2008 16:00:41 - 2.289.2.6 @@ -107,6 +107,7 @@ AC_PROG_CC AC_PROG_CPP +AC_PROG_CXX AC_USE_SYSTEM_EXTENSIONS @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/rpmdb/ rpmdb.h
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Arkadiusz Miskiewicz Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 29-Jul-2008 18:08:18 Branch: rpm-5_1 Handle: 2008072916081800 Modified files: (Branch: rpm-5_1) rpm/rpmdb rpmdb.h Log: It seems to be needed only internally. Unbreak header for external apps. Summary: RevisionChanges Path 1.73.2.2+2 -0 rpm/rpmdb/rpmdb.h patch -p0 '@@ .' Index: rpm/rpmdb/rpmdb.h $ cvs diff -u -r1.73.2.1 -r1.73.2.2 rpmdb.h --- rpm/rpmdb/rpmdb.h 5 Jun 2008 14:26:40 - 1.73.2.1 +++ rpm/rpmdb/rpmdb.h 29 Jul 2008 16:08:18 - 1.73.2.2 @@ -10,11 +10,13 @@ #include assert.h #include rpmlib.h #include mire.h +#if defined(_RPMDB_INTERNAL) #if defined(WITH_DB) #include db.h #else #include db_emu.h #endif +#endif /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/lib/ depends.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 29-Jul-2008 21:03:39 Branch: HEAD Handle: 2008072919033900 Modified files: rpm/lib depends.c Log: at least partially unbreak building of HEAD after recent rpmdb.h changes Summary: RevisionChanges Path 1.407 +0 -4 rpm/lib/depends.c patch -p0 '@@ .' Index: rpm/lib/depends.c $ cvs diff -u -r1.406 -r1.407 depends.c --- rpm/lib/depends.c 17 Jul 2008 14:37:45 - 1.406 +++ rpm/lib/depends.c 29 Jul 2008 19:03:39 - 1.407 @@ -13,11 +13,7 @@ #include envvar.h #include ugid.h/* XXX user()/group() probes */ -/* XXX CACHE_DEPENDENCY_RESULT deprecated, functionality being reimplemented */ -#undef CACHE_DEPENDENCY_RESULT -#if defined(CACHE_DEPNDENCY_RESULT) #define _RPMDB_INTERNAL /* XXX response cache needs dbiOpen et al. */ -#endif #include rpmdb.h #define _RPMEVR_INTERNAL @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
