diff options
Diffstat (limited to 'gnome-panel.spec')
| -rw-r--r-- | gnome-panel.spec | 164 |
1 files changed, 86 insertions, 78 deletions
diff --git a/gnome-panel.spec b/gnome-panel.spec index da5166a..833a934 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -3,25 +3,25 @@ %define glib2_version 2.2.0 %define gtk2_version 2.2.0 %define libglade2_version 2.0.0-3 -%define libgnomeui_version 2.2.0 -%define gnome_desktop_version 2.2.0 -%define libwnck_version 2.2.0 -%define libbonobo_version 2.2.0 -%define libbonoboui_version 2.2.0 -%define gnome_vfs2_version 2.2.0 -%define bonobo_activation_version 2.2.0 +%define libgnomeui_version 2.3.0 +%define gnome_desktop_version 2.3.0 +%define libwnck_version 2.3.1 +%define libbonobo_version 2.3.0 +%define libbonoboui_version 2.3.0 +%define gnome_vfs2_version 2.3.7 %define libxslt_version 1.0.21-2 %define startup_notification_version 0.5 %define redhat_menus_version 0.32 Summary: GNOME panel Name: gnome-panel -Version: 2.2.0.1 -Release: 9 +Version: 2.4.0 +Release: 3 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-battstat.schemas +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 @@ -31,6 +31,7 @@ Requires: gnome-desktop >= %{gnome_desktop_version} Requires: libwnck >= %{libwnck_version} Requires: redhat-menus >= %{redhat_menus_version} Prereq: /bin/awk, /bin/cat, /bin/ln, /bin/rm +Prereq: GConf2 >= 2.3.3 BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk2-devel >= %{gtk2_version} @@ -41,36 +42,20 @@ BuildRequires: libwnck-devel >= %{libwnck_version} 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: fontconfig-devel BuildRequires: startup-notification-devel >= %{startup_notification_version} BuildRequires: libtool automake autoconf ## http://bugzilla.gnome.org/show_bug.cgi?id=85723 -Patch1: gnome-panel-2.1.90.1-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 +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 -Patch7: gnome-panel-2.0.6-memleaks-and-clock-format.patch Patch8: gnome-panel-2.1.90.1-no-fortune.patch -Patch9: gnome-panel-2.2.0-recent-monitor.patch -# Only one screenshot at a time, #71432, bugzilla.gnome.org #91924 -#Patch10: gnome-panel-2.0.6-singlesshot.patch -Patch11: gnome-panel-2.1.90.1-null.patch -Patch12: gnome-panel-2.2.0.1-notification-area-fix.patch - -## http://bugzilla.gnome.org/show_bug.cgi?id=106650 -Patch14: gnome-panel-2.2.0.1-applet-sm.patch - -## http://bugzilla.gnome.org/show_bug.cgi?id=105148 -## http://bugzilla.gnome.org/show_bug.cgi?id=106355 -Patch15: gnome-panel-2.2.0.1-memleaks.patch - -## http://bugzilla.gnome.org/show_bug.cgi?id=106649 -Patch16: gnome-panel-2.2.0.1-button-widget-theme.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=124230 +Patch9: gnome-panel-2.4.0-defaultsize.patch %description @@ -80,69 +65,54 @@ features for the GNOME desktop. %prep %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 +cp -f %{SOURCE2} gnome-panel/panel-default-setup.entries #(cd po && tar xzvf %{SOURCE5} ) -%patch1 -p1 -b .clock-addons %patch2 -p1 -b .pager-rows -# FIXME need to port the "no date" part of this -#%patch3 -p1 -b .clock-seconds +%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 .recent-monitor -#%patch10 -p1 -b .singlesshot -%patch11 -p1 -b .null -%patch12 -p1 -b .notification-area-fix - -%patch14 -p0 -b .applet-sm +%patch9 -p1 -b .defaultsize -%patch15 -p1 -b .memleaks - -%patch16 -p1 -b .button-widget-theme - -## 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 +## replace foot menu with redhat-main-menu +perl -pi -e 's/gnome-main-menu/redhat-main-menu/g' gnome-panel/panel-stock-icons.c +perl -pi -e 's/gnome-logo-icon-transparent/redhat-main-menu/g' gnome-panel/panel-stock-icons.c echo 'AC_DEFUN([GNOME_COMPILE_WARNINGS], [])' >> acinclude.m4 -libtoolize --force aclocal +libtoolize --force automake --add-missing autoconf autoheader %build -%configure +%configure --disable-gtk-doc make %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%makeinstall +make DESTDIR=$RPM_BUILD_ROOT install unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL -## create copy of schemas with battstat listed -(cd $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/ && mv panel-per-panel-config.schemas panel-per-panel-config-nolaptop.schemas && cp panel-per-panel-config-nolaptop.schemas panel-per-panel-config-laptop.schemas && perl -pi -e 's/pager_applet,tray_applet/pager_applet,battstat_applet,tray_applet/g' panel-per-panel-config-laptop.schemas) - -## print for debugging in build log -(cd $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/ && diff -u panel-per-panel-config-nolaptop.schemas panel-per-panel-config-laptop.schemas || true) - ## install battstat schemas -install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-per-panel-config-battstat.schemas +install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup-battstat.entries + +## install backwards compat schemas +install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas ## 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 +#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 +/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/libclock-applet-2.a +/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/libclock-applet-2.la /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-panel/*.*a %find_lang %{gettext_package} @@ -160,25 +130,20 @@ if [ -f /proc/apm ]; then 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 -SCHEMAS="panel-global-config.schemas panel-per-panel-config.schemas mailcheck.schemas pager.schemas tasklist.schemas clock.schemas fish.schemas panel-per-panel-config-battstat.schemas" +SCHEMAS="panel-global.schemas panel-general.schemas panel-toplevel.schemas panel-object.schemas gnome-panel-screenshot.schemas clock.schemas fish.schemas window-list.schemas workspace-switcher.schemas redhat-panel-backwards-compat-config.schemas" for S in $SCHEMAS; do gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null done +gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --recursive-unset /apps/panel +gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup.entries +if [ "$apm" = "true" ]; then + gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup-battstat.entries +fi /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 @@ -195,7 +160,6 @@ fi %{_datadir}/idl %{_datadir}/gnome-2.0 %{_datadir}/gnome-panel -%{_datadir}/gen_util %{_datadir}/gtk-doc %{_datadir}/omf %{_datadir}/man/man*/* @@ -204,10 +168,8 @@ fi %{_libdir}/bonobo %{_libdir}/*.so.* %{_sysconfdir}/gconf/schemas/*.schemas -%{_sysconfdir}/sound +%{_sysconfdir}/gconf/schemas/*.entries #%{_libdir}/gnome-panel/*.so -## who ever expected /usr/share/fish to exist? ;-) -%{_datadir}/fish # theoretically a devel package, but just doesn't seem worth it %{_libdir}/pkgconfig/* @@ -215,6 +177,52 @@ fi %{_libdir}/*.so %changelog +* Thu Oct 9 2003 Owen Taylor <otaylor@redhat.com> 2.4.0-2 +- Look up the largest size available when picking default images for + panel stock icons (#106673) + +* Thu Sep 4 2003 Alexander Larsson <alexl@redhat.com> 2.3.90-1 +- update to 2.3.90 +- Add backwards compat panel config schemas + +* Wed Aug 27 2003 Alexander Larsson <alexl@redhat.com> 2.3.7-1 +- update to 2.3.7 +- patch the right icon for the main menu (#102672) +- PreReq a new gconf (#102530) + +* Mon Aug 25 2003 Alexander Larsson <alexl@redhat.com> 2.3.6.2-4 +- Don't lock all objects on panel +- use "make DESTDIR=... install" so gconf rules are right + +* Mon Aug 18 2003 Alexander Larsson <alexl@redhat.com> 2.3.6.2-3 +- Update the default panel setup handling to the new way + +* Thu Aug 14 2003 Jonathan Blandford <jrb@redhat.com> 2.3.6.2-1 +- remove the right .la files. + +* Thu Aug 14 2003 Alexander Larsson <alexl@redhat.com> 2.3.6.2-1 +- update for gnome 2.3 + +* Tue Jul 29 2003 Havoc Pennington <hp@redhat.com> 2.2.2.1-3 +- disable gtk doc + +* Mon Jul 28 2003 Havoc Pennington <hp@redhat.com> 2.2.2.1-3 +- rebuild + +* Wed Jul 9 2003 Alexander Larsson <alexl@redhat.com> 2.2.2.1-2 +- Fix redhat menu icon + +* Mon Jul 7 2003 Havoc Pennington <hp@redhat.com> 2.2.2.1-1 +- 2.2.2.1 +- remove memleaks patch, now upstream +- remove applet-sm patch now upstream +- remove "null" patch, now upstream +- remove recent-monitor patch now upstream +- remove notification area crash fix, now upstream + +* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com> +- rebuilt + * Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com> - debuginfo rebuild |