SOURCES (AC-branch): poldek-prereq.patch - ported to poldek 0.19 snap

[qboosh]

Author: qboosh                       Date: Thu Jul 28 12:55:51 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- ported to poldek 0.19 snap

---- Files affected:
SOURCES:
   poldek-prereq.patch (1.1 -> 1.1.2.1) 

---- Diffs:

================================================================
Index: SOURCES/poldek-prereq.patch
diff -u SOURCES/poldek-prereq.patch:1.1 SOURCES/poldek-prereq.patch:1.1.2.1
--- SOURCES/poldek-prereq.patch:1.1	Mon Jul 25 15:36:24 2005
+++ SOURCES/poldek-prereq.patch	Thu Jul 28 14:55:46 2005
@@ -1,18 +1,17 @@
---- poldek-0.18.9/capreq.c.orig	2004-12-30 13:05:19.000000000 +0100
-+++ poldek-0.18.9/capreq.c	2005-07-25 15:16:01.000000000 +0200
-@@ -646,10 +646,13 @@
-                     cr->cr_flags |= CAPREQ_PREREQ | CAPREQ_PREREQ_UN;
+--- poldek-0.19.0-cvs20050613.22/pm/rpm/rpm_pkg_ld.c.orig	2004-12-02 18:40:14.000000000 +0100
++++ poldek-0.19.0-cvs20050613.22/pm/rpm/rpm_pkg_ld.c	2005-07-28 14:54:52.000000000 +0200
+@@ -170,10 +170,13 @@
                  }
  #else
+                 
 +#  if RPMSENSE_PREREQ != RPMSENSE_ANY /* rpm 4.4 drops legacy PreReq support */
-                 if (isLegacyPreReq(flag)) { /* prepared by rpm < 4.0.2  */
-                     cr->cr_flags |= CAPREQ_PREREQ | CAPREQ_PREREQ_UN;
--                
--                } else if (isInstallPreReq(flag)) {
-+
-+                } else
+                 if (isLegacyPreReq(flag)) /* prepared by rpm < 4.0.2  */
+                     cr_flags |= CAPREQ_PREREQ | CAPREQ_PREREQ_UN;
+                     
+-                else if (isInstallPreReq(flag))
++                else
 +#  endif
-+		if (isInstallPreReq(flag)) {
-                     cr->cr_flags |= CAPREQ_PREREQ;
-                 
-                 } else if (isErasePreReq(flag)) {
++		if (isInstallPreReq(flag))
+                     cr_flags |= CAPREQ_PREREQ;
+ 
+                 if (isErasePreReq(flag))
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/poldek-prereq.patch?r1=1.1&r2=1.1.2.1&f=u