1 Index: rpm/configure.ac
2 diff -u -u -r2.305 -r2.306
3 --- rpm/configure.ac 28 Jul 2008 14:35:25 -0000 2.305
4 +++ rpm/configure.ac 29 Jul 2008 16:00:15 -0000 2.306
11 AC_USE_SYSTEM_EXTENSIONS
14 diff -u -u -r1.250 -r1.251
15 --- rpm/macros.in 20 Jul 2008 00:04:51 -0000 1.250
16 +++ rpm/macros.in 29 Jul 2008 15:42:49 -0000 1.251
17 @@ -1115,9 +1115,14 @@
18 %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
20 unset PERL_MM_OPT || :\
27 + unset LANGUAGE || :\
28 + unset LC_MESSAGES || :\
30 %{verbose:set -x}%{!verbose:exec > /dev/null}\
32 Index: rpm/lib/rpmlib.h
33 diff -u -u -r2.462 -r2.463
34 --- rpm/lib/rpmlib.h 26 Mar 2008 20:59:14 -0000 2.462
35 +++ rpm/lib/rpmlib.h 29 Jul 2008 14:51:36 -0000 2.463
39 #include <rpmversion.h>
42 #define RPM_FORMAT_VERSION 5
43 #define RPM_MAJOR_VERSION 0
44 Index: rpm/rpmio/argv.h
45 diff -u -u -r1.9 -r1.10
46 --- rpm/rpmio/argv.h 22 May 2008 14:44:09 -0000 1.9
47 +++ rpm/rpmio/argv.h 29 Jul 2008 15:00:20 -0000 1.10
54 typedef const char * ARGstr_t;
55 typedef ARGstr_t * ARGV_t;
57 Index: rpm/rpmio/rpmurl.h
58 diff -u -u -r1.32 -r1.33
59 --- rpm/rpmio/rpmurl.h~ 2008-07-29 18:13:16.865049453 +0200
60 +++ rpm/rpmio/rpmurl.h 2008-07-29 18:14:51.751915001 +0200
68 * Supported URL types.
70 Index: rpm/rpmdb/rpmdb.h
71 diff -u -u -r1.75 -r1.73.2.2
72 --- rpm/rpmdb/rpmdb.h 29 Jul 2008 14:54:30 -0000 1.75
73 +++ rpm/rpmdb/rpmdb.h 29 Jul 2008 16:08:18 -0000 1.73.2.2
78 +#if defined(_RPMDB_INTERNAL)
88 diff -urN rpm-5.1.4/lib/rpmfc.c rpm-5.1.4.new/lib/rpmfc.c
89 --- rpm-5.1.4/lib/rpmfc.c 2008-04-06 10:48:08.000000000 +0200
90 +++ rpm-5.1.4.new/lib/rpmfc.c 2008-07-29 21:02:21.000000000 +0200
93 { "Java ", RPMFC_JAVA|RPMFC_INCLUDE },
95 - { "PE executable", RPMFC_MONO|RPMFC_INCLUDE },
96 + { "Mono/.Net assembly", RPMFC_MONO|RPMFC_INCLUDE },
98 { "current ar archive", RPMFC_STATIC|RPMFC_LIBRARY|RPMFC_ARCHIVE|RPMFC_INCLUDE },
100 --- rpm/lib/depends.c~ 2008-06-15 10:57:22.000000000 +0200
101 +++ rpm/lib/depends.c 2008-07-29 22:03:37.336792223 +0200
104 /* XXX CACHE_DEPENDENCY_RESULT deprecated, functionality being reimplemented */
105 #undef CACHE_DEPENDENCY_RESULT
106 -#if defined(CACHE_DEPNDENCY_RESULT)
107 -#define _RPMDB_INTERNAL /* XXX response cache needs dbiOpen et al. */
109 +#define _RPMDB_INTERNAL /* XXX response cache needs dbiOpen et al. DBT used below */
112 #define _RPMEVR_INTERNAL