--- a/libglade.spec	Thu Aug 11 18:30:17 2005 +0000
+++ b/libglade.spec	Thu Aug 11 18:34:53 2005 +0000
@@ -1,22 +1,27 @@
+#
+# spec file for package libglade
+#
+# Copyright (c) 2005 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
 Name:         libglade
 License:      LGPL
 Group:        System/Libraries/GNOME
-Version:      2.3.6
-Release:      38
-Distribution: Java Desktop System, Release 3
+Version:      2.5.1
+Release:      1
+Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      Library for loading GLADE interfaces at runtime
-Source:       http://ftp.gnome.org/pub/GNOME/sources/libglade/2.3/libglade-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/libglade/2.5/libglade-%{version}.tar.bz2
 Source1:      libglade-2.0.3.gz
-Source2:      l10n-configure.sh
-Patch:        libglade-01-uninstalled-pc.diff
 URL:          http://www.daa.com.au/~james/gnome/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
 Autoreqprov:  on
 Prereq:       /sbin/ldconfig
 
-%define gtk2_version 2.4.0
+%define gtk2_version 2.5.0
 %define libxml2_version 2.6.7
 %define python_xml_version 2.3.3 
 
@@ -42,7 +47,6 @@
 
 %prep
 %setup -q
-%patch -p1
 
 %ifos solaris
 %ifarch amd64 sparcv9
@@ -52,7 +56,6 @@
 %endif
 
 
-bash -x %SOURCE2
 
 %build
 %ifos linux
@@ -84,7 +87,7 @@
 export PATH=$ccdir:$PATH
 
 libtoolize --force
-aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros
+aclocal $ACLOCAL_FLAGS -I ./m4
 automake -a -c -f
 autoconf
 ./configure $CONFLAGS					\
@@ -109,7 +112,7 @@
 %endif
 
 libtoolize --force
-aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros
+aclocal $ACLOCAL_FLAGS -I ./m4
 automake -a -c -f
 autoconf
 CFLAGS="$RPM_OPT_FLAGS"				\
@@ -157,10 +160,17 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri May 06 2005 - [email protected]
+- Add "-I ./m4" to the ACLOCAL_FLAGS since it is needed to build
+  on Solaris.
+
+* Fri May 05 2005 - [email protected]
+- Bump to 2.5.1
+
 * Fri Oct 29 2004 - [email protected]
 - use $CC64 for the 64-bit build if defined
 
-* Sat Oct  2 2004 - [email protected]
+* Sat Oct 02 2004 - [email protected]
 - Create 64bit libraries for Solaris
 
 * Wed Aug 18 2004 - [email protected]