]> git.pld-linux.org Git - packages/rpm.git/blame - rpm-branch.patch
- some fixes from upstream
[packages/rpm.git] / rpm-branch.patch
CommitLineData
c9a7844f
AM
1Index: rpm/configure.ac
2diff -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
13Index: rpm/macros.in
14diff -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\
32Index: rpm/lib/rpmlib.h
33diff -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
44Index: rpm/rpmio/argv.h
45diff -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
57Index: rpm/rpmio/rpmurl.h
58diff -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.
This page took 0.170976 seconds and 4 git commands to generate.