4.6.16-1mdk

3 files changed, 130 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f69b4b8..a00d6b7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,123 @@
+2005-02-14 12:14  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* man/C/urpmi.addmedia.8: Document the new URL variables.
+
+2005-02-14 11:56  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm, urpm/cfg.pm: Patch by Michael Scherer (a bit reworked)
+	  to allow to use $ARCH, $RELEASE and $HOST in media URLs.
+
+2005-02-14 09:19  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* po/it.po: Spelling fix (Angelo Naselli)
+
+2005-02-13 20:02  shivahuang
+
+	* po/zh_TW.po: updated po file
+
+2005-02-13 19:12  Dovix <dovix2003@yahoo.com>
+
+	* po/he.po: [no log message]
+
+2005-02-13 17:15  Reinout van Schouwen <reinout@cs.vu.nl>
+
+	* po/nl.po: Updated Dutch (nl) translation by Rob Teng
+	  <mandrake.tips@free.fr> * mdkonline, rpmdrake, urpmi
+
+2005-02-13 10:22  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/bn.po: updated po file
+
+2005-02-13 09:38  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/ja.po: updated po file
+
+2005-02-12 16:47  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/wa.po: updated po file
+
+2005-02-11 16:20  Youcef Rabah Rahal <rahal@arabeyes.org>
+
+	* po/ar.po: Arabic translation + a few fixes
+
+2005-02-11 15:02  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/: he.po, vi.po: updated po file
+
+2005-02-11 11:34  Dovix <dovix2003@yahoo.com>
+
+	* po/he.po: [no log message]
+
+2005-02-11 10:55  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm: Fix retrieval of source packages (e.g. urpmq --sources)
+	  with alternative dependencies foo|bar (Pascal Terjan)
+
+2005-02-11 10:48  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpme: Fix --root option in urpme
+
+2005-02-10 18:37  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm: Patch by Michael Scherer (bug 13525) to refactorize
+	  option names; makes downloader option settable per media.
+
+2005-02-10 17:57  José JORGE <jjorge@free.fr>
+
+	* po/pt.po: melo
+
+2005-02-10 16:23  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/: is.po, zh_TW.po: updated po file
+
+2005-02-09 21:11  shivahuang
+
+	* po/zh_TW.po: updated po file
+
+2005-02-08 23:06  Per Øyvind Karlsen <peroyvind@linux-mandrake.com>
+
+	* po/nb.po: finished translations from eskild:)
+
+2005-02-08 20:39  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/mk.po: updated po file
+
+2005-02-07 20:03  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/fa.po: updated po file
+
+2005-02-07 16:07  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/: ca.po, cs.po, mk.po, zh_TW.po: updated po file
+
+2005-02-06 22:55  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/sl.po: updated po file
+
+2005-02-06 20:20  shivahuang
+
+	* po/zh_TW.po: updated po file
+
+2005-02-06 13:46  Albert Astals Cid <astals11@terra.es>
+
+	* po/ca.po: small updates
+
+2005-02-06 12:44  mbukovjan
+
+	* po/cs.po: Updated Czech translations.
+
+2005-02-05 05:01  shivahuang
+
+	* po/zh_TW.po: fix error in po file
+
+2005-02-04 16:36  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/vi.po: updated po file
+
+2005-02-04 09:45  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm, urpmi.spec: 4.6.15-1mdk
+
 2005-02-03 22:37  Pablo Saratxaga <pablo@mandrakesoft.com>
 
 	* po/sv.po: updated po file
diff --git a/urpm.pm b/urpm.pm
index 9a31d87d..7024a273 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -11,7 +11,7 @@ use urpm::util;
 use urpm::sys;
 use urpm::cfg;
 
-our $VERSION = '4.6.15';
+our $VERSION = '4.6.16';
 our @ISA = qw(URPM);
 
 use URPM;
diff --git a/urpmi.spec b/urpmi.spec
index 923d96fe..4b117126 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -7,7 +7,7 @@
 ##################################################################
 
 %define name	urpmi
-%define version	4.6.15
+%define version	4.6.16
 %define release 1mdk
 
 %define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"')
@@ -30,7 +30,7 @@ Source0:	%{name}.tar.bz2
 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:		perl-Locale-gettext >= 1.01-7 rpmtools >= 4.5 perl-URPM >= 1.08
 PreReq:		packdrake >= 5.0.2
 BuildRequires:	%{buildreq_locale} bzip2-devel rpm-devel >= 4.0.3
 BuildRequires:	gettext
@@ -233,6 +233,13 @@ if (-e "/etc/urpmi/urpmi.cfg") {
 %{compat_perl_vendorlib}/urpm/parallel_ssh.pm
 
 %changelog
+* Mon Feb 14 2005 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.16-1mdk
+- Patch by Michael Scherer to allow to use variables in media URLs
+- Fix retrieval of source packages (e.g. urpmq --sources) with alternative
+  dependencies foo|bar (Pascal Terjan)
+- Fix --root option in urpme
+- Require latest perl-URPM
+
 * Fri Feb 04 2005 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.15-1mdk
 - Add ChangeLog in docs
 - Message updates