auto-import changelog data from gnome-applets-2.6.0-5.src.rpmgnome-applets-2_6_0-5

2.6.0-5
- fix #120354 (mixer applet forgets channel settings)
2.6.0-4
- fix error during update on s390(x) due to missing battery applet
2.6.0-3
- Build battstat on ppc too
2.6.0-2
- Add gswitchit.schemas to SCHEMAS
Wed Mar 31 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-1
- Update to 2.6.0

3 files changed, 29 insertions, 7 deletions

diff --git a/.cvsignore b/.cvsignore
index 598a8d8..773e951 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.5.7.tar.bz2
+gnome-applets-2.6.0.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index ea340ed..c28b669 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,4 +1,5 @@
-%define no_apm_archs alpha ia64 s390 s390x sparc sparc64 ppc ppc64 x86_64
+# apmd is built on %{ix86} and ppc
+%define no_apm_archs alpha ia64 s390 s390x sparc sparc64 ppc64 x86_64
 
 %define glib2_version 2.2.0
 %define pango_version 1.2.0
@@ -10,13 +11,14 @@
 %define libbonoboui_version 2.3.0
 %define gstreamer_plugins_version 0.7.6-2
 %define libxklavier_version 0.97
+%define ampd_version 3.0.2-22
 
 %define po_package gnome-applets-2.0
 
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
-Version: 	2.5.7
-Release: 4
+Version: 	2.6.0
+Release:	5
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -39,7 +41,7 @@ BuildRequires:  gstreamer-plugins-devel >= %{gstreamer_plugins_version}
 BuildRequires:  /usr/bin/automake
 BuildRequires:  libbonoboui-devel >= %{libbonoboui_version}
 %ifnarch %{no_apm_archs}
-BuildRequires:  apmd
+BuildRequires:  apmd >= %{apmd_version}
 %endif
 
 Requires:	gnome-panel >= %{gnome_panel_version}
@@ -60,6 +62,7 @@ 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.6-libapm.patch
+Patch6: gnome-applets-2.6.0-channelsettings.patch
 
 
 %description
@@ -88,6 +91,7 @@ cp %{SOURCE2} .
 # Fix up mode 0000 files created by patch2
 chmod -R a+r .
 %patch5 -p1 -b .libapm
+%patch6 -p1 -b .channelsettings
 
 %build
 
@@ -119,7 +123,10 @@ rm -rf $RPM_BUILD_ROOT
 scrollkeeper-update
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="battstat.schemas cdplayer.schemas charpick.schemas drivemount.schemas geyes.schemas gkb.schemas gtik.schemas gweather.schemas mailcheck.schemas mini-commander.schemas mixer.schemas modemlights.schemas multiload.schemas stickynotes.schemas"
+%ifnarch s390 s390x
+SCHEMAS="battstat.schemas"
+%endif
+SCHEMAS="$SCHEMAS cdplayer.schemas charpick.schemas drivemount.schemas geyes.schemas gkb.schemas gtik.schemas gweather.schemas mailcheck.schemas mini-commander.schemas mixer.schemas modemlights.schemas multiload.schemas stickynotes.schemas gswitchit.schemas"
 for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
 done
@@ -159,6 +166,21 @@ done
 
 
 %changelog
+* Thu May 05 2004 Nils Philippsen <nphilipp@redhat.com> 1:2.6.0-5
+- fix #120354 (mixer applet forgets channel settings)
+
+* Thu Apr 29 2004 Karsten Hopp <karsten@redhat.de> 1:2.6.0-4
+- fix error during update on s390(x) due to missing battery applet
+
+* Mon Apr 19 2004 Mark McLoughlin <markmc@redhat.com> 1:2.6.0-3
+- Build battstat on ppc too
+
+* Wed Apr 14 2004 Alex Larsson <alexl@redhat.com> 1:2.6.0-2
+- Add gswitchit.schemas to SCHEMAS
+
+* Wed Mar 31 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-1
+- Update to 2.6.0
+
 * Tue Mar 16 2004 Jeremy Katz <katzj@redhat.com> 1:2.5.7-4
 - rebuild for new gstreamer
 
diff --git a/sources b/sources
index 88cc1ad..8756c93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1b053ec93d861dbd07052e66895647b  gnome-applets-2.5.7.tar.bz2
+9c2dcde8fc94dd43f8aa7be52ca9c103  gnome-applets-2.6.0.tar.bz2