2.4-5mdk

2 files changed, 76 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f1a70a13..942d0e31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,68 @@
+2005-01-12 18:22  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* rpmdrake: Fix crash with bad --media command-line option.
+	  perl_checker fixes.
+
+2005-01-12 18:09  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* rpmdrake: Add a menu bar. Move the 'quit', 'update media' and
+	  'help' buttons to it, as well as the right-click popup menu.
+
+2005-01-12 17:25  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* edit-urpm-sources.pl, rpmdrake.pm: Factorize open-help code
+
+2005-01-12 15:19  Funda Wang <fundawang@linux.net.cn>
+
+	* po/zh_CN.po: Updated Simplified Chinese translation
+
+2005-01-12 15:05  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/: af.po, am.po, ar.po, az.po, be.po, bg.po, bn.po, br.po,
+	  bs.po, ca.po, cs.po, cy.po, da.po, de.po, el.po, eo.po, es.po,
+	  et.po, eu.po, fa.po, fi.po, fr.po, fur.po, ga.po, gl.po, he.po,
+	  hi.po, hr.po, hu.po, id.po, is.po, it.po, ja.po, ko.po, ky.po,
+	  lt.po, ltg.po, lv.po, mk.po, ms.po, mt.po, nb.po, nl.po, nn.po,
+	  pl.po, pt.po, pt_BR.po, ro.po, rpmdrake.pot, ru.po, sk.po, sl.po,
+	  sq.po, sr.po, sr@Latn.po, sv.po, ta.po, tg.po, th.po, tl.po,
+	  tr.po, uk.po, uz.po, uz@Latn.po, vi.po, wa.po, zh_CN.po,
+	  zh_TW.po: updated pot file
+
+2005-01-12 14:28  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* rpmdrake: show banner when embedded since new mcc allow to do so
+
+2005-01-12 14:26  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* rpmdrake: fix crash with new mygtk2
+
+2005-01-11 18:44  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* edit-urpm-sources.pl: Work in progress in the software media
+	  manager -- requalify the "Add..." button to add the sources for
+	  the current distribution, and rename the old "Add..." button to
+	  "Add custom..."
+
+2005-01-11 18:42  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* rpmdrake.pm: Add a function make_url_mirror_dist to get the url
+	  for a mirror for a distribution (as opposed to a mirror for
+	  updates)
+
+2005-01-11 11:27  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* rpmdrake.pm: Trim the \n at the end of $mandrake_release.  Don't
+	  use /root to cache the downloaded mirror list.  Make the message
+	  in the "choose mirror" dialog configurable.
+
+2005-01-10 16:12  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* grpmi/po/gl.po: updated po file
+
+2005-01-07 14:19  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* ChangeLog, rpmdrake.spec: 2.4-3mdk
+
 2005-01-07 12:13  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
 
 	* rpmdrake: Add a --no-media-update option to rpmdrake to avoid
diff --git a/rpmdrake.spec b/rpmdrake.spec
index 68300bfc..a2fc7c92 100644
--- a/rpmdrake.spec
+++ b/rpmdrake.spec
@@ -8,7 +8,7 @@
 
 %define name rpmdrake
 %define version 2.4
-%define release 4mdk
+%define release 5mdk
 
 Name: %{name}
 Version: %{version}
@@ -30,7 +30,7 @@ Group: System/Configuration/Packaging
 URL: http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/soft/rpmdrake/
 Obsoletes: MandrakeUpdate
 Provides: MandrakeUpdate
-Conflicts: drakconf < 10-0.8mdk
+Conflicts: drakconf < 10.1-4mdk
 
 %description
 rpmdrake is a simple graphical frontend to manage software packages on a
@@ -109,6 +109,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/park-rpmdrake
 
 %changelog
+* Wed Jan 12 2005 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 2.4-5mdk
+- rpmdrake now has a menu bar (supported in mcc thanks to Titi)
+- Fix crash with new mygtk2 (Titi)
+- Move the 'Quit', 'Update media' and 'Help' buttons to it, as well as the
+  right-click popup menu.
+- Software media manager: requalify the "Add..." button to add the sources for
+  the current distribution, and rename the old "Add..." button to "Add
+  custom...". (The implementation is not complete yet)
+
 * Fri Jan 07 2005 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 2.4-4mdk
 - New command-line option --no-media-update to Mandrakeupdate, to avoid
   updating media at startup