- readded updated pld_user_in_ftp_pass patch

- fixed md5-cache-dir-option patch
- release 0.99 (for testing)

Changed files:
    apt-md5-cache-dir-option.patch -> 1.4
    apt-pld_user_in_ftp_pass.patch -> 1.2
    apt.spec -> 1.70

diff --git a/apt-md5-cache-dir-option.patch b/apt-md5-cache-dir-option.patch
index 7b559c717b6e32a0c0b9d383366a15995f5d346a..0008d26a0010bce8b77e89579f60d999c4035ef2 100644 (file)
--- a/apt-md5-cache-dir-option.patch
+++ b/apt-md5-cache-dir-option.patch
@@ -82,7 +82,7 @@ diff -Nur apt-0.5.4cnc7.orig/tools/gensrclist.cc apt-0.5.4cnc7/tools/gensrclist.
     cerr << "                are in the same directory level"<<endl;
  }
  
-+string cache_dir = "/var/cache/apt"
++string cache_dir = "/var/cache/apt";
 +
  int main(int argc, char ** argv) 
  {

diff --git a/apt-pld_user_in_ftp_pass.patch b/apt-pld_user_in_ftp_pass.patch
index 1caacb31086df3808b183f86c6b37d6d3435b432..7f53bcd448dcc2bf3e20418f914106aa9e31acff 100644 (file)
--- a/apt-pld_user_in_ftp_pass.patch
+++ b/apt-pld_user_in_ftp_pass.patch
@@ -1,11 +1,11 @@
---- apt-0.3.19cnc38/methods/ftp.cc~    Tue Feb 20 19:20:02 2001
-+++ apt-0.3.19cnc38/methods/ftp.cc     Fri Apr 27 11:48:50 2001
-@@ -176,7 +176,7 @@
-    if (0) //akk
-       Pass = "apt_get_ftp_2.0@debian.linux.user";
-    else
--      Pass = "apt_get_ftp_2.0@conectiva.linux.user";
-+      Pass = "apt_get_ftp_2.0@pld.linux.user";
+--- apt-0.5.4cnc7/methods/ftp.cc.orig  Thu Jul 25 20:07:19 2002
++++ apt-0.5.4cnc7/methods/ftp.cc       Tue Dec 10 20:48:50 2002
+@@ -185,7 +185,7 @@
+    
+    // Setup the variables needed for authentication
+    string User = "anonymous";
+-   string Pass = "apt_get_ftp_2.1@debian.linux.user";
++   string Pass = "apt_get_ftp@pld.linux.user";
  
     // Fill in the user/pass
     if (ServerName.User.empty() == false)

diff --git a/apt.spec b/apt.spec
index af54c8f0d568fa6aeba1d181b5fb9ea5b0902600..d5939b2c9a1859ae621e27ca2d6c6eb75a929c86 100644 (file)
--- a/apt.spec
+++ b/apt.spec
@@ -3,7 +3,7 @@ Summary(pl):    Zawansowane narz
 Summary(pt):   Frontend avançado para pacotes rpm e deb
 Name:          apt
 Version:       0.5.4cnc7
-Release:       0.9
+Release:       0.99
 License:       GPL
 Group:         Applications/Archiving
 Source0:       http://moin.conectiva.com.br/files/AptRpm/attachments/%{name}-%{version}.tar.bz2
@@ -19,6 +19,7 @@ Patch3:               %{name}-man_fixes.patch
 Patch4:                %{name}-md5-cache-dir-option.patch
 Patch5:                %{name}-es_it.patch
 Patch6:                %{name}-filed.patch
+Patch7:                %{name}-pld_user_in_ftp_pass.patch
 URL:           http://moin.conectiva.com.br/files/AptRpm/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -85,6 +86,7 @@ Arquivos de desenvolvimento para a biblioteca libapt-pkg do APT
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 mv po/es_ES.po po/es.po
@@ -135,7 +137,6 @@ ln -s ./rsh $RPM_BUILD_ROOT%{_libdir}/apt/ssh
 install %{SOURCE1}     $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf
 install %{SOURCE3}     $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list
 install %{SOURCE4}     $RPM_BUILD_ROOT%{_sysconfdir}/apt/rpmpriorities
-# bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
 sed -e s/@ARCH@/%{_target_cpu}/ %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list
 
@@ -162,7 +163,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/apt/*
 %{_mandir}/man[58]/*
 %lang(pl) %{_mandir}/pl/man8/*
-#%lang(pt) %{_mandir}/pt_BR/man[58]/*
 /var/cache/apt
 /var/lib/apt
 %attr(755,root,root) %{_libdir}/libapt*.so.*.*.*