--- a/ChangeLog	Thu Apr 22 14:55:49 2010 +0000
+++ b/ChangeLog	Thu Apr 22 15:04:45 2010 +0000
@@ -1,3 +1,10 @@
+2010-04-22  Christian Kelly  <[email protected]>
+
+	* base-specs/gedit.spec: Bump to 2.30.2.
+	* patches/gedit-05-lt-init.diff: Add to disable building of 'tests' and
+	  remove LT_PREREQ and LT_INIT from configure.ac.
+	* specs/SUNWgnome-text-editor.spec: Remove '.a' files.
+
 2010-04-22  Christian Kelly  <[email protected]>
 
 	* base-specs/eog-plugins.spec: Bump to 2.30.0. Disable building of 

--- a/base-specs/gedit.spec	Thu Apr 22 14:55:49 2010 +0000
+++ b/base-specs/gedit.spec	Thu Apr 22 15:04:45 2010 +0000
@@ -14,12 +14,12 @@
 Name:		gedit
 License:	GPL
 Group:		System/GUI/GNOME
-Version:	2.29.8
+Version:	2.30.2
 Release:	1
 Distribution:	Java Desktop System
 Vendor:		Gnome Community
 Summary:	Text Editor for GNOME
-Source:         http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.29/%{name}-%{version}.tar.bz2
+Source:         http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.30/%{name}-%{version}.tar.bz2
 Source1:	%{name}-po-sun-%{po_sun_version}.tar.bz2
 %if %build_l10n
 Source2:                 l10n-configure.sh
@@ -32,6 +32,8 @@
 Patch3:         gedit-03-clipboard-editability.diff 
 # date:2010-03-15 owner:jouby    type:branding
 Patch4:         gedit-04-autoconf-version.diff 
+# date:2010-04-22 owner:chrisk type:bug
+Patch5:         gedit-05-lt-init.diff
 URL:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Docdir:         %{_docdir}/doc
@@ -83,6 +85,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %ifos linux
@@ -165,6 +168,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Apr 22 2010 - [email protected]
+- Bump to 2.30.2.
+- Add gedit-05-lt-init.diff to disable 'tests' and remove some LT_PREREQ and 
+  LT_INIT from configure.ac.
 * Wen Mar 03 2010 - [email protected]
 - Bump to 2.29.8
 * Mon Feb 15 2010 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gedit-05-lt-init.diff	Thu Apr 22 15:04:45 2010 +0000
@@ -0,0 +1,26 @@
+diff -ruN gedit-2.30.2.orig/configure.ac gedit-2.30.2/configure.ac
+--- gedit-2.30.2.orig/configure.ac      2010-04-22 15:42:10.828298608 +0100
++++ gedit-2.30.2/configure.ac   2010-04-22 15:41:53.799049461 +0100
+@@ -36,8 +36,8 @@
+ AC_PROG_OBJC
+ 
+ # Initialize libtool
+-LT_PREREQ([2.2.6])
+-LT_INIT(disable-static)
++#LT_PREREQ([2.2.6])
++#LT_INIT(disable-static)
+ 
+ GEDIT_API_VERSION=2.20
+ AC_SUBST(GEDIT_API_VERSION)
+diff -ruN gedit-2.30.2.orig/Makefile.am gedit-2.30.2/Makefile.am
+--- gedit-2.30.2.orig/Makefile.am       2010-04-22 15:51:45.994908303 +0100
++++ gedit-2.30.2/Makefile.am    2010-04-22 15:52:00.187062829 +0100
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = gedit pixmaps po data plugin-loaders plugins docs tests win32 osx
++SUBDIRS = gedit pixmaps po data plugin-loaders plugins docs win32 osx
+ 
+ if !OS_OSX
+ SUBDIRS += help

--- a/specs/SUNWgnome-text-editor.spec	Thu Apr 22 14:55:49 2010 +0000
+++ b/specs/SUNWgnome-text-editor.spec	Thu Apr 22 15:04:45 2010 +0000
@@ -107,6 +107,8 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/omf/*/*-[a-z]*.omf
 %endif
 
+find $RPM_BUILD_ROOT -name "*.a" -exec rm {} \;
+
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
 
 %clean
@@ -171,6 +173,8 @@
 %{_includedir}/*
 
 %changelog
+* Thu Apr 22 2010 - [email protected]
+- Remove .a files.
 * Mon Jan 18 2010 - [email protected]
 - Bump to 2.29.4
 * Mon Dec 21 2009 - [email protected]