| 1 |
From: Panu Matilainen <pmatilai@redhat.com> |
| 2 |
Date: Mon, 1 Jun 2009 09:42:07 +0000 (+0300) |
| 3 |
Subject: Bring back former value of RPMSENSE_PREREQ |
| 4 |
X-Git-Url: http://rpm.org/gitweb?p=rpm.git;a=commitdiff_plain;h=c5b320fe4e9f96531fb6e86f0648ccb2b5f088b9 |
| 5 |
|
| 6 |
Bring back former value of RPMSENSE_PREREQ |
| 7 |
- packages using the legacy PreReq still widely exist distros having |
| 8 |
patched PREREQ back in, we'll want to be able to deal with the legacy |
| 9 |
packages best we can, and to do that we need to be able to test for |
| 10 |
the prereq bit |
| 11 |
- this also fixes ordering brokenness introduced by commit |
| 12 |
502f88e0e67bb1df91e09a32a370b04bda36259e all the way from 2004: |
| 13 |
with RPMSENSE_PREREQ equalling RPMSENSE_ANY, all co-requisites are seen |
| 14 |
as pre-requisites due to isLegacyPrefix() returning bogons (RhBug:502269) |
| 15 |
- previously RPMSENSE_SCRIPT_PRE etc were also marked RPMSENSE_PREREQ to |
| 16 |
permit legacy rpm versions to deal the fine grained scriptlet dependencies |
| 17 |
somehow, this we dont want anymore |
| 18 |
(cherry picked from commit 67bd81fb25a2a57adc97172cf426c475aea41612) |
| 19 |
diff -p -up rpm-4.6.0/lib/rpmds.h.orig rpm-4.6.0/lib/rpmds.h |
| 20 |
--- rpm-4.6.0/lib/rpmds.h.orig 2009-08-23 09:26:47.188328998 +0300 |
| 21 |
+++ rpm-4.6.0/lib/rpmds.h 2009-08-23 09:26:47.563330181 +0300 |
| 22 |
@@ -33,14 +33,13 @@ typedef enum rpmsenseFlags_e { |
| 23 |
RPMSENSE_EQUAL = (1 << 3), |
| 24 |
RPMSENSE_PROVIDES = (1 << 4), /* only used internally by builds */ |
| 25 |
RPMSENSE_CONFLICTS = (1 << 5), /* only used internally by builds */ |
| 26 |
- /* bit 6 used to be RPMSENSE_PREREQ */ |
| 27 |
-#define RPMSENSE_PREREQ RPMSENSE_ANY |
| 28 |
+ RPMSENSE_PREREQ = (1 << 6), /* legacy prereq dependency */ |
| 29 |
RPMSENSE_OBSOLETES = (1 << 7), /* only used internally by builds */ |
| 30 |
RPMSENSE_INTERP = (1 << 8), /*!< Interpreter used by scriptlet. */ |
| 31 |
- RPMSENSE_SCRIPT_PRE = ((1 << 9)|RPMSENSE_PREREQ), /*!< %pre dependency. */ |
| 32 |
- RPMSENSE_SCRIPT_POST = ((1 << 10)|RPMSENSE_PREREQ), /*!< %post dependency. */ |
| 33 |
- RPMSENSE_SCRIPT_PREUN = ((1 << 11)|RPMSENSE_PREREQ), /*!< %preun dependency. */ |
| 34 |
- RPMSENSE_SCRIPT_POSTUN = ((1 << 12)|RPMSENSE_PREREQ), /*!< %postun dependency. */ |
| 35 |
+ RPMSENSE_SCRIPT_PRE = (1 << 9), /*!< %pre dependency. */ |
| 36 |
+ RPMSENSE_SCRIPT_POST = (1 << 10), /*!< %post dependency. */ |
| 37 |
+ RPMSENSE_SCRIPT_PREUN = (1 << 11), /*!< %preun dependency. */ |
| 38 |
+ RPMSENSE_SCRIPT_POSTUN = (1 << 12), /*!< %postun dependency. */ |
| 39 |
RPMSENSE_SCRIPT_VERIFY = (1 << 13), /*!< %verify dependency. */ |
| 40 |
RPMSENSE_FIND_REQUIRES = (1 << 14), /*!< find-requires generated dependency. */ |
| 41 |
RPMSENSE_FIND_PROVIDES = (1 << 15), /*!< find-provides generated dependency. */ |
| 42 |
@@ -53,7 +52,7 @@ typedef enum rpmsenseFlags_e { |
| 43 |
RPMSENSE_SCRIPT_BUILD = (1 << 21), /*!< %build build dependency. */ |
| 44 |
RPMSENSE_SCRIPT_INSTALL = (1 << 22),/*!< %install build dependency. */ |
| 45 |
RPMSENSE_SCRIPT_CLEAN = (1 << 23), /*!< %clean build dependency. */ |
| 46 |
- RPMSENSE_RPMLIB = ((1 << 24) | RPMSENSE_PREREQ), /*!< rpmlib(feature) dependency. */ |
| 47 |
+ RPMSENSE_RPMLIB = (1 << 24), /*!< rpmlib(feature) dependency. */ |
| 48 |
RPMSENSE_TRIGGERPREIN = (1 << 25), /*!< %triggerprein dependency. */ |
| 49 |
RPMSENSE_KEYRING = (1 << 26), |
| 50 |
RPMSENSE_STRONG = (1 << 27), |
Parent Directory
| 
Revision Log