summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/rpm/files/cross_libpaths.patch11
-rw-r--r--meta/packages/rpm/rpm-native_4.4.2.3.bb2
-rw-r--r--meta/packages/rpm/rpm_4.4.2.3.bb2
3 files changed, 11 insertions, 4 deletions
diff --git a/meta/packages/rpm/files/cross_libpaths.patch b/meta/packages/rpm/files/cross_libpaths.patch
index 798db15cf0..9e8f7dca82 100644
--- a/meta/packages/rpm/files/cross_libpaths.patch
+++ b/meta/packages/rpm/files/cross_libpaths.patch
@@ -117,7 +117,7 @@ Index: rpm-4.4.2.3/rpmio/rpmio_internal.h
117Index: rpm-4.4.2.3/Makefile.am 117Index: rpm-4.4.2.3/Makefile.am
118=================================================================== 118===================================================================
119--- rpm-4.4.2.3.orig/Makefile.am 2008-04-01 08:28:21.000000000 +0100 119--- rpm-4.4.2.3.orig/Makefile.am 2008-04-01 08:28:21.000000000 +0100
120+++ rpm-4.4.2.3/Makefile.am 2008-08-23 12:07:29.000000000 +0100 120+++ rpm-4.4.2.3/Makefile.am 2008-08-25 23:09:40.000000000 +0100
121@@ -10,7 +10,7 @@ 121@@ -10,7 +10,7 @@
122 po/*.in po/*.po po/rpm.pot \ 122 po/*.in po/*.po po/rpm.pot \
123 rpm.magic rpmpopt-$(VERSION) rpmqv.c 123 rpm.magic rpmpopt-$(VERSION) rpmqv.c
@@ -127,6 +127,15 @@ Index: rpm-4.4.2.3/Makefile.am
127 127
128 INCLUDES = \ 128 INCLUDES = \
129 -I$(top_srcdir)/build \ 129 -I$(top_srcdir)/build \
130@@ -93,7 +93,7 @@
131 rpm2cpio_LDFLAGS = $(myLDFLAGS)
132 rpm2cpio_LDADD = $(myLDADD) @LIBMISC@
133
134-$(PROGRAMS): $(myLDADD) @WITH_APIDOCS_TARGET@
135+$(PROGRAMS): @WITH_APIDOCS_TARGET@
136
137 .PHONY: splint
138 splint:
130Index: rpm-4.4.2.3/rpmdb/Makefile.am 139Index: rpm-4.4.2.3/rpmdb/Makefile.am
131=================================================================== 140===================================================================
132--- rpm-4.4.2.3.orig/rpmdb/Makefile.am 2008-04-01 08:28:22.000000000 +0100 141--- rpm-4.4.2.3.orig/rpmdb/Makefile.am 2008-04-01 08:28:22.000000000 +0100
diff --git a/meta/packages/rpm/rpm-native_4.4.2.3.bb b/meta/packages/rpm/rpm-native_4.4.2.3.bb
index 517b571db5..2e949dcd24 100644
--- a/meta/packages/rpm/rpm-native_4.4.2.3.bb
+++ b/meta/packages/rpm/rpm-native_4.4.2.3.bb
@@ -3,7 +3,5 @@ inherit native
3 3
4DEPENDS = "beecrypt-native zlib-native file-native popt-native python-native" 4DEPENDS = "beecrypt-native zlib-native file-native popt-native python-native"
5 5
6PR = "r2"
7
8export sharedstatedir = "${layout_sharedstatedir}" 6export sharedstatedir = "${layout_sharedstatedir}"
9export localstatedir = "${layout_localstatedir}" 7export localstatedir = "${layout_localstatedir}"
diff --git a/meta/packages/rpm/rpm_4.4.2.3.bb b/meta/packages/rpm/rpm_4.4.2.3.bb
index 7edecbcba6..4e868e3716 100644
--- a/meta/packages/rpm/rpm_4.4.2.3.bb
+++ b/meta/packages/rpm/rpm_4.4.2.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The RPM Package Manager."
2HOMEPAGE = "http://rpm.org/" 2HOMEPAGE = "http://rpm.org/"
3LICENSE = "LGPL GPL" 3LICENSE = "LGPL GPL"
4DEPENDS = "zlib beecrypt file popt python" 4DEPENDS = "zlib beecrypt file popt python"
5PR = "r3" 5PR = "r4"
6 6
7SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \ 7SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
8 file://external-tools.patch;patch=1 \ 8 file://external-tools.patch;patch=1 \