]> git.pld-linux.org Git - packages/rpm.git/commitdiff
rpm did not found pythonegg provides on x32.
authorWitold Filipczyk <witekfl@poczta.onet.pl>
Fri, 27 Feb 2015 15:25:17 +0000 (15:25 +0000)
committerWitold Filipczyk <witekfl@poczta.onet.pl>
Fri, 27 Feb 2015 15:25:17 +0000 (15:25 +0000)
For example for python-markupsafe.

python-libx32.patch [new file with mode: 0644]
rpm.spec

diff --git a/python-libx32.patch b/python-libx32.patch
new file mode 100644 (file)
index 0000000..59626dd
--- /dev/null
@@ -0,0 +1,10 @@
+--- rpm-5.4.15/lib/rpmfc.c.old 2015-02-27 14:41:47.000000000 +0000
++++ rpm-5.4.15/lib/rpmfc.c     2015-02-27 14:59:44.000000000 +0000
+@@ -1153,6 +1153,7 @@ assert(fc->fn != NULL);
+       {   fn = strstr(fc->fn[fc->ix], "/usr/lib");
+           if (fn) {
+               fn += sizeof("/usr/lib")-1;
++              if (fn[0] == 'x') fn++;
+               if ((fn[0] == '3' && fn[1] == '2') || 
+                       (fn[0] == '6' && fn[1] == '4'))
+                   fn += 2;
index a8b8302a7bd85487a46036d276bed83ee62b789c..5b5dc8d995798fbb1a5c888000997490ab5b854c 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -51,7 +51,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.15
-Release:       12
+Release:       13
 License:       LGPL v2.1
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm
@@ -296,6 +296,8 @@ Patch1048:  %{name}-5.4.14-rpmdbchk.patch
 # https://abf.io/openmandriva/rpm/raw/master/rpm-5.4.14-no-assert-abort-with-broken-headers.patch
 Patch1049:     %{name}-5.4.14-no-assert-abort-with-broken-headers.patch
 
+Patch1050:     python-libx32.patch
+
 URL:           http://rpm5.org/
 BuildRequires: %{reqdb_pkg}-devel >= %{reqdb_pkgver}
 %if %{with sqlite}
@@ -1011,6 +1013,8 @@ cd -
 
 %patch83 -p1
 
+%patch1050 -p1
+
 install %{SOURCE2} macros/pld.in
 install %{SOURCE8} scripts/php.prov.in
 install %{SOURCE9} scripts/php.req.in
This page took 0.042273 seconds and 4 git commands to generate.