auto-import gnome-panel-2.1.3-1 from gnome-panel-2.1.3-1.src.rpmgnome-panel-2_1_3-1

3 files changed, 51 insertions, 54 deletions

diff --git a/.cvsignore b/.cvsignore
index ee6652b..8d2bce0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1 @@
-gnome-panel-2.0.6-extrapo.tar.gz
-gnome-panel-2.0.6.tar.bz2
-system-tray-applet-0.15.tar.gz
+gnome-panel-2.1.3.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 67e1055..d6bba9c 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,27 +1,27 @@
 %define gettext_package gnome-panel-2.0
 
 %define glib2_version 2.0.0
-%define gtk2_version 2.0.3-3
-%define libgnomeui_version 2.0.1
-%define gnome_desktop_version 2.0.3
-%define libwnck_version 0.14
-%define libbonobo_version 2.0.0
-%define libbonoboui_version 2.0.0
-%define gnome_vfs2_version 2.0.0
+%define gtk2_version 2.1.2
+%define libglade2_version 2.0.0-3
+%define libgnomeui_version 2.1.1
+%define gnome_desktop_version 2.1.2
+%define libwnck_version 2.1.5
+%define libbonobo_version 2.1.0
+%define libbonoboui_version 2.1.1
+%define gnome_vfs2_version 2.0.4
 %define bonobo_activation_version 1.0.0
-
-%define system_tray_applet_version 0.15
+%define libxslt_version 1.0.21-2
+%define startup_notification_version 0.4
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.0.6
-Release: 9.2
+Version: 2.1.3
+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-per-panel-config.schemas
 Source3: redhat-panel-per-panel-config-laptop.schemas
-Source4: system-tray-applet-%{system_tray_applet_version}.tar.gz
-Source5: gnome-panel-2.0.6-extrapo.tar.gz
+#Source5: gnome-panel-2.0.6-extrapo.tar.gz
 License: GPL 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
@@ -31,6 +31,7 @@ Prereq: /bin/awk, /bin/cat, /bin/ln, /bin/rm
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: libglade2-devel >= %{libglade2_version}
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
 BuildRequires: libwnck-devel >= %{libwnck_version}
@@ -38,22 +39,22 @@ BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
 BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
 BuildRequires: bonobo-activation-devel >= %{bonobo_activation_version}
+BuildRequires: libxslt-devel >= %{libxslt_version}
 BuildRequires: Xft
 BuildRequires: fontconfig
+BuildRequires: startup-notification-devel >= %{startup_notification_version}
 
 Patch0: gnome-panel-2.0.2.90-enhanced-errors.patch
 ## http://bugzilla.gnome.org/show_bug.cgi?id=85723
-Patch1: gnome-panel-2.0.0-clock-addons2.patch
+Patch1: gnome-panel-2.1.2-clock-addons.patch
 Patch2: gnome-panel-2.0.2.90-pager-rows.patch
 Patch3: gnome-panel-2.0.2.90-clock-seconds.patch
 Patch4: gnome-panel-2.0.3-default-menu-flags.patch
 Patch5: gnome-panel-2.0.3-remove-screenshot-menuitem.patch
-Patch6: gnome-panel-2.0.6-menu_fixup.patch
+Patch6: gnome-panel-2.0.9-menu_fixup.patch
 Patch7: gnome-panel-2.0.6-memleaks-and-clock-format.patch
-Patch8: gnome-panel-2.0.6-edit-launchers.patch
-Patch9: gnome-panel-2.0.6-onlyingnome.patch
 # Only one screenshot at a time, #71432, bugzilla.gnome.org #91924
-Patch10: gnome-panel-2.0.6-singlesshot.patch
+#Patch10: gnome-panel-2.0.6-singlesshot.patch
 
 %description
 
@@ -61,43 +62,32 @@ The GNOME panel provides the window list, workspace switcher, menus, and other
 features for the GNOME desktop.
 
 %prep
-%setup -q -a 4
+%setup -q
 
 cp -f %{SOURCE2} gnome-panel/panel-per-panel-config.schemas
 # paranoia in case it decides to rebuild
 cp -f %{SOURCE2} gnome-panel/panel-per-panel-config.schemas.in
 
-(cd po && tar xzvf %{SOURCE5} )
+#(cd po && tar xzvf %{SOURCE5} )
 
 %patch0 -p1 -b .enhanced-errors
-%patch1 -p0 -b .clock-addons
+%patch1 -p1 -b .clock-addons
 %patch2 -p1 -b .pager-rows
-%patch3 -p1 -b .clock-seconds
+# FIXME need to port the "no date" part of this
+#%patch3 -p1 -b .clock-seconds
 %patch4 -p1 -b .default-menu-flags
 %patch5 -p1 -b .remove-screenshot-menuitem
 %patch6 -p1 -b .menu_fixup
