From a9b51d3cd5173c7c26796c3cac93aaaba7a60a34 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Wed, 26 Oct 2005 13:02:41 +0000
Subject: 4.7.18-1mdk

---
 ChangeLog  | 35 +++++++++++++++++++++++++++++++++++
 urpm.pm    |  2 +-
 urpmi.spec |  6 +++++-
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e3b1fd8e..e49db4f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2005-10-26 14:44  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* gurpmi.pm: Expand .urpmi arguments to gurpmi
+
+2005-10-26 14:36  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* urpmi: Don't expand .urpmi files on command-line in restricted
+	  mode
+
+2005-10-25 11:56  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* urpm.pm, urpmi.addmedia: urpmi.addmedia --raw should add medium
+	  as ignored, since the new medium is just a config entry and
+	  wasn't initialised
+
+2005-10-25 11:44  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* man/C/urpmi.cfg.5: Document static option in urpmi.cfg
+
+2005-10-24 16:09  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* man/C/urpmf.8: A few clarifications
+
+2005-10-24 02:46  Willy Sudiarto Raharjo <willysr at gmail.com>
+
+	* po/id.po: Updated Contact Info
+
+2005-10-23 14:27  Sharuzzaman Ahmat Raslan <sharuzzaman at myrealbox.com>
+
+	* po/ms.po: Updated Malay translation
+
+2005-10-20 18:33  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* urpm.pm, urpmi.spec: 4.7.17-1mdk
+
 2005-10-20 18:22  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
 
 	* urpmf: Sort better in -h output
diff --git a/urpm.pm b/urpm.pm
index 371cf006..da2e2735 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -12,7 +12,7 @@ use urpm::util;
 use urpm::sys;
 use urpm::cfg;
 
-our $VERSION = '4.7.17';
+our $VERSION = '4.7.18';
 our @ISA = qw(URPM);
 
 use URPM;
diff --git a/urpmi.spec b/urpmi.spec
index 511cf1c7..14282066 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -7,7 +7,7 @@
 ##################################################################
 
 %define name	urpmi
-%define version	4.7.17
+%define version	4.7.18
 %define release	1mdk
 
 %define group %(perl -e 'print "%_vendor" =~ /\\bmandr/i ? "System/Configuration/Packaging" : "System Environment/Base"')
@@ -252,6 +252,10 @@ if (-e "/etc/urpmi/urpmi.cfg") {
 %{compat_perl_vendorlib}/urpm/ldap.pm
 
 %changelog
+* Wed Oct 26 2005 Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> 4.7.18-1mdk
+- gurpmi now expands .urpmi files given on command-line, just like urpmi
+- urpmi.addmedia --raw marks the newly added media as ignored
+
 * Thu Oct 20 2005 Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> 4.7.17-1mdk
 - Complete urpmf overhaul
 - Fix verbosity of downloader routines
-- 
cgit v1.2.1