[packages/rpm.git] / rpm-branch.patch

Index: rpm/configure.ac
diff -u -u -r2.305 -r2.306
--- rpm/configure.ac	28 Jul 2008 14:35:25 -0000	2.305
+++ rpm/configure.ac	29 Jul 2008 16:00:15 -0000	2.306
@@ -107,6 +107,7 @@
 
 AC_PROG_CC
 AC_PROG_CPP
+AC_PROG_CXX
 
 AC_USE_SYSTEM_EXTENSIONS
 
Index: rpm/macros.in
diff -u -u -r1.250 -r1.251
--- rpm/macros.in	20 Jul 2008 00:04:51 -0000	1.250
+++ rpm/macros.in	29 Jul 2008 15:42:49 -0000	1.251
@@ -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\
Index: rpm/lib/rpmlib.h
diff -u -u -r2.462 -r2.463
--- rpm/lib/rpmlib.h	26 Mar 2008 20:59:14 -0000	2.462
+++ rpm/lib/rpmlib.h	29 Jul 2008 14:51:36 -0000	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
Index: rpm/rpmio/argv.h
diff -u -u -r1.9 -r1.10
--- rpm/rpmio/argv.h	22 May 2008 14:44:09 -0000	1.9
+++ rpm/rpmio/argv.h	29 Jul 2008 15:00:20 -0000	1.10
@@ -5,6 +5,8 @@
  * \file rpmio/argv.h
  */
 
+#include <stdint.h>
+
 typedef	const char * ARGstr_t;
 typedef ARGstr_t * ARGV_t;
 
Index: rpm/rpmio/rpmurl.h
diff -u -u -r1.32 -r1.33
--- rpm/rpmio/rpmurl.h~	2008-07-29 18:13:16.865049453 +0200
+++ rpm/rpmio/rpmurl.h	2008-07-29 18:14:51.751915001 +0200
@@ -6,6 +6,7 @@
  */
 
 #include <assert.h>
+#include <rpmio.h>
 
 /**
  * Supported URL types.

Index: rpm/rpmdb/rpmdb.h
diff -u -u -r1.75 -r1.73.2.2
--- rpm/rpmdb/rpmdb.h	29 Jul 2008 14:54:30 -0000	1.75
+++ rpm/rpmdb/rpmdb.h	29 Jul 2008 16:08:18 -0000	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
 
 /*@-exportlocal@*/
 /*@unchecked@*/
diff -urN rpm-5.1.4/lib/rpmfc.c rpm-5.1.4.new/lib/rpmfc.c
--- rpm-5.1.4/lib/rpmfc.c	2008-04-06 10:48:08.000000000 +0200
+++ rpm-5.1.4.new/lib/rpmfc.c	2008-07-29 21:02:21.000000000 +0200
@@ -472,7 +472,7 @@
 
   { "Java ",			RPMFC_JAVA|RPMFC_INCLUDE },
 
-  { "PE executable",            RPMFC_MONO|RPMFC_INCLUDE },
+  { "Mono/.Net assembly",            RPMFC_MONO|RPMFC_INCLUDE },
 
   { "current ar archive",	RPMFC_STATIC|RPMFC_LIBRARY|RPMFC_ARCHIVE|RPMFC_INCLUDE },
 
--- rpm/lib/depends.c~	2008-06-15 10:57:22.000000000 +0200
+++ rpm/lib/depends.c	2008-07-29 22:03:37.336792223 +0200
@@ -15,9 +15,7 @@
 
 /* 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
+#define	_RPMDB_INTERNAL		/* XXX response cache needs dbiOpen et al. DBT used below */
 #include "rpmdb.h"
 
 #define	_RPMEVR_INTERNAL
Commit	Line	Data
c9a7844f AM	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
	5	@@ -107,6 +107,7 @@
	6
	7	AC_PROG_CC
	8	AC_PROG_CPP
	9	+AC_PROG_CXX
	10
	11	AC_USE_SYSTEM_EXTENSIONS
	12
	13	Index: rpm/macros.in
	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}\"\
	19	export CLASSPATH}\
	20	unset PERL_MM_OPT \|\| :\
	21	+ LC_ALL=C\
	22	+ export LC_ALL\
	23	LANG=C\
	24	export LANG\
	25	unset DISPLAY \|\| :\
	26	+ unset LINGUAS \|\| :\
	27	+ unset LANGUAGE \|\| :\
	28	+ unset LC_MESSAGES \|\| :\
	29	\
	30	%{verbose:set -x}%{!verbose:exec > /dev/null}\
	31	umask 022\
	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
	36	@@ -10,6 +10,7 @@
	37
	38	#include <rpmtag.h>
	39	#include <rpmversion.h>
	40	+#include <rpmio.h>
	41
	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
	48	@@ -5,6 +5,8 @@
	49	* \file rpmio/argv.h
	50	*/
	51
	52	+#include <stdint.h>
	53	+
	54	typedef const char * ARGstr_t;
	55	typedef ARGstr_t * ARGV_t;
	56
	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
	61	@@ -6,6 +6,7 @@
	62	*/
	63
	64	#include <assert.h>
65	+#include <rpmio.h>
66
67	/**
68	* Supported URL types.
ea8c0d33 AM	69
	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
31fd38a5	74	@@ -10,11 +10,13 @@
ea8c0d33 AM	75	#include <assert.h>
	76	#include <rpmlib.h>
	77	#include <mire.h>
ea8c0d33	78	+#if defined(_RPMDB_INTERNAL)
31fd38a5 AM	79	#if defined(WITH_DB)
	80	#include "db.h"
	81	#else
	82	#include "db_emu.h"
	83	#endif
ea8c0d33 AM	84	+#endif
	85
	86	/@-exportlocal@/
	87	/@unchecked@/
0c77471d MB	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
	91	@@ -472,7 +472,7 @@
	92
	93	{ "Java ", RPMFC_JAVA\|RPMFC_INCLUDE },
	94
	95	- { "PE executable", RPMFC_MONO\|RPMFC_INCLUDE },
	96	+ { "Mono/.Net assembly", RPMFC_MONO\|RPMFC_INCLUDE },
	97
	98	{ "current ar archive", RPMFC_STATIC\|RPMFC_LIBRARY\|RPMFC_ARCHIVE\|RPMFC_INCLUDE },
	99
1c6570b3 AM	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
	102	@@ -15,9 +15,7 @@
	103
	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. */
	108	-#endif
	109	+#define _RPMDB_INTERNAL /* XXX response cache needs dbiOpen et al. DBT used below */
	110	#include "rpmdb.h"
	111
	112	#define _RPMEVR_INTERNAL