4.5-14mdk

2 files changed, 55 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 011f801c..e7e361ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,51 @@
+2004-07-12 07:50  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* man/C/: autoirpm.8, urpme.8, urpmf.8, urpmi.8, urpmi.addmedia.8,
+	  urpmi.cfg.5, urpmi.removemedia.8, urpmi.update.8, urpmq.8: Man
+	  pages update
+
+2004-07-12 06:21  Fabian Mandelbaum <fabman@mandrakesoft.com>
+
+	* po/es.po: Updated Spanish translations
+
+2004-07-09 11:28  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi: More grammarworthy information messages (or, don't say "1
+	  packages")
+
+2004-07-09 11:21  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi.removemedia: Add an option -y (fuzzy match on media names)
+	  in urpmi.removemedia
+
+2004-07-09 11:10  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm: Simplify the format of the skip.list and inst.list files
+	  (so it now matches what's documented :)
+
+2004-07-09 10:26  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm: Filehandle leak
+
+2004-07-09 05:02  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* man/C/: urpme.8, urpmf.8, urpmi.8, urpmi.addmedia.8,
+	  urpmi.removemedia.8, urpmi.update.8, urpmq.8: A typo, reproduced
+	  everywhere.
+
+2004-07-09 05:01  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* inst.list, skip.list: Update default list files
+
+2004-07-09 04:39  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm, urpmi, urpm/args.pm: Document the "skip" option. Remove
+	  obsolete code.
+
+2004-07-09 02:19  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi.spec: 4.5-13.mdk
+
 2004-07-08 16:53  Keld Jørn Simonsen <keld@dkuug.dk>
 
 	* po/da.po: updates soft/drakcronat/po/da.po soft/drakfax/po/da.po
diff --git a/urpmi.spec b/urpmi.spec
index ece43922..1e50490f 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -8,7 +8,7 @@
 
 %define name	urpmi
 %define version	4.5
-%define release 13mdk
+%define release 14mdk
 
 %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:	User mode rpm install
 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 >= 0.95
+PreReq:		perl-Locale-gettext >= 1.01-7 rpmtools >= 4.5 perl-URPM >= 0.96
 BuildRequires:	%{buildreq_locale} bzip2-devel rpm-devel >= 4.0.3 
 BuildRequires:	gettext
 BuildRoot:	%{_tmppath}/%{name}-buildroot
@@ -94,17 +94,7 @@ done
 #install -m 644 autoirpm.deny $RPM_BUILD_ROOT/etc/urpmi
 cat <<EOF >%{buildroot}/etc/urpmi/inst.list
 # Here you can specify packages that need to be installed instead
-# of being upgraded (typically kernel packages).
-kernel
-kernel-smp
-kernel-secure
-kernel-enterprise
-kernel-linus2.2
-kernel-linus2.4
-kernel22
-kernel22-secure
-kernel22-smp
-hackkernel
+# of being upgraded.
 EOF
 
 mkdir -p %{buildroot}%{compat_perl_vendorlib}
@@ -259,6 +249,10 @@ $urpm->update_media(nolock => 1, nopubkey => 1);
 %{compat_perl_vendorlib}/urpm/parallel_ssh.pm
 
 %changelog
+* Mon Jul 12 2004 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.5-14mdk
+- Simplified and documented skip.list and inst.list
+- Add an option -y (fuzzy) to urpmi.removemedia
+
 * Fri Jul 09 2004 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.5-13mdk
 - Support for README.*.urpmi
 - add a --version command-line argument to everything