--- a/ChangeLog	Fri Aug 08 10:50:00 2008 +0000
+++ b/ChangeLog	Fri Aug 08 12:23:07 2008 +0000
@@ -1,3 +1,10 @@
+2008-08-08  Damien Carbery <[email protected]>
+
+	* base-specs/gtkmm.spec: Remove reference to upstream patch
+	  glibmm-02-m4-macro.diff. Rename remainder.
+	* base-specs/pangomm.spec: Remove reference to upstream patch
+	  glibmm-02-m4-macro.diff.
+
 2008-08-08 Padraig O'Briain <[email protected]>
  
 	* patches/nautilus-open-terminal-03-home-dir..diff: New patch

--- a/base-specs/gtkmm.spec	Fri Aug 08 10:50:00 2008 +0000
+++ b/base-specs/gtkmm.spec	Fri Aug 08 12:23:07 2008 +0000
@@ -20,9 +20,7 @@
 
 #date:2008-02-14 owner:bewitche type:feature  
 Patch1:       gtkmm-01-ignore-defs.diff
-# date:2008-02-18 owner:dcarbery type:bug bugzilla:423990
-Patch2:       glibmm-02-m4-macro.diff
-Patch3:       gtkmm-03-widget.diff
+Patch2:       gtkmm-02-widget.diff
 URL:          http://www.gtkmm.org/
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
@@ -30,7 +28,6 @@
 %setup -q -n gtkmm-%version
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -73,6 +70,8 @@
 
 
 %changelog
+* Fri Aug 08 2008 - [email protected]
+- Remove reference to upstream patch glibmm-02-m4-macro.diff. Rename remainder.
 * Tue Aug 05 2008 - [email protected]
 - Bump to 2.13.6.
 * Thu Jul 30 2008 - [email protected]

--- a/base-specs/pangomm.spec	Fri Aug 08 10:50:00 2008 +0000
+++ b/base-specs/pangomm.spec	Fri Aug 08 12:23:07 2008 +0000
@@ -19,15 +19,13 @@
 Source:       http://download.gnome.org/sources/pangomm/2.13/pangomm-%{version}.tar.bz2
 #date 2008-07-24 owner:bewitche type:feature
 Patch1:      pangomm-01-ignore-defs.diff
-#date 2008-07-24 owner:dcarbery type:bug bugzilla:423990
-Patch2:      glibmm-02-m4-macro.diff
 URL:          http://www.gtkmm.org/
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %prep
 %setup -q -n pangomm-%version
 %patch1 -p1
-%patch2 -p1
+
 %build
 CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
 if test "x$CPUS" = "x" -o $CPUS = 0; then
@@ -63,6 +61,8 @@
 
 
 %changelog
+* Fri Aug 08 2008 - [email protected]
+- Remove reference to upstream patch glibmm-02-m4-macro.diff.
 * Tue Aug 05 2008 - [email protected]
 - Bump to 2.13.7.
 * Thu Jul 24 2008 - [email protected]