From 1ce484540b975fd85029dcdb052fe09eb724e6e4 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Mar 31 2007 21:32:17 +0000
Subject: add bug-buddy support to keyboard applet


---

diff --git a/gnome-applets-2.18.0-bug-buddy.patch b/gnome-applets-2.18.0-bug-buddy.patch
new file mode 100644
index 0000000..38fcdcf
--- /dev/null
+++ b/gnome-applets-2.18.0-bug-buddy.patch
@@ -0,0 +1,48 @@
+--- gnome-applets-2.18.0/gswitchit/Makefile.in.bug-buddy	2007-03-31 17:19:21.000000000 -0400
++++ gnome-applets-2.18.0/gswitchit/Makefile.in	2007-03-31 17:20:29.000000000 -0400
+@@ -959,7 +959,7 @@
+ 
+ 
+ $(server_in_files): $(server_in_in_files) 
+-	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
++	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
+ 
+ @INTLTOOL_SERVER_RULE@
+ 
+--- gnome-applets-2.18.0/gswitchit/GNOME_KeyboardApplet.server.in.in.bug-buddy	2007-03-31 17:15:53.000000000 -0400
++++ gnome-applets-2.18.0/gswitchit/GNOME_KeyboardApplet.server.in.in	2007-03-31 17:17:16.000000000 -0400
+@@ -10,6 +10,11 @@
+         </oaf_attribute>
+         <oaf_attribute name="name" type="string" _value="Keyboard applet factory"/>
+         <oaf_attribute name="description" type="string" _value="Keyboard applet factory"/>
++        <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
++        <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
++        <oaf_attribute name="bugzilla:component" type="string" value="keyboard indicator (gswitchit)"/>
++        <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
++        <oaf_attribute name="bugzilla:other_binaries" type="string" value="gnome-keyboard-applet"/>
+ 
+ </oaf_server>
+ 
+@@ -25,6 +30,11 @@
+         <oaf_attribute name="name" type="string" _value="Keyboard Indicator"/>
+         <oaf_attribute name="description" type="string" _value="Keyboard layout indicator"/>
+         <oaf_attribute name="panel:icon" type="string" value="gswitchit-applet.png"/>
++        <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
++        <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
++        <oaf_attribute name="bugzilla:component" type="string" value="keyboard indicator (gswitchit)"/>
++        <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
++        <oaf_attribute name="bugzilla:other_binaries" type="string" value="gnome-keyboard-applet"/>
+ 
+ </oaf_server>
+ 
+--- gnome-applets-2.18.0/gswitchit/Makefile.am.bug-buddy	2007-03-31 17:17:36.000000000 -0400
++++ gnome-applets-2.18.0/gswitchit/Makefile.am	2007-03-31 17:19:13.000000000 -0400
+@@ -49,7 +49,7 @@
+ server_DATA     = $(server_in_files:.server.in=.server)
+ 
+ $(server_in_files): $(server_in_in_files) 
+-	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
++	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
+ 
+ CLEANFILES = $(server_in_files) $(server_DATA) $(schemas_DATA)
+ 
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 382992c..257ebdf 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.18.0
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -55,6 +55,9 @@ Patch30:	gnome-applets-2.16.0.1-fix-null-applet.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=424639
 Patch31:        gnome-applets-2.18.0-fix-find.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=424989
+Patch32:	gnome-applets-2.18.0-bug-buddy.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -136,6 +139,8 @@ small utilities for the GNOME panel.
 %patch11 -p1 -b .dont-require-display
 
 %patch30 -p1 -b .fix-null-applet
+%patch31 -p1 -b .fix-find
+%patch32 -p1 -b .bug-buddy
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -321,6 +326,9 @@ fi
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Sat Mar 31 2007 Matthias Clasen <mclasen@redhat.com> - 1:2.18.0-5
+- Add bug-buddy support to the keyboard indicator applet
+
 * Fri Mar 30 2007 Ray Strode <rstrode@redhat.com> - 1:2.18.0-4
 - make gweather applet preferences find feature work slightly
   better (bug 209488)