--- a/ChangeLog	Sat Jan 26 23:46:49 2008 +0000
+++ b/ChangeLog	Sun Jan 27 17:54:57 2008 +0000
@@ -1,7 +1,16 @@
 2008-01-27  Patrick Ale  <[email protected]>
 
-	* prototypes/x86/SUNWgnome-ui-designer-devel.proto: Add missing entry for
-	  gladeui.devhelp
+	* base-specs/glade.spec: Add missing ifblock to remove gtk-doc
+	  when compiling --without gtk-doc
+	* base-specs/gmime.spec: Revert patch from yesterday and 
+          change ifblock for gtk-doc to remove the entire share dir.
+	* prototypes/x86/SUNWgnome-ui-designer-devel.proto: 
+          Revert unneeded change.
+
+2008-01-27  Patrick Ale  <[email protected]>
+
+	* prototypes/x86/SUNWgnome-ui-designer-devel.proto: Add missing 
+	  entry for gladeui.devhelp
 
 2008-01-26  Patrick Ale  <[email protected]>
 

--- a/base-specs/glade.spec	Sat Jan 26 23:46:49 2008 +0000
+++ b/base-specs/glade.spec	Sun Jan 27 17:54:57 2008 +0000
@@ -85,6 +85,11 @@
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 
+%if %{!?_without_gtk_doc:0}%{?_without_gtk_doc:1}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -105,6 +110,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Jan 27 2008 - [email protected]
+- Add ifblock to remove gtk-doc when
+  compiling --without gtk-doc
 * Tue Dec 18 2007 - [email protected]
 - Bump to 3.4.1.
 

--- a/base-specs/gmime.spec	Sat Jan 26 23:46:49 2008 +0000
+++ b/base-specs/gmime.spec	Sun Jan 27 17:54:57 2008 +0000
@@ -84,7 +84,7 @@
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 
 %if %{!?_without_gtk_doc:0}%{?_without_gtk_doc:1}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc
+rm -rf $RPM_BUILD_ROOT%{_datadir}
 %endif
 
 %clean
@@ -98,7 +98,7 @@
 %doc AUTHORS ChangeLog README TODO
 %attr(755,root,root) %{_libdir}/libgmime-2.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgmime-2.0.so.2
-%attr(755,root,bin) %{_datadir}
+
 %files devel
 %defattr(-,root,root)
 %doc PORTING
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Sun 27 Jan 2008 - [email protected]
+- Revert change and remove /usr/share from
+  build area
 * Sat 26 Jan 2008 - [email protected]
 - Add /usr/share to the prototype
 * Thu Jan 24 2008 - [email protected]

--- a/prototypes/x86/SUNWgnome-ui-designer-devel.proto	Sat Jan 26 23:46:49 2008 +0000
+++ b/prototypes/x86/SUNWgnome-ui-designer-devel.proto	Sun Jan 27 17:54:57 2008 +0000
@@ -61,7 +61,6 @@
 f none share/gtk-doc/html/gladeui/core.html=usr/share/gtk-doc/html/gladeui/core.html 0644 root bin
 f none share/gtk-doc/html/gladeui/dockables.html=usr/share/gtk-doc/html/gladeui/dockables.html 0644 root bin
 f none share/gtk-doc/html/gladeui/gladeui-GladeBaseEditor.html=usr/share/gtk-doc/html/gladeui/gladeui-GladeBaseEditor.html 0644 root bin
-f none share/gtk-doc/html/gladeui/gladeui.devhelp=usr/share/gtk-doc/html/gladeui/gladeui-GladeBaseEditor.devhelp 0644 root bin
 f none share/gtk-doc/html/gladeui/gladeui-GladePropertyClass.html=usr/share/gtk-doc/html/gladeui/gladeui-GladePropertyClass.html 0644 root bin
 f none share/gtk-doc/html/gladeui/gladeui-GladeWidgetAdaptor.html=usr/share/gtk-doc/html/gladeui/gladeui-GladeWidgetAdaptor.html 0644 root bin
 f none share/gtk-doc/html/gladeui/gladeui-glade-parameter.html=usr/share/gtk-doc/html/gladeui/gladeui-glade-parameter.html 0644 root bin