[packages/poldek.git] / poldek-prereq.patch

--- 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_flags |= CAPREQ_PREREQ | CAPREQ_PREREQ_UN;
                     
-                else if (isInstallPreReq(flag))
+                else
+#  endif
+		if (isInstallPreReq(flag))
                     cr_flags |= CAPREQ_PREREQ;
 
                 if (isErasePreReq(flag))
Commit	Line	Data
0b9e0d47	1	--- poldek-0.19.0-cvs20050613.22/pm/rpm/rpm_pkg_ld.c.orig 2004-12-02 18:40:14.000000000 +0100
	2	+++ poldek-0.19.0-cvs20050613.22/pm/rpm/rpm_pkg_ld.c 2005-07-28 14:54:52.000000000 +0200
	3	@@ -170,10 +170,13 @@
500fa9a8 JB	4	}
500fa9a8 JB	5	#else
0b9e0d47	6
500fa9a8	7	+# if RPMSENSE_PREREQ != RPMSENSE_ANY /* rpm 4.4 drops legacy PreReq support */
0b9e0d47	8	if (isLegacyPreReq(flag)) /* prepared by rpm < 4.0.2 */
	9	cr_flags \|= CAPREQ_PREREQ \| CAPREQ_PREREQ_UN;
	10
	11	- else if (isInstallPreReq(flag))
	12	+ else
500fa9a8	13	+# endif
0b9e0d47	14	+ if (isInstallPreReq(flag))
	15	cr_flags \|= CAPREQ_PREREQ;
	16
	17	if (isErasePreReq(flag))