summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcvsdist <cvsdist@fedoraproject.org>2004-09-09 05:32:13 +0000
committercvsdist <cvsdist@fedoraproject.org>2004-09-09 05:32:13 +0000
commit708172a30eb92f4e2961801fa56f30d7f46eba91 (patch)
tree812d3228721d9f53796d8f669d0399f596a72578
parented51fb7d8606730201f08b900f4c1ae7b7223091 (diff)
downloadgnome-panel-708172a30eb92f4e2961801fa56f30d7f46eba91.tar.gz
gnome-panel-708172a30eb92f4e2961801fa56f30d7f46eba91.tar.xz
gnome-panel-708172a30eb92f4e2961801fa56f30d7f46eba91.zip
auto-import changelog data from gnome-panel-2.2.0.1-9.src.rpmscratch-splitgnome-panel-2_2_0_1-9RHL-9-splitRHL-8-splitRHEL-3-split
Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com> - debuginfo rebuild Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com> 2.2.0.1-8 - Rebuild with an updated libtool to fix #84742 Thu Feb 20 2003 Havoc Pennington <hp@redhat.com> 2.2.0.1-6 - fix memleaks, #84489 #84467 - use icon theme for button widgets instead of stock ID #82301 Fri Feb 14 2003 Havoc Pennington <hp@redhat.com> 2.2.0.1-5 - disable session management for all applets Tue Feb 11 2003 Havoc Pennington <hp@redhat.com> 2.2.0.1-4 - fix #83683 for real, very embarassing bug in the end Tue Feb 11 2003 Havoc Pennington <hp@redhat.com> 2.2.0.1-3 - add assertions to try to narrow down #83683 more Tue Feb 11 2003 Tim Waugh <twaugh@redhat.com> 2.2.0.1-2 - Fix notification area crash (bug #83683). Wed Feb 05 2003 Havoc Pennington <hp@redhat.com> 2.2.0.1-1 - 2.2.0.1 Mon Feb 03 2003 Matt Wilson <msw@redhat.com> 2.2.0-2 - added gnome-panel-2.1.90.1-null.patch to avoid segv on 64 bit platforms Mon Feb 03 2003 Alexander Larsson <alexl@redhat.com> 2.2.0-1 - Update to 2.2.0 - Add patch to disable monitoring in recent-files, since it made you not able to unmount cds. Thu Jan 30 2003 Matt Wilson <msw@redhat.com> 2.1.90.1-6 - disable optimizations on x86_64 to work around gcc bug Wed Jan 22 2003 Tim Powers <timp@redhat.com> - rebuilt Mon Jan 13 2003 Jonathan Blandford <jrb@redhat.com> - put the control-center second Sat Jan 11 2003 Havoc Pennington <hp@redhat.com> - fix the extra separator left when we lack screenshot menuitem Fri Jan 10 2003 Havoc Pennington <hp@redhat.com> - fix the clock Thu Jan 09 2003 Havoc Pennington <hp@redhat.com> - remove enhanced-errors patch now upstream - change how we're doing the laptop-specific config to avoid cut-and-paste - update clock-addons patch - remove hardcoded change to default panel icon size, we'll put it in bluecurve theme. - run xscreensaver fortune instead of just "fortune" from the fish - add printer icon to panel Wed Jan 08 2003 Havoc Pennington <hp@redhat.com> - 2.1.90.1
-rw-r--r--.cvsignore2
-rw-r--r--gnome-panel.spec160
-rw-r--r--sources2
3 files changed, 138 insertions, 26 deletions
diff --git a/.cvsignore b/.cvsignore
index 8d2bce0..c696229 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.1.3.tar.bz2
+gnome-panel-2.2.0.1.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index d6bba9c..da5166a 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,32 +1,35 @@
%define gettext_package gnome-panel-2.0
-%define glib2_version 2.0.0
-%define gtk2_version 2.1.2
+%define glib2_version 2.2.0
+%define gtk2_version 2.2.0
%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 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 libxslt_version 1.0.21-2
-%define startup_notification_version 0.4
+%define startup_notification_version 0.5
+%define redhat_menus_version 0.32
Summary: GNOME panel
Name: gnome-panel
-Version: 2.1.3
-Release: 1
+Version: 2.2.0.1
+Release: 9
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
+Source3: redhat-panel-per-panel-config-battstat.schemas
#Source5: gnome-panel-2.0.6-extrapo.tar.gz
License: GPL
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-root
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
BuildRequires: glib2-devel >= %{glib2_version}
@@ -40,21 +43,34 @@ 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: fontconfig-devel
BuildRequires: startup-notification-devel >= %{startup_notification_version}
+BuildRequires: libtool automake autoconf
-Patch0: gnome-panel-2.0.2.90-enhanced-errors.patch
## http://bugzilla.gnome.org/show_bug.cgi?id=85723
-Patch1: gnome-panel-2.1.2-clock-addons.patch
+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
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
%description
@@ -70,7 +86,6 @@ cp -f %{SOURCE2} gnome-panel/panel-per-panel-config.schemas.in
#(cd po && tar xzvf %{SOURCE5} )
-%patch0 -p1 -b .enhanced-errors
%patch1 -p1 -b .clock-addons
%patch2 -p1 -b .pager-rows
# FIXME need to port the "no date" part of this
@@ -78,13 +93,30 @@ cp -f %{SOURCE2} gnome-panel/panel-per-panel-config.schemas.in
%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
+
+%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
-%build
+echo 'AC_DEFUN([GNOME_COMPILE_WARNINGS], [])' >> acinclude.m4
+
+libtoolize --force
+aclocal
+automake --add-missing
+autoconf
+autoheader
+%build
%configure
make
@@ -95,9 +127,14 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
%makeinstall
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-# 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
+## 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
## blow away stuff we don't want
/bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
@@ -132,7 +169,7 @@ 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"
+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"
for S in $SCHEMAS; do
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
done
@@ -168,7 +205,9 @@ fi
%{_libdir}/*.so.*
%{_sysconfdir}/gconf/schemas/*.schemas
%{_sysconfdir}/sound
-%{_libdir}/gnome-panel/*.so
+#%{_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/*
@@ -176,6 +215,79 @@ fi
%{_libdir}/*.so
%changelog
+* Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com>
+- debuginfo rebuild
+
+* Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com> 2.2.0.1-8
+- Rebuild with an updated libtool to fix #84742
+
+* Thu Feb 20 2003 Havoc Pennington <hp@redhat.com> 2.2.0.1-6
+- fix memleaks, #84489 #84467
+- use icon theme for button widgets instead of stock ID #82301
+
+* Fri Feb 14 2003 Havoc Pennington <hp@redhat.com> 2.2.0.1-5
+- disable session management for all applets
+
+* Tue Feb 11 2003 Havoc Pennington <hp@redhat.com> 2.2.0.1-4
+- fix #83683 for real, very embarassing bug in the end
+
+* Tue Feb 11 2003 Havoc Pennington <hp@redhat.com> 2.2.0.1-3
+- add assertions to try to narrow down #83683 more
+
+* Tue Feb 11 2003 Tim Waugh <twaugh@redhat.com> 2.2.0.1-2
+- Fix notification area crash (bug #83683).
+
+* Wed Feb 5 2003 Havoc Pennington <hp@redhat.com> 2.2.0.1-1
+- 2.2.0.1
+
+* Mon Feb 3 2003 Matt Wilson <msw@redhat.com> 2.2.0-2
+- added gnome-panel-2.1.90.1-null.patch to avoid segv on 64 bit platforms
+ #82978
+
+* Mon Feb 3 2003 Alexander Larsson <alexl@redhat.com> 2.2.0-1
+- Update to 2.2.0
+- Add patch to disable monitoring in recent-files, since it made you not able to unmount cds.
+
+* Thu Jan 30 2003 Matt Wilson <msw@redhat.com> 2.1.90.1-6
+- disable optimizations on x86_64 to work around gcc bug
+
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+- rebuilt
+
+* Mon Jan 13 2003 Jonathan Blandford <jrb@redhat.com>
+- put the control-center second
+
+* Sat Jan 11 2003 Havoc Pennington <hp@redhat.com>
+- fix the extra separator left when we lack screenshot menuitem
+
+* Fri Jan 10 2003 Havoc Pennington <hp@redhat.com>
+- fix the clock
+
+* Thu Jan 9 2003 Havoc Pennington <hp@redhat.com>
+- remove enhanced-errors patch now upstream
+- change how we're doing the laptop-specific config to avoid cut-and-paste
+- update clock-addons patch
+- remove hardcoded change to default panel icon size, we'll put it in bluecurve
+ theme.
+- run xscreensaver fortune instead of just "fortune" from the fish
+- add printer icon to panel
+
+* Wed Jan 8 2003 Havoc Pennington <hp@redhat.com>
+- 2.1.90.1
+
+* Mon Dec 16 2002 Tim Powers <timp@redhat.com> 2.1.4-4
+- rebuild
+
+* Mon Dec 16 2002 Havoc Pennington <hp@redhat.com>
+- rebuild
+
+* Sat Dec 14 2002 Havoc Pennington <hp@redhat.com>
+- require gnome-desktop 2.1.4
+- include datadir/fish
+
+* Fri Dec 13 2002 Havoc Pennington <hp@redhat.com>
+- 2.1.4
+
* Mon Dec 2 2002 Havoc Pennington <hp@redhat.com>
- 2.1.3
- build req startup-notification-devel
diff --git a/sources b/sources
index 23e9197..f570b15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e3ffab133ab9e50bc36539650a4fefcc gnome-panel-2.1.3.tar.bz2
+cd8a74425cadadc8d10ab1fe5e9e3fe8 gnome-panel-2.2.0.1.tar.bz2