4.6.8-1mdk

3 files changed, 31 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d02a1297..0bab7a09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2004-12-13 16:48  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* po/br.po: update
+
+2004-12-13 16:48  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* urpmi.update: let perl_checker be able to update translation
+	  catalogs
+
+2004-12-13 13:51  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm: Adding a media should not fail when there is no pubkey
+	  file available (bug #12646)
+
+2004-12-12 19:07  Arpad Biro <biro_arpad@yahoo.com>
+
+	* po/hu.po: [no log message]
+
+2004-12-10 14:39  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm, urpmi.spec: 4.6.7-1mdk
+
 2004-12-10 12:24  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
 
 	* urpm.pm: Factorize the code that guesses the pubkey file name.
diff --git a/urpm.pm b/urpm.pm
index ec314764..37f80641 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -11,7 +11,7 @@ use urpm::util;
 use urpm::sys;
 use urpm::cfg;
 
-our $VERSION = '4.6.7';
+our $VERSION = '4.6.8';
 our @ISA = qw(URPM);
 
 use URPM;
diff --git a/urpmi.spec b/urpmi.spec
index b1330534..35eab909 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -7,7 +7,7 @@
 ##################################################################
 
 %define name	urpmi
-%define version	4.6.7
+%define version	4.6.8
 %define release 1mdk
 
 %define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"')
@@ -31,6 +31,7 @@ Summary:	Command-line software installation tools
 URL:		http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/soft/urpmi
 Requires:	%{req_webfetch} eject gnupg
 PreReq:		perl-Locale-gettext >= 1.01-7 rpmtools >= 4.5 perl-URPM >= 1.04
+PreReq:		packdrake >= 5.0.2
 BuildRequires:	%{buildreq_locale} bzip2-devel rpm-devel >= 4.0.3
 BuildRequires:	gettext
 BuildRoot:	%{_tmppath}/%{name}-buildroot
@@ -227,6 +228,12 @@ $urpm->update_media(nolock => 1, nopubkey => 1);
 %{compat_perl_vendorlib}/urpm/parallel_ssh.pm
 
 %changelog
+* Mon Dec 13 2004 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.8-1mdk
+- Adding a media should not fail when there is no pubkey file available
+  (bug #12646)
+- Require packdrake
+- Can't drop rpmtools yet, urpmq uses rpm2header
+
 * Fri Dec 10 2004 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.7-1mdk
 - Fix a problem in finding pubkeys for SRPM media.
 - Fix a problem in detecting download ends with curl [Bug 12634]