From a9e61aafddcc8a3a7c9df9d3500749d71c366026 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 05:30:28 +0000 Subject: auto-import changelog data from gnome-panel-2.0.6-3.src.rpm Wed Aug 14 2002 Tim Powers - bump release Wed Aug 14 2002 Preston Brown - put battery applet on panel for laptops (#67296) Mon Aug 12 2002 Havoc Pennington - 2.0.6 final from gnome 2.0.1 - remove gnome-panel-screenshot patch now upstream Thu Aug 08 2002 Jonathan Blandford - new system-tray-applet version - Fix gnome-panel-screenshot Tue Aug 06 2002 Havoc Pennington - 2.0.4 - replace gnome-logo-icon-transparent.png with redhat-main-menu.png for the foot menu Fri Aug 02 2002 Havoc Pennington - fix desktop (logout/lock) menu item location in Alt+F1 and in new menu applets - remove Screenshot... menu item Fri Aug 02 2002 Havoc Pennington - move around default applets, remove some of them - system tray 0.9 - change default menu flags - blow unpackaged files out of build root Wed Jul 31 2002 Havoc Pennington - 2.0.3 - own libexecdir stuff Thu Jul 25 2002 Havoc Pennington - new system tray that's prettier and doesn't clip the icon Wed Jul 24 2002 Havoc Pennington - system tray 0.7 that doesn't crash on startup - get Mozilla desktop file right so we get web browser launcher Wed Jul 24 2002 Havoc Pennington - system tray 0.6 with server file fixed (work dammit) Tue Jul 23 2002 Havoc Pennington - tweak applet positions but I think it's just broken - system tray 0.5 moved back to libdir not libexecdir Tue Jul 23 2002 Havoc Pennington - remove ltmain.sh hack - new system-tray-applet that works Tue Jul 23 2002 Havoc Pennington - put office suite stuff on the panel Tue Jul 23 2002 Havoc Pennington - 2.0.2.90 cvs snap Wed Jul 10 2002 Havoc Pennington - update the clock patch to be a little smarter in a couple ways Thu Jun 27 2002 Owen Taylor - Fix problem where system tray applet was being looked for in /unst - Fix a crash in the system tray applet Wed Jun 26 2002 Owen Taylor - Fix typo in the pt_BR translation that was causing GConf problems Mon Jun 24 2002 Havoc Pennington - add the system tray applet - add system tray applet by default - add more launcher by default Fri Jun 21 2002 Tim Powers - automated rebuild Thu Jun 20 2002 Havoc Pennington - use correct gettext package name, and add check for missing translations Mon Jun 17 2002 Havoc Pennington - add the calendar and configuration patch Sun Jun 16 2002 Havoc Pennington - 2.0.0 - add control center desktop file to file list - add gnome-panelrc to file list - try fixing panel size (blind, no text box at home) --- diff --git a/.cvsignore b/.cvsignore index c650b3a..d899677 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -gnome-panel-1.5.24.tar.bz2 +gnome-panel-2.0.6.tar.bz2 +system-tray-applet-0.10.tar.gz diff --git a/gnome-panel.spec b/gnome-panel.spec index 863eb41..9d06c40 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -1,26 +1,32 @@ +%define gettext_package gnome-panel-2.0 + %define glib2_version 2.0.0 %define gtk2_version 2.0.3-3 -%define libgnomeui_version 1.117.2 -%define gnome_desktop_version 1.5.22 -%define libwnck_version 0.13 +%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 1.118.0 -%define gnome_vfs2_version 1.9.16 +%define libbonoboui_version 2.0.0 +%define gnome_vfs2_version 2.0.0 %define bonobo_activation_version 1.0.0 +%define system_tray_applet_version 0.10 + Summary: GNOME panel Name: gnome-panel -Version: 1.5.24 -Release: 9 +Version: 2.0.6 +Release: 3 URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2 -Source2: fixed-ltmain.sh -Source3: redhat-panel-per-panel-config.schemas +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 License: GPL Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-root Requires: gnome-desktop >= %{gnome_desktop_version} +Prereq: /bin/awk, /bin/cat, /bin/ln, /bin/rm BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk2-devel >= %{gtk2_version} @@ -34,7 +40,13 @@ BuildRequires: bonobo-activation-devel >= %{bonobo_activation_version} BuildRequires: Xft BuildRequires: fontconfig -Patch0: gnome-panel-1.5.24-enhanced-errors.patch +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 +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 %description @@ -42,21 +54,31 @@ The GNOME panel provides the window list, workspace switcher, menus, and other features for the GNOME desktop. %prep -%setup -q +%setup -q -a 4 -cp -f %{SOURCE3} gnome-panel/panel-per-panel-config.schemas +cp -f %{SOURCE2} gnome-panel/panel-per-panel-config.schemas # paranoia in case it decides to rebuild -cp -f %{SOURCE3} gnome-panel/panel-per-panel-config.schemas.in +cp -f %{SOURCE2} gnome-panel/panel-per-panel-config.schemas.in %patch0 -p1 -b .enhanced-errors +%patch1 -p0 -b .clock-addons +%patch2 -p1 -b .pager-rows +%patch3 -p1 -b .clock-seconds +%patch4 -p1 -b .default-menu-flags +%patch5 -p1 -b .remove-screenshot-menuitem -%build +# 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 -rm ltmain.sh && cp %{SOURCE2} ltmain.sh +%build %configure make +(cd system-tray-applet-%{system_tray_applet_version}; \ +%configure; \ +make) + %install rm -rf $RPM_BUILD_ROOT @@ -64,12 +86,42 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 %makeinstall unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL -%find_lang %{name} +# install alternate laptop panel schema +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 +/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-2.a +/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 + +%find_lang %{gettext_package} +grep -q '/usr/share/locale' %{gettext_package}.lang || exit 1 %clean rm -rf $RPM_BUILD_ROOT %post +apm=false +if [ -f /proc/apm ]; then + mins=`cat /proc/apm|awk '{ print $8 }'` + if [ "$mins" != "-1" ]; then + apm=true + fi +fi + +if [ "$apm" = "false" ]; then + ln -sf %{_sysconfdir}/gconf/schemas/panel-per-panel-config-nolaptop.schemas %{_sysconfdir}/gconf/schemas/panel-per-panel-config.schemas +else + ln -sf %{_sysconfdir}/gconf/schemas/panel-per-panel-config-laptop.schemas %{_sysconfdir}/gconf/schemas/panel-per-panel-config.schemas +fi + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` # this spits a warning right now, needs fixing in gconf gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --recursive-unset /schemas/apps/panel @@ -80,14 +132,19 @@ done /sbin/ldconfig %postun -p /sbin/ldconfig - -%files -f %{name}.lang +if [ "$1" = "0" ]; then + rm -f ${_sysconfdir}/gconf/schemas/panel-per-panel-config.schemas +fi + +%files -f %{gettext_package}.lang %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README %{_datadir}/pixmaps %{_datadir}/gnome +%{_datadir}/gnome-panelrc +%{_datadir}/control-center-2.0 # doesn't contain .desktop files anymore, apparently #%{_datadir}/applications %{_datadir}/idl @@ -98,6 +155,7 @@ done %{_datadir}/omf %{_datadir}/man/man*/* %{_bindir}/* +%{_libexecdir}/* %{_libdir}/bonobo %{_libdir}/*.so.* %{_sysconfdir}/gconf/schemas/*.schemas @@ -108,8 +166,98 @@ done %{_includedir}/panel-2.0 %{_libdir}/*.so +# system tray applet stuff +%{_libdir}/system-tray-applet %changelog +* Wed Aug 14 2002 Tim Powers +- bump release + +* Wed Aug 14 2002 Preston Brown +- put battery applet on panel for laptops (#67296) + +* Mon Aug 12 2002 Havoc Pennington +- 2.0.6 final from gnome 2.0.1 +- remove gnome-panel-screenshot patch now upstream + +* Thu Aug 8 2002 Jonathan Blandford +- new system-tray-applet version +- Fix gnome-panel-screenshot + +* Tue Aug 6 2002 Havoc Pennington +- 2.0.4 +- replace gnome-logo-icon-transparent.png with redhat-main-menu.png + for the foot menu + +* Fri Aug 2 2002 Havoc Pennington +- fix desktop (logout/lock) menu item location + in Alt+F1 and in new menu applets +- remove Screenshot... menu item + +* Fri Aug 2 2002 Havoc Pennington +- move around default applets, remove some of them +- system tray 0.9 +- change default menu flags +- blow unpackaged files out of build root + +* Wed Jul 31 2002 Havoc Pennington +- 2.0.3 +- own libexecdir stuff + +* Thu Jul 25 2002 Havoc Pennington +- new system tray that's prettier and doesn't clip the icon + +* Wed Jul 24 2002 Havoc Pennington +- system tray 0.7 that doesn't crash on startup +- get Mozilla desktop file right so we get web browser launcher + +* Wed Jul 24 2002 Havoc Pennington +- system tray 0.6 with server file fixed (work dammit) + +* Tue Jul 23 2002 Havoc Pennington +- tweak applet positions but I think it's just broken +- system tray 0.5 moved back to libdir not libexecdir + +* Tue Jul 23 2002 Havoc Pennington +- remove ltmain.sh hack +- new system-tray-applet that works + +* Tue Jul 23 2002 Havoc Pennington +- put office suite stuff on the panel + +* Tue Jul 23 2002 Havoc Pennington +- 2.0.2.90 cvs snap + +* Wed Jul 10 2002 Havoc Pennington +- update the clock patch to be a little smarter in a couple ways + +* Thu Jun 27 2002 Owen Taylor +- Fix problem where system tray applet was being looked for in /unst +- Fix a crash in the system tray applet + +* Wed Jun 26 2002 Owen Taylor +- Fix typo in the pt_BR translation that was causing GConf problems + +* Mon Jun 24 2002 Havoc Pennington +- add the system tray applet +- add system tray applet by default +- add more launcher by default + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu Jun 20 2002 Havoc Pennington +- use correct gettext package name, and add check for missing translations + +* Mon Jun 17 2002 Havoc Pennington +- add the calendar and configuration patch + +* Sun Jun 16 2002 Havoc Pennington +- 2.0.0 +- add control center desktop file to file list +- add gnome-panelrc to file list +- try fixing panel size (blind, no text box at home) + * Tue Jun 11 2002 Havoc Pennington - rebuild in different environment diff --git a/sources b/sources index 2842827..ec36cd8 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -32fb9c407b879f76f1a610a5208be8b6 gnome-panel-1.5.24.tar.bz2 +52f3dbf7094630a016e8e9092e5c7638 gnome-panel-2.0.6.tar.bz2 +a45c5f273348a634ae6e7e8c802cd678 system-tray-applet-0.10.tar.gz