--- a/ChangeLog	Thu Jan 17 08:10:25 2008 +0000
+++ b/ChangeLog	Thu Jan 17 09:08:18 2008 +0000
@@ -1,3 +1,9 @@
+2008-01-17  Damien Carbery <[email protected]>
+
+	* SUNWgnome-panel.spec: Add -DGWEATHER_I_KNOW_THIS_IS_UNSTABLE to
+	  CFLAGS; Remove some empty dirs.
+	* patches/libgweather-01-uninstalled.diff: Update Cflags path to work.
+
 2008-01-17  Damien Carbery <[email protected]>
 
 	* SUNWgnome-panel.spec: Add BuildRequires SUNWlibrsvg-devel because

--- a/SUNWgnome-panel.spec	Thu Jan 17 08:10:25 2008 +0000
+++ b/SUNWgnome-panel.spec	Thu Jan 17 09:08:18 2008 +0000
@@ -125,7 +125,7 @@
 %libnotify.build -d %name-%version
 %notificationdaemon.build -d %name-%version
 
-export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
+export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP -DGWEATHER_I_KNOW_THIS_IS_UNSTABLE"
 export RPM_OPT_FLAGS="$CFLAGS"
 %gdesktop.build -d %name-%version
 %gnome_menus.build -d %name-%version
@@ -146,14 +146,16 @@
 %libgweather.install -d %name-%version
 %gpanel.install -d %name-%version
 
-rm -rf $RPM_BUILD_ROOT%{_mandir}
+rm -r $RPM_BUILD_ROOT%{_mandir}
 cd %{_builddir}/%name-%version/sun-manpages
 make install DESTDIR=$RPM_BUILD_ROOT
 
 chmod 0644 $RPM_BUILD_ROOT%{_datadir}/gnome/help/*/C/*.xml
 
-rm -rf $RPM_BUILD_ROOT/usr/var
-rm -rf $RPM_BUILD_ROOT/var
+# Remove empty directories
+rm -r $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1
+rm -r $RPM_BUILD_ROOT%{_datadir}/dbus-1/system-services
+rm -r $RPM_BUILD_ROOT%{_datadir}/PolicyKit
 
 %if %option_with_sun_branding
 # Change to allow for addition of a gnome-about wrapper script to allow
@@ -263,6 +265,7 @@
 %{_datadir}/gnome-menus
 %{_datadir}/desktop-directories
 %{_datadir}/omf/*/*-C.omf
+%{_datadir}/gnome-panel/glade/clock.glade
 %{_datadir}/gnome-panel/glade/timezone.glade
 %{_datadir}/gnome-panel/glade/workspace-switcher.glade
 %{_datadir}/gnome-panel/glade/window-list.glade
@@ -338,6 +341,7 @@
 * Thu Jan 17 2007 - [email protected]
 - Add BuildRequires SUNWlibrsvg-devel because librsvg is required by
   gnome-panel 2.21.5.
+- Add -DGWEATHER_I_KNOW_THIS_IS_UNSTABLE to CFLAGS; Remove some empty dirs.
 * Thu Nov 15 2007 - [email protected]
 - Add BuildRequires SUNWlxml-python for building documentation.
 * Fri Oct 19 2007 - [email protected]

--- a/patches/libgweather-01-uninstalled.diff	Thu Jan 17 08:10:25 2008 +0000
+++ b/patches/libgweather-01-uninstalled.diff	Thu Jan 17 09:08:18 2008 +0000
@@ -24,4 +24,4 @@
 +Version: @VERSION@
 +Requires: gtk+-2.0, gnome-vfs-2.0
 +Libs: ${pc_top_builddir}/${pcfiledir}/libgweather.la
-+Cflags: -I${pc_top_builddir}
++Cflags: -I${pc_top_builddir}/${pcfiledir}/..