From 3903b338e6d9200dff309ac8cc7853f15b735391 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Apr 19 2010 03:07:35 +0000
Subject: fix a build problem


---

diff --git a/gnome-netstatus.spec b/gnome-netstatus.spec
index 342de77..36856ed 100644
--- a/gnome-netstatus.spec
+++ b/gnome-netstatus.spec
@@ -15,6 +15,7 @@ License: GPLv2+ and GFDL
 Group: User Interface/Desktops
 Patch1: iface.patch
 Patch2: netstatus-libs.patch
+Patch3: help.patch
 
 Requires(pre): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
@@ -42,6 +43,7 @@ network interface on your panel.
 %setup -q
 %patch1 -p1 -b .iface
 %patch2 -p1 -b .libs
+%patch3 -p1 -b .help
 
 autoreconf -i -f
 
@@ -50,8 +52,6 @@ autoreconf -i -f
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %makeinstall
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
@@ -73,25 +73,15 @@ for doc_lang in de es fr it ja ko sv zh_CN zh_HK zh_TW; do
   fi
 done
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/netstatus.schemas > /dev/null || :
+%gconf_schema_upgrade netstatus
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
 %pre
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/netstatus.schemas > /dev/null || :
-fi
+%gconf_schema_prepare netstatus
 
 %preun
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/netstatus.schemas > /dev/null || :
-fi
+%gconf_schema_remove netstatus
 
 
 %postun
diff --git a/help.patch b/help.patch
new file mode 100644
index 0000000..caf70bd
--- /dev/null
+++ b/help.patch
@@ -0,0 +1,48 @@
+diff -up gnome-netstatus-2.28.1/help/ja/Makefile.am.help gnome-netstatus-2.28.1/help/ja/Makefile.am
+--- gnome-netstatus-2.28.1/help/ja/Makefile.am.help	2010-04-18 23:00:39.495829175 -0400
++++ gnome-netstatus-2.28.1/help/ja/Makefile.am	2010-04-18 23:00:49.340826173 -0400
+@@ -4,7 +4,7 @@ omffile = gnome-netstatus-ja.omf
+ entities = legal.xml
+ 
+ dest_figdir = figures
+-src_figdir  = ../../C/figures
++src_figdir  = ../C/figures
+ figures =                               \
+ 	gnome-netstatus-disconn.png     \
+ 	gnome-netstatus-idle.png        \
+diff -up gnome-netstatus-2.28.1/help/ko/Makefile.am.help gnome-netstatus-2.28.1/help/ko/Makefile.am
+--- gnome-netstatus-2.28.1/help/ko/Makefile.am.help	2010-04-18 23:01:02.626830223 -0400
++++ gnome-netstatus-2.28.1/help/ko/Makefile.am	2010-04-18 23:01:10.417579558 -0400
+@@ -4,7 +4,7 @@ omffile = gnome-netstatus-ko.omf
+ entities = legal.xml
+ 
+ dest_figdir = figures
+-src_figdir  = ../../C/figures
++src_figdir  = ../C/figures
+ figures =                               \
+ 	gnome-netstatus-disconn.png     \
+ 	gnome-netstatus-idle.png        \
+diff -up gnome-netstatus-2.28.1/help/zh_HK/Makefile.am.help gnome-netstatus-2.28.1/help/zh_HK/Makefile.am
+--- gnome-netstatus-2.28.1/help/zh_HK/Makefile.am.help	2010-04-18 23:01:32.666579000 -0400
++++ gnome-netstatus-2.28.1/help/zh_HK/Makefile.am	2010-04-18 23:01:40.413833433 -0400
+@@ -4,7 +4,7 @@ omffile = gnome-netstatus-zh_HK.omf
+ entities = legal.xml
+ 
+ dest_figdir = figures
+-src_figdir  = ../../C/figures
++src_figdir  = ../C/figures
+ figures =                               \
+ 	gnome-netstatus-disconn.png     \
+ 	gnome-netstatus-idle.png        \
+diff -up gnome-netstatus-2.28.1/help/zh_TW/Makefile.am.help gnome-netstatus-2.28.1/help/zh_TW/Makefile.am
+--- gnome-netstatus-2.28.1/help/zh_TW/Makefile.am.help	2010-04-18 23:01:49.606579142 -0400
++++ gnome-netstatus-2.28.1/help/zh_TW/Makefile.am	2010-04-18 23:01:57.396839299 -0400
+@@ -4,7 +4,7 @@ omffile = gnome-netstatus-zh_TW.omf
+ entities = legal.xml
+ 
+ dest_figdir = figures
+-src_figdir  = ../../C/figures
++src_figdir  = ../C/figures
+ figures =                               \
+ 	gnome-netstatus-disconn.png     \
+ 	gnome-netstatus-idle.png        \