-%patch7 -p1 -b .memleaks-and-clock-format
-%patch8 -p1 -b .edit-launchers
-%patch9 -p1 -b .onlyingnome
-%patch10 -p1 -b .singlesshot
+#%patch10 -p1 -b .singlesshot
 
 ## replace foot menu with redhat-applications.png
 perl -pi -e 's/gnome-logo-icon-transparent/redhat-main-menu/g' gnome-panel/menu.c gnome-panel/foobar-widget.c gnome-panel/menu-util.c
 
-## get rid of GTK_WIN_POS_MOUSE (filed a bug upstream also, but don't remember number)
-POS_MOUSE_FILES=`find -name "*.[hc]" | xargs grep -l GTK_WIN_POS_MOUSE`
-echo "Removing GTK_WIN_POS_MOUSE from $POS_MOUSE_FILES"
-perl -pi -e 's/GTK_WIN_POS_MOUSE/GTK_WIN_POS_NONE/g' $POS_MOUSE_FILES
-
 %build
 
 %configure
 make
 
-(cd system-tray-applet-%{system_tray_applet_version}; \
-%configure; \
-make)
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -109,9 +99,6 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 mv $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-per-panel-config.schemas $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-per-panel-config-nolaptop.schemas
 install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-per-panel-config-laptop.schemas
 
-(cd system-tray-applet-%{system_tray_applet_version} ; \
-%makeinstall)
-
 ## blow away stuff we don't want
 /bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 rmdir --ignore-fail-on-non-empty $RPM_BUILD_ROOT/var
@@ -119,6 +106,7 @@ rmdir --ignore-fail-on-non-empty $RPM_BUILD_ROOT/var
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-2.la
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/libgen_util_applet-2.a
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/libgen_util_applet-2.la
+/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-panel/*.*a
 
 %find_lang %{gettext_package}
 grep -q '/usr/share/locale' %{gettext_package}.lang || exit 1
@@ -150,10 +138,11 @@ for S in $SCHEMAS; do
 done
 /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun
 if [ "$1" = "0" ]; then
   rm -f ${_sysconfdir}/gconf/schemas/panel-per-panel-config.schemas
 fi
+/sbin/ldconfig
   
 %files -f %{gettext_package}.lang
 %defattr(-,root,root)
@@ -179,22 +168,34 @@ fi
 %{_libdir}/*.so.*
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_sysconfdir}/sound
+%{_libdir}/gnome-panel/*.so
 
 # theoretically a devel package, but just doesn't seem worth it
 %{_libdir}/pkgconfig/*
 %{_includedir}/panel-2.0
 %{_libdir}/*.so
 
-# system tray applet stuff
-%{_libdir}/system-tray-applet
-
 %changelog
-* Sat Dec 21 2002 Havoc Pennington <hp@redhat.com>
-- rebuild with -e flag
-
-* Sat Nov 23 2002 Havoc Pennington <hp@redhat.com>
-- upgrade to system-tray-applet 0.15 so the panel won't crash on login
-  for vertical panels with a tray applet
+* Mon Dec  2 2002 Havoc Pennington <hp@redhat.com>
+- 2.1.3
+- build req startup-notification-devel
+
+* Wed Nov 13 2002 Havoc Pennington <hp@redhat.com>
+- 2.1.2
+- system tray is now in the main gnome-panel package
+
+* Wed Oct 23 2002 Havoc Pennington <hp@redhat.com>
+- 2.0.10
+- remove memleaks-and-clock-format patch, should be upstream
+- remove WIN_POS_MOUSE purge, done upstream
+
+* Mon Oct 14 2002 Florian La Roche <Florian.LaRoche@redhat.de>
+- fix postun script
+
+* Tue Oct  8 2002 Havoc Pennington <hp@redhat.com>
+- 2.0.9 with menu edit stuff
+- system-tray-applet 0.15 that doesn't crash all the time
+- merge/remove patches as appropriate
 
 * Wed Aug 28 2002 Owen Taylor <otaylor@redhat.com>
 - Fix problem with "hold down print screen" (71432)
diff --git a/sources b/sources
index 97118e4..23e9197 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-c6b4efc7ad8ce21e67358de669c2b7ad  gnome-panel-2.0.6-extrapo.tar.gz
-52f3dbf7094630a016e8e9092e5c7638  gnome-panel-2.0.6.tar.bz2
-04cfc38c6b8a4ea9726b006d1ec29170  system-tray-applet-0.15.tar.gz
+e3ffab133ab9e50bc36539650a4fefcc  gnome-panel-2.1.3.tar.bz2