- added assert patch (needed with gcc 3.3)

Changed files:
    apt-assert.patch -> 1.1
    apt.spec -> 1.79

diff --git a/apt-assert.patch b/apt-assert.patch
new file mode 100644 (file)
index 0000000..c83609c
--- /dev/null
+++ b/apt-assert.patch
@@ -0,0 +1,32 @@
+--- apt-0.5.5cnc4.1/apt-pkg/acquire-item.cc.orig       2003-03-08 00:11:34.000000000 +0100
++++ apt-0.5.5cnc4.1/apt-pkg/acquire-item.cc    2003-06-19 22:59:35.000000000 +0200
+@@ -27,6 +27,7 @@
+ #include <apt-pkg/repository.h>
+ #include <apt-pkg/md5.h>
+ #include <iostream>
++#include <cassert>
+ using namespace std;
+ 
+ #include <apti18n.h>
+--- apt-0.5.5cnc4.1/apt-pkg/rpm/rpmsrcrecords.cc.orig  2003-03-08 00:12:41.000000000 +0100
++++ apt-0.5.5cnc4.1/apt-pkg/rpm/rpmsrcrecords.cc       2003-06-19 23:01:29.000000000 +0200
+@@ -30,6 +30,8 @@
+ #include <rpm/rpmds.h>
+ #endif
+ 
++#include <cassert>
++
+ // SrcRecordParser::rpmSrcRecordParser - Constructor                  /*{{{*/
+ // ---------------------------------------------------------------------
+ /* */
+--- apt-0.5.5cnc4.1/apt-pkg/rpm/rpmversion.cc.orig     2003-03-08 00:12:34.000000000 +0100
++++ apt-0.5.5cnc4.1/apt-pkg/rpm/rpmversion.cc  2003-06-19 23:02:00.000000000 +0200
+@@ -31,6 +31,8 @@
+ #include <rpm/rpmds.h>
+ #endif
+ 
++#include <cassert>
++
+ rpmVersioningSystem rpmVS;
+ 
+ // rpmVS::rpmVersioningSystem - Constructor                           /*{{{*/

diff --git a/apt.spec b/apt.spec
index d7416fb768d04e6a9fc79df13d918af7662285b4..4d1b4c07af5b3b0fec1a00c562db40299a0f24da 100644 (file)
--- a/apt.spec
+++ b/apt.spec
@@ -23,6 +23,7 @@ Patch3:               %{name}-man_fixes.patch
 Patch5:                %{name}-es_it.patch
 Patch6:                %{name}-filed.patch
 Patch7:                %{name}-pld_user_in_ftp_pass.patch
+Patch8:                %{name}-assert.patch
 URL:           http://moin.conectiva.com.br/files/AptRpm/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -87,11 +88,10 @@ Arquivos de desenvolvimento para a biblioteca libapt-pkg do APT
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-# use -o Cache::Dir=foo instead
-#%%patch4 -p1
 %patch5 -p1
-%patch6 -p1 -b .wiget
+%patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 mv po/es_ES.po po/es.po
@@ -177,6 +177,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%%doc doc/libapt-pkg2_to_3.txt 
+%doc doc/libapt-pkg2_to_3.txt 
 %{_libdir}/libapt*.so
 %{_includedir}/apt-pkg