From 98b4823cf712d66cd1570b7b445abd02ef1fb41048758ebd1e4d3e34087a6f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Mon, 10 Mar 2014 13:27:17 +0000 Subject: [PATCH] - export the old weak dependency tags so that they are OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=325 --- exportoldtags.diff | 25 +++++++++++++++++++++++++ rpm.changes | 7 +++++++ rpm.spec | 3 ++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 exportoldtags.diff diff --git a/exportoldtags.diff b/exportoldtags.diff new file mode 100644 index 0000000..c8ba312 --- /dev/null +++ b/exportoldtags.diff @@ -0,0 +1,25 @@ +--- ./lib/rpmtag.h.orig 2014-03-10 13:26:56.411058656 +0000 ++++ ./lib/rpmtag.h 2014-03-10 13:27:49.545058562 +0000 +@@ -217,14 +217,14 @@ typedef enum rpmTag_e { + RPMTAG_PRETRANSPROG = 1153, /* s[] */ + RPMTAG_POSTTRANSPROG = 1154, /* s[] */ + RPMTAG_DISTTAG = 1155, /* s */ +- RPMTAG_OLDSUGGESTSNAME = 1156, /* s[] (unimplemented) */ +-#define RPMTAG_OLDSUGGESTS RPMTAG_OLDSUGGESTSNAME /* s[] (unimplemented) */ +- RPMTAG_OLDSUGGESTSVERSION = 1157, /* s[] (unimplemented) */ +- RPMTAG_OLDSUGGESTSFLAGS = 1158, /* i[] (unimplemented) */ +- RPMTAG_OLDENHANCESNAME = 1159, /* s[] (unimplemented) */ +-#define RPMTAG_OLDENHANCES RPMTAG_OLDENHANCESNAME /* s[] (unimplemented) */ +- RPMTAG_OLDENHANCESVERSION = 1160, /* s[] (unimplemented) */ +- RPMTAG_OLDENHANCESFLAGS = 1161, /* i[] (unimplemented) */ ++ RPMTAG_OLDSUGGESTSNAME = 1156, /* s[] */ ++#define RPMTAG_OLDSUGGESTS RPMTAG_OLDSUGGESTSNAME /* s[] */ ++ RPMTAG_OLDSUGGESTSVERSION = 1157, /* s[] */ ++ RPMTAG_OLDSUGGESTSFLAGS = 1158, /* i[] */ ++ RPMTAG_OLDENHANCESNAME = 1159, /* s[] */ ++#define RPMTAG_OLDENHANCES RPMTAG_OLDENHANCESNAME /* s[] */ ++ RPMTAG_OLDENHANCESVERSION = 1160, /* s[] */ ++ RPMTAG_OLDENHANCESFLAGS = 1161, /* i[] */ + RPMTAG_PRIORITY = 1162, /* i[] extension placeholder (unimplemented) */ + RPMTAG_CVSID = 1163, /* s (unimplemented) */ + #define RPMTAG_SVNID RPMTAG_CVSID /* s (unimplemented) */ diff --git a/rpm.changes b/rpm.changes index 8df2895..2beb793 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 10 14:28:45 CET 2014 - mls@suse.de + +- export the old weak dependency tags so that they are + accessible from python + new patch: exportoldtags.diff + ------------------------------------------------------------------- Tue Feb 25 15:19:48 CET 2014 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index 2b047c3..ad1355e 100644 --- a/rpm.spec +++ b/rpm.spec @@ -136,6 +136,7 @@ Patch85: brp-compress-no-img.patch Patch92: find-lang-python.patch Patch93: weakdepscompat.diff Patch94: checksepwarn.diff +Patch95: exportoldtags.diff Patch6464: auto-config-update-aarch64-ppc64le.diff Patch68000: m68k.patch Patch68001: debugedit-m68k.patch @@ -225,7 +226,7 @@ rm -f rpmdb/db.h %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 %patch -P 80 -P 82 -P 85 -%patch -P 92 -P 93 -P 94 +%patch -P 92 -P 93 -P 94 -P 95 %ifarch aarch64 ppc64le %patch6464