- temp. workaround for new rpm's api (thx. to Miś).

Changed files:
    poldek-capreq.patch -> 1.1
    poldek.spec -> 1.190

diff --git a/poldek-capreq.patch b/poldek-capreq.patch
new file mode 100644 (file)
index 0000000..2163030
--- /dev/null
+++ b/poldek-capreq.patch
@@ -0,0 +1,39 @@
+--- installer/poldek/capreq.c  2004/01/10 12:45:34     1.25.4.1
++++ installer/poldek/capreq.c  2004/12/01 16:24:52     1.25.4.2
+@@ -639,24 +639,22 @@
+             if (flag & RPMSENSE_EQUAL) 
+                 cr->cr_relflags |= REL_EQ;
+ 
+-                
++            if (crtype == CRTYPE_REQ) {
+ #ifndef HAVE_RPM_EXTDEPS
+-            if (flag & RPMSENSE_PREREQ) {
+-                n_assert(crtype == CRTYPE_REQ);
+-                cr->cr_flags |= CAPREQ_PREREQ | CAPREQ_PREREQ_UN;
+-            }
++                if (flag & RPMSENSE_PREREQ) {
++                    n_assert(crtype == CRTYPE_REQ);
++                    cr->cr_flags |= CAPREQ_PREREQ | CAPREQ_PREREQ_UN;
++                }
+ #else
+-            if (isLegacyPreReq(flag)) { /* prepared by rpm < 4.0.2  */
+-                n_assert(crtype == CRTYPE_REQ);
+-                cr->cr_flags |= CAPREQ_PREREQ | CAPREQ_PREREQ_UN;
++                if (isLegacyPreReq(flag)) { /* prepared by rpm < 4.0.2  */
++                    cr->cr_flags |= CAPREQ_PREREQ | CAPREQ_PREREQ_UN;
+                 
+-            } else if (isInstallPreReq(flag)) {
+-                n_assert(crtype == CRTYPE_REQ);
+-                cr->cr_flags |= CAPREQ_PREREQ;
++                } else if (isInstallPreReq(flag)) {
++                    cr->cr_flags |= CAPREQ_PREREQ;
+                 
+-            } else if (isErasePreReq(flag)) {
+-                n_assert(crtype == CRTYPE_REQ);
+-                cr->cr_flags |= CAPREQ_PREREQ_UN;
++                } else if (isErasePreReq(flag)) {
++                    cr->cr_flags |= CAPREQ_PREREQ_UN;
++                }
+             }
+ #endif /* HAVE_RPM_EXTDEPS */
+         }

diff --git a/poldek.spec b/poldek.spec
index 817762664178cd6e00f10a49b938dea8492d3a24..56bccdb4f175bb83265e82fcd5fcdc9ca1d358f8 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -24,6 +24,7 @@ Patch2:               %{name}-simplestatic.patch
 Patch3:                %{name}-po.patch
 Patch4:                %{name}-n_free.patch
 Patch5:                %{name}-transfer_rate.patch
+Patch6:                %{name}-capreq.patch
 Patch12:       %{name}-distver.patch
 URL:           http://team.pld.org.pl/~mis/poldek/
 BuildRequires: automake
@@ -97,6 +98,7 @@ modu
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p2
 %{?with_distver:%patch12 -p1}
 
 %build