auto-import changelog data from gnome-applets-1.4.0.1-6.src.rpmgnome-applets-1_4_0_1-6RHEL-2_1-split

Thu Aug 30 2001 Alex Larsson <alexl@redhat.com>
- Removed annoying broken battery full dialog #52861
- Also fix mixer applet for USB sound #52603
Mon Aug 27 2001 Havoc Pennington <hp@redhat.com>
- Add po files from sources.redhat.com

3 files changed, 20 insertions, 4 deletions

diff --git a/.cvsignore b/.cvsignore
index e6d3ab6..cbbaf73 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
 battstat_applet-2.0.10.tar.gz
 gnome-applets-1.4.0.1.tar.gz
-gnome-applets-po.tar.gz
+gnome-applets-pofiles.tar.gz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 2286b86..cdb33d6 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -4,14 +4,14 @@
 Summary: Small applications for the GNOME panel.
 Name:     	gnome-applets
 Version: 	1.4.0.1
-Release:	4
+Release:	6
 Epoch:          1
 License:	GPL
 Group: User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/unstable/%{name}/%{name}-%{version}.tar.gz
 Source2:	gnome-applets-1.2.4-ja.po
 Source3:	gtik2_applet.desktop
-Source4:        gnome-applets-po.tar.gz
+Source4:        gnome-applets-pofiles.tar.gz
 Source5:        battstat_applet-2.0.10.tar.gz
 URL:		http://www.gnome.org/
 
@@ -27,6 +27,8 @@ Requires:	gdk-pixbuf >= 0.7.0
 
 Patch1: gnome-applets-1.2.4-isdn.patch
 Patch2: gnome-applets-battstat-2.0.10-nobrokenpath.patch
+Patch3: gnome-applets-1.4.0.1-mixer.patch
+Patch4: gnome-applets-1.4.0.1-battstat_dialog.patch
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
@@ -53,10 +55,17 @@ fi
 %patch2 -p1 -b .nobrokenpath
 %endif
 
+%patch3 -p0 -b .mixer
+
 cp %{SOURCE2} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/po/ja.po
 cp %{SOURCE3} $RPM_BUILD_DIR/%{name}-%{PACKAGE_VERSION}/gtik/
 # translations
 tar zxf %{SOURCE4}
+
+%ifnarch %{no_apm_archs}
+%patch4 -p0 -b .batstat_dialog
+%endif
+
 %build
 
 %configure --sysconfdir=/etc
@@ -209,6 +218,13 @@ BuildFiles
 %doc AUTHORS COPYING ChangeLog NEWS README
 
 %changelog
+* Thu Aug 30 2001 Alex Larsson <alexl@redhat.com>
+- Removed annoying broken battery full dialog #52861
+- Also fix mixer applet for USB sound #52603
+
+* Mon Aug 27 2001 Havoc Pennington <hp@redhat.com>
+- Add po files from sources.redhat.com
+
 * Wed Aug 15 2001 Alexander Larsson <alexl@redhat.com>
 - Own /usr/share/gnome/gkb and /usr/share/gnome/help/*
 
diff --git a/sources b/sources
index db5ce6e..954da6f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 606bb5470828d761afc2a940b117e295  battstat_applet-2.0.10.tar.gz
 5b459439d4d698e86a6239734f42ca9f  gnome-applets-1.4.0.1.tar.gz
-624027d99a001ccd99dc93daacf56a22  gnome-applets-po.tar.gz
+ff43dcd6c14690ae7a3ade5307a16565  gnome-applets-pofiles.tar.gz