auto-import changelog data from gnome-applets-2.5.4-1.src.rpmgnome-applets-2_5_4-1FC-2-split

2.5.4-1
- update to 2.5.4

3 files changed, 28 insertions, 7 deletions

diff --git a/.cvsignore b/.cvsignore
index ed38322..c024612 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.4.1.tar.bz2
+gnome-applets-2.5.4.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index cfe5ea3..2f95c28 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -4,8 +4,8 @@
 %define pango_version 1.2.0
 %define gtk2_version 2.2.0
 %define libgnomeui_version 2.3.0
-%define gnome_panel_version 2.3.0
-%define libgtop2_version 2.0.2
+%define gnome_panel_version 2.5.0
+%define libgtop2_version 2.5.0
 %define gail_version 1.2.0
 %define libbonoboui_version 2.3.0
 
@@ -13,7 +13,7 @@
 
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
-Version: 	2.4.1
+Version: 	2.5.4
 Release:        1
 Epoch:          1
 License:	GPL
@@ -32,13 +32,15 @@ BuildRequires:  gnome-panel >= %{gnome_panel_version}
 BuildRequires:  libgtop2-devel >= %{libgtop2_version}
 BuildRequires:  pango-devel >= %{pango_version}
 BuildRequires:  gail-devel >= %{gail_version}
-BuildRequires:  /usr/bin/automake-1.4
+BuildRequires:  /usr/bin/automake
+BuildRequires:  libxklavier
 BuildRequires:  libbonoboui-devel >= %{libbonoboui_version}
 %ifnarch %{no_apm_archs}
 BuildRequires:  apmd
 %endif
 
 Requires:	gnome-panel >= %{gnome_panel_version}
+Requires:       libxklavier
 
 Obsoletes:      battstat_applet
 
@@ -54,6 +56,9 @@ Patch3: gnome-applets-2.0.1-keepclosed.patch
 # Shrink volume applet for msw
 Patch4: gnome-applets-2.3.6-smallvolume.patch
 
+Patch5: gnome-applets-2.5.4-xklavier.patch
+
+
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
 applications and desktop tools to be used in conjunction with a window
@@ -80,10 +85,16 @@ cp %{SOURCE2} .
 # Fix up mode 0000 files created by patch2
 chmod -R a+r .
 
+cd libgswitchit
+%patch5 -p0 -b .xklavier
+cd ..
+
 %build
 
 # .uniquecd patch modifies cdplayer/Makefile.am
-automake-1.4
+aclocal
+automake
+autoconf
 
 %configure
 make
@@ -128,6 +139,7 @@ done
 %{_datadir}/gweather
 %{_datadir}/stickynotes
 %{_datadir}/battstat_applet
+%{_datadir}/gswitchit
 %{_datadir}/omf
 %{_datadir}/wireless-applet
 %{_datadir}/gen_util
@@ -138,7 +150,16 @@ done
 %{_sysconfdir}/gconf/schemas/*
 %{_sysconfdir}/sound
 
+# These are really devel files, but we don't want a devel package
+# for just three files
+%{_includedir}/libgswitchit
+%{_libdir}/pkgconfig/gswitchit.pc
+
+
 %changelog
+* Tue Jan 27 2004 Alexander Larsson <alexl@redhat.com> 1:2.5.4-1
+- update to 2.5.4
+
 * Fri Oct  3 2003 Alexander Larsson <alexl@redhat.com> 1:2.4.1-1
 - 2.4.1
 
diff --git a/sources b/sources
index 295d083..37d12d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf018f1692ab305954123d8123ef45d1  gnome-applets-2.4.1.tar.bz2
+93c0dd87e32f4bbaec3d3c4859679db0  gnome-applets-2.5.4.tar.bz2