From cf13ee5939261958e943691952a7db46cdd7b0d3 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 05:37:40 +0000
Subject: auto-import changelog data from gnome-panel-2.7.90-1.src.rpm

Tue Aug 10 2004 Mark McLoughlin <markmc@redhat.com> - 2.7.90-1
- Update to 2.7.90 and remove a bunch of patches

---

diff --git a/.cvsignore b/.cvsignore
index 9816c75..804147d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.6.0.tar.bz2
+gnome-panel-2.7.90.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 1399f44..f4af783 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -15,14 +15,13 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.6.0
-Release: 11
+Version: 2.7.90
+Release: 1
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source2: redhat-panel-default-setup.entries
 Source3: redhat-panel-default-setup-battstat.entries
 Source4: redhat-panel-backwards-compat-config.schemas
-#Source5: gnome-panel-2.0.6-extrapo.tar.gz
 License: GPL 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
@@ -57,21 +56,12 @@ BuildRequires: gnome-keyring-devel
 BuildRequires: evolution-data-server-devel
 
 Patch1: gnome-panel-2.6.0-use-correct-applications-uri.patch
-## http://bugzilla.gnome.org/show_bug.cgi?id=85723
 Patch2: gnome-panel-2.3.6.2-pager-rows.patch
 Patch3: gnome-panel-2.3.6.2-clock-date.patch
 Patch4: gnome-panel-2.3.6.2-default-menu-flags.patch
 Patch5: gnome-panel-2.0.3-remove-screenshot-menuitem.patch
-Patch6: gnome-panel-2.0.9-menu_fixup.patch
+Patch6: gnome-panel-2.7.90-menu-fixup.patch
 Patch8: gnome-panel-2.1.90.1-no-fortune.patch
-# All egg-recent-model stuff has broken locking assumptions when used
-# on NFS.  See Gnome.org Bug #
-Patch9: gnome-panel-2.5.3.1-lockf.patch
-
-## Will be in 2.6.1
-Patch10: gnome-panel-2.6.0-apply-schemas-to-default-setup.patch
-Patch11: gnome-panel-2.6.0-load-default-setup.patch
-Patch12: gnome-panel-2.6.0-invalid-clock-format.patch
 
 %description
 
@@ -93,20 +83,13 @@ Panel Applets using the libpanel-applet library.
 %prep
 %setup -q
 
-#(cd po && tar xzvf %{SOURCE5} )
-
 %patch1 -p1 -b .use-correct-applications-uri
 %patch2 -p1 -b .pager-rows
 %patch3 -p1 -b .clock-seconds
 %patch4 -p1 -b .default-menu-flags
 %patch5 -p1 -b .remove-screenshot-menuitem
-%patch6 -p1 -b .menu_fixup
+%patch6 -p1 -b .menu-fixup
 %patch8 -p1 -b .no-fortune
-%patch9 -p1 -b .lockf
-
-%patch10 -p1 -b .apply-schemas-to-default-setup
-%patch11 -p1 -b .load-default-setup
-%patch12 -p1 -b .invalid-clock-format
 
 cp -f %{SOURCE2} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE4} gnome-panel/panel-compatibility.schemas
@@ -114,14 +97,6 @@ cp -f %{SOURCE4} gnome-panel/panel-compatibility.schemas
 ## use the main menu icon in the menu bar
 perl -pi -e 's/PANEL_STOCK_GNOME_LOGO/PANEL_STOCK_MAIN_MENU/g' gnome-panel/menu.c gnome-panel/panel-menu-bar.c
 
-echo 'AC_DEFUN([GNOME_COMPILE_WARNINGS], [])' >> acinclude.m4
-
-aclocal
-libtoolize --force
-automake --add-missing
-autoconf
-autoheader
-
 %build
 %configure --disable-gtk-doc --enable-eds
 make
@@ -141,7 +116,6 @@ install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-defau
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-2.*a
 
 %find_lang %{gettext_package}
-grep -q '/usr/share/locale' %{gettext_package}.lang || exit 1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -212,6 +186,9 @@ fi
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Aug 10 2004 Mark McLoughlin <markmc@redhat.com> - 2.7.90-1
+- Update to 2.7.90 and remove a bunch of patches
+
 * Mon Aug  2 2004 David Malcolm <dmalcolm@redhat.com> - 2.6.0-11
 - added dependency on evolution-data-server and rebuilt
 
diff --git a/sources b/sources
index c4e7be1..326f632 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9e0ad03c9266d342b99837ca4e947b55  gnome-panel-2.6.0.tar.bz2
+17cf99e0d6b8980bd5be912f449378dd  gnome-panel-2.7.90.tar.bz2