auto-import gnome-panel-2.5.3.1-2 from gnome-panel-2.5.3.1-2.src.rpmgnome-panel-2_5_3_1-2FC-2-split

3 files changed, 15 insertions, 26 deletions

diff --git a/.cvsignore b/.cvsignore
index a385679..d43e28c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.4.2.tar.bz2
+gnome-panel-2.5.3.1.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 44cd59d..2846166 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,4 +1,3 @@
-
 %define gettext_package gnome-panel-2.0
 
 %define glib2_version 2.2.0
@@ -16,10 +15,10 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.4.2
-Release: 3
+Version: 2.5.3.1
+Release: 2
 URL: http://www.gnome.org
-Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.4/%{name}-%{version}.tar.bz2
+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
@@ -31,6 +30,9 @@ BuildRoot: %{_tmppath}/%{name}-root
 Requires: gnome-desktop >= %{gnome_desktop_version}
 Requires: libwnck >= %{libwnck_version}
 Requires: redhat-menus >= %{redhat_menus_version}
+Requires: gnome-keyring
+Requires: evolution-data-server
+
 Prereq: /bin/awk, /bin/cat, /bin/ln, /bin/rm
 Prereq: GConf2 >= 2.3.3
 
@@ -47,9 +49,9 @@ BuildRequires: libxslt-devel >= %{libxslt_version}
 BuildRequires: fontconfig-devel
 BuildRequires: startup-notification-devel >= %{startup_notification_version}
 BuildRequires: libtool automake autoconf
+BuildRequires: gnome-keyring-devel
+BuildRequires: evolution-data-server-devel
 
-## http://bugzilla.gnome.org/show_bug.cgi?id=128567
-Patch1: gnome-panel-2.4.2-missing-objects-on-drawers.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
@@ -57,10 +59,6 @@ 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
 Patch8: gnome-panel-2.1.90.1-no-fortune.patch
-## Upstream from 2.5.91
-Patch9: gnome-panel-2.4.0-bevels.patch
-## Upstream from 2.5.91
-Patch10: gnome-panel-2.4.2-clock-resizing.patch
 
 %description
 
@@ -74,15 +72,12 @@ cp -f %{SOURCE2} gnome-panel/panel-default-setup.entries
 
 #(cd po && tar xzvf %{SOURCE5} )
 
-%patch1 -p1 -b .missing-objects-on-drawers
 %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
 %patch8 -p1 -b .no-fortune
-%patch9 -p1 -b .bevels
-%patch10 -p1 -b .clock-resizing
 
 ## replace foot menu with redhat-main-menu
 perl -pi -e 's/gnome-main-menu/redhat-main-menu/g' gnome-panel/panel-stock-icons.c
@@ -97,6 +92,7 @@ autoconf
 autoheader
 
 %build
+perl -pi -e 's/require XML::Parser//g' configure
 %configure --disable-gtk-doc
 make
 
@@ -184,17 +180,8 @@ fi
 %{_libdir}/*.so
 
 %changelog
-* Mon Mar 01 2004 Mark McLoughlin <markmc@redhat.com> 2.4.2-3
-- Resize the clock properly when the text changes (#109806)
-
-* Fri Feb 27 2004 Nils Philippsen <nphilipp@redhat.com> 2.4.2-2
-- don't unnecessarily add bevels when auto-hiding (#102629, #102632, fix by
-  Bart Martens <bart.martens@chello.be>)
-
-* Mon Feb 23 2004 Mark McLoughlin <markmc@redhat.com> 2.4.2-1
-- Update to 2.4.2
-- Remove defaultsize patch - in upstream sources now.
-- Add patch to fix disappearing applets issue (#110380)
+* Tue Jan 27 2004 Alexander Larsson <alexl@redhat.com> 2.5.3.1-2
+- Add evolution-data-server dependency and rebuild
 
 * Thu Oct  9 2003 Owen Taylor <otaylor@redhat.com> 2.4.0-2
 - Look up the largest size available when picking default images for 
@@ -505,3 +492,5 @@ fi
 
 * Tue Apr 16 2002 Havoc Pennington <hp@redhat.com>
 - Initial build.
+
+
diff --git a/sources b/sources
index d7885ae..bcfeaa4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d62da1f6cb129f65206a945d93a2fa85  gnome-panel-2.4.2.tar.bz2
+92fed7683f424772e904d70a70e0a979  gnome-panel-2.5.3.1.tar.bz2