[packages/rpm/dev-5.4.16] updated patches
glen
glen at pld-linux.org
Wed Mar 16 17:44:55 CET 2016
commit 1dc6af32ea9716a422606a238ff55e5ab228902f
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Mar 16 18:31:55 2016 +0200
updated patches
py-disable-fetch.patch | 15 ++++++++-------
rpm-5.4.4-pkgconfigdeps-check-path.patch | 4 ++--
rpm-preserve-tag-type.patch | 16 ++++++----------
rpm-python-enable-compat-RPMSENSE.patch | 21 ++++++++++++---------
rpm-python-sitescriptdir.patch | 14 --------------
py-disable-fetch.patch | 15 ++++++++-------
rpm-5.4.4-pkgconfigdeps-check-path.patch | 4 ++--
rpm-preserve-tag-type.patch | 16 ++++++----------
rpm-python-enable-compat-RPMSENSE.patch | 21 ++++++++++++---------
rpm-python-sitescriptdir.patch | 14 --------------
rpm.spec | 12 ++++++------
6 files changed, 34 insertions(+), 48 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index cac87d2..2d3a217 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -926,7 +926,7 @@ cd -
%patch46 -p1
%patch47 -p1
%patch48 -p1
-#%patch49 -p1 # REDIFF
+%patch49 -p1
%patch50 -p1
%patch51 -p1
%patch52 -p0
@@ -936,7 +936,7 @@ cd -
%patch56 -p1
%{!?with_db61:%patch57 -p1}
%patch58 -p1
-#%patch60 -p1 REDIFF
+%patch60 -p1
%patch61 -p1
%patch62 -p1
%patch63 -p1
@@ -946,7 +946,7 @@ cd -
%patch67 -p1
%patch70 -p1
%patch71 -p1
-#%patch72 -p1 REDIFF
+%patch72 -p1
%patch74 -p1
%patch75 -p1
%patch77 -p0
@@ -962,11 +962,11 @@ cd -
%patch88 -p1
%patch89 -p1
%patch90 -p1
-#%patch91 -p1 REDIFF
+%patch91 -p1
%patch1000 -p1
%patch1001 -p1
-#%patch1002 -p1 REDIFF
+%patch1002 -p1
%patch1003 -p1
%patch1004 -p1
%patch1005 -p1
@@ -974,7 +974,7 @@ cd -
%patch1007 -p1
%patch1008 -p1
%patch1009 -p1
-#%patch1010 -p1 REDIFF
+%patch1010 -p1
%patch1011 -p1
%patch1012 -p1
%patch1013 -p1
diff --git a/py-disable-fetch.patch b/py-disable-fetch.patch
index 6035867..3491ac0 100644
--- a/py-disable-fetch.patch
+++ b/py-disable-fetch.patch
@@ -13,9 +13,9 @@ but then ugly "Fetching" messages are still displayed, which maybe even more con
http://comments.gmane.org/gmane.comp.package-management.rpm.user/159
---- rpm-5.4.15/python/rpmts-py.c~ 2014-07-28 00:52:21.000000000 +0300
-+++ rpm-5.4.15/python/rpmts-py.c 2015-11-04 22:00:33.989058412 +0200
-@@ -1333,13 +1333,15 @@
+--- rpm-5.4.16/python/spec-py.c~ 2014-10-06 22:44:50.000000000 +0300
++++ rpm-5.4.16/python/spec-py.c 2016-03-16 18:26:35.334750440 +0200
+@@ -280,7 +280,7 @@
char * passPhrase = "";
char *cookie = NULL;
int anyarch = 1;
@@ -24,11 +24,12 @@ http://comments.gmane.org/gmane.comp.package-management.rpm.user/159
int force = 1;
char * kwlist[] = {"specfile", NULL};
- if (!PyArg_ParseTupleAndKeywords(args, kwds, "s:Parse", kwlist, &specfile))
+@@ -288,6 +288,8 @@
+ &specfile))
return NULL;
+ verify = rpmExpandNumeric("%{?_py_parsespec_verify}%{?!_py_parsespec_verify:0}");
+
- if (parseSpec(s->ts, specfile,"/", recursing, passPhrase,
- cookie, anyarch, force, verify)!=0) {
- PyErr_SetString(pyrpmError, "can't parse specfile\n");
+ ts = rpmtsCreate();
+ if (parseSpec(ts, specfile, "/", recursing, passPhrase,
+ cookie, anyarch, force, verify) == 0)
diff --git a/rpm-5.4.4-pkgconfigdeps-check-path.patch b/rpm-5.4.4-pkgconfigdeps-check-path.patch
index de33276..3e8c2f5 100644
--- a/rpm-5.4.4-pkgconfigdeps-check-path.patch
+++ b/rpm-5.4.4-pkgconfigdeps-check-path.patch
@@ -43,7 +43,7 @@
*.pc)
- [ -n "$oneshot" ] && echo "$oneshot"; oneshot=""
- # Query the dependencies of the package.
-- DIR=`dirname ${filename}`
+- DIR=$(dirname ${filename})
- PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig"
- export PKG_CONFIG_PATH
- $pkgconfig --print-requires "$filename" 2> /dev/null | while read n r v ; do
@@ -58,7 +58,7 @@
+ if [[ "$(dirname ${filename})" =~ pkgconfig ]]; then
+ [ -n "$oneshot" ] && echo "$oneshot"; oneshot=""
+ # Query the dependencies of the package.
-+ DIR=`dirname ${filename}`
++ DIR=$(dirname ${filename})
+ PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig"
+ export PKG_CONFIG_PATH
+ $pkgconfig --print-requires --print-requires-private "$filename" 2> /dev/null | while read n r v ; do
diff --git a/rpm-preserve-tag-type.patch b/rpm-preserve-tag-type.patch
index 9956219..474815c 100644
--- a/rpm-preserve-tag-type.patch
+++ b/rpm-preserve-tag-type.patch
@@ -8,11 +8,9 @@ Date: Sun May 5 21:56:02 2013 +0100
to return always he->t = RPMTAG_STRING even when RPM_I18NSTRING_TYPE (char **)
was returned in reality.
-diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c
-index 540838b..174df60 100644
---- a/rpmdb/tagname.c
-+++ b/rpmdb/tagname.c
-@@ -491,26 +491,28 @@ tagStore_t tagStoreFree(tagStore_t dbiTags, size_t dbiNTags)
+--- rpm-5.4.16/rpmdb/tagname.c~ 2016-03-05 21:00:47.000000000 +0200
++++ rpm-5.4.16/rpmdb/tagname.c 2016-03-16 18:23:45.265891340 +0200
+@@ -515,25 +515,27 @@
void tagTypeValidate(HE_t he);
void tagTypeValidate(HE_t he)
{
@@ -28,7 +26,7 @@ index 540838b..174df60 100644
- if ((he->tag & 0x40000000)
- && (he->t == RPM_STRING_TYPE || he->t == RPM_STRING_ARRAY_TYPE))
+ if ((he_s.tag & 0x40000000)
-+ && (he_s.t == RPM_STRING_TYPE || he_s.t == RPM_STRING_ARRAY_TYPE))
++ && (he-s->t == RPM_STRING_TYPE || he_s.t == RPM_STRING_ARRAY_TYPE))
return;
/* XXX Make 0x3fffffff disappear for now. Signature? */
@@ -40,15 +38,13 @@ index 540838b..174df60 100644
-if (!(he->tag == 62))
-if (!(he->tag == 261 || he->tag == 269))
-if (!(he->tag == 1000 || he->tag == 1004 || he->tag == 1007))
--if (!(he->tag == 1029))
--if (!(he->tag == 1086 || he->tag == 1087))
+-if (!(he->tag == 1029 || he->tag == 1086 || he->tag == 1087))
-if (he->t != (tagType(he->tag) & 0xffff))
-fprintf(stderr, "==> warning: tag %u type(0x%x) != implicit type(0x%x)\n", (unsigned) he->tag, he->t, tagType(he->tag));
+if (!(he_s.tag == 62))
+if (!(he_s.tag == 261 || he_s.tag == 269))
+if (!(he_s.tag == 1000 || he_s.tag == 1004 || he_s.tag == 1007))
-+if (!(he_s.tag == 1029))
-+if (!(he_s.tag == 1086 || he_s.tag == 1087))
++if (!(he_s.tag == 1029 || he_s.tag == 1086 || he_s.tag == 1087))
+if (he_s.t != (tagType(he_s.tag) & 0xffff))
+fprintf(stderr, "==> warning: tag %u type(0x%x) != implicit type(0x%x)\n", (unsigned) he_s.tag, he_s.t, tagType(he_s.tag));
}
diff --git a/rpm-python-enable-compat-RPMSENSE.patch b/rpm-python-enable-compat-RPMSENSE.patch
index e3b7701..4888f42 100644
--- a/rpm-python-enable-compat-RPMSENSE.patch
+++ b/rpm-python-enable-compat-RPMSENSE.patch
@@ -1,11 +1,14 @@
---- rpm-5.4.10/python/rpmmodule.c~ 2012-04-25 22:41:43.000000000 +0200
-+++ rpm-5.4.10/python/rpmmodule.c 2012-09-24 12:22:53.535610753 +0200
-@@ -493,7 +493,7 @@
- REGISTER_ENUM(RPMSENSE_EQUAL);
- REGISTER_ENUM(RPMSENSE_NOTEQUAL);
- REGISTER_ENUM(RPMSENSE_FIND_REQUIRES);
--#if defined(RPM_VENDOR_MANDRIVA)
-+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_PLD)
- REGISTER_ENUM(RPMSENSE_PREREQ);
+--- rpm-5.4.16/python/rpmmodule.c~ 2016-03-16 18:17:05.000000000 +0200
++++ rpm-5.4.16/python/rpmmodule.c 2016-03-16 18:17:19.799188791 +0200
+@@ -527,7 +527,10 @@
+ REGISTER_ENUM(RPMSENSE_PRETRANS);
+ REGISTER_ENUM(RPMSENSE_INTERP);
+ #else
+- #if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE)
++ #if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE) || defined(RPM_VENDOR_PLD)
++#if defined(RPM_VENDOR_PLD)
++ REGISTER_ENUM(RPMSENSE_PREREQ);
++#endif
REGISTER_ENUM(RPMSENSE_SCRIPT_PRE);
REGISTER_ENUM(RPMSENSE_SCRIPT_POST);
+ REGISTER_ENUM(RPMSENSE_SCRIPT_PREUN);
diff --git a/rpm-python-sitescriptdir.patch b/rpm-python-sitescriptdir.patch
index f753d48..28efd70 100644
--- a/rpm-python-sitescriptdir.patch
+++ b/rpm-python-sitescriptdir.patch
@@ -9,17 +9,3 @@
/* XXX HACK: classification by path is intrinsically non-portable. */
{ fn = strstr(fc->fn[fc->ix], "/usr/lib");
if (fn) {
-@@ -1166,6 +1166,13 @@
- fc->fcolor->vals[fc->ix] & RPMFC_LIBRARY)
- fc->fcolor->vals[fc->ix] |= (RPMFC_MODULE|RPMFC_SCRIPT);
- }
-+ fn = strstr(fc->fn[fc->ix], "/usr/share");
-+ if (fn) {
-+ fn += sizeof("/usr/share")-1;
-+ if (!strncmp(fn, "/python", sizeof("/python")-1))
-+ fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON;
-+ }
-+ }
- }
-
- /* XXX ugly quick & dirty integration of haskell() dependencies */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/d13717b28b7530715133c3221a7d0ced2426bfcb
More information about the pld-cvs-commit
mailing list