4.5-12mdk

2 files changed, 41 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index b31b01be..719c9df0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2004-07-02 10:00  fisher
+
+	* po/uk.po: Ukrainian translation update.
+
+2004-07-01 11:48  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm/cfg.pm: Suppress noises in urpmi.cfg
+
+2004-07-01 06:47  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* man/fr/: urpmf.8, urpmi.addmedia.8, urpmi.removemedia.8,
+	  urpmi.update.8: Remove references to non-existent man pages
+
+2004-07-01 06:37  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi.spec: Move gettext from Requires to BuildRequires
+
+2004-07-01 02:34  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* urpmi.spec: fix conflict with man-pages-fr
+
+2004-06-30 15:05  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm, urpmi.removemedia: Don't perform a fuzzy match on media
+	  names when removing media
+
+2004-06-30 14:49  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm/cfg.pm: Protection against the people who edit urpmi.cfg by
+	  hand and put the same medium twice. And restore error messages.
+
+2004-06-30 12:45  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi.spec: 4.5-11mdk
+
 2004-06-30 08:54  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
 
 	* t/cfg.t, urpm/download.pm: Functions to write proxy.cfg (and
diff --git a/urpmi.spec b/urpmi.spec
index 9dd28130..e00c4b94 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -8,7 +8,7 @@
 
 %define name	urpmi
 %define version	4.5
-%define release 11mdk
+%define release 12mdk
 
 %define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"')
 
@@ -259,6 +259,11 @@ $urpm->update_media(nolock => 1, nopubkey => 1);
 %{compat_perl_vendorlib}/urpm/parallel_ssh.pm
 
 %changelog
+* Mon Jul 05 2004 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.5-12mdk
+- Disallow two medias with the same name
+- urpmi.removemedia no longer performs a fuzzy match on media names
+- gettext is no longer required
+
 * Wed Jun 30 2004 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.5-11mdk
 - Methods to change and write proxy.cfg
 - Language updates