[libgconf-java/f14/master] 2.12.6

[Tom Callaway]

commit de7b894133bdc0bb4ce29144257f5c71f1b9c451
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Thu Sep 30 13:52:17 2010 -0400

    2.12.6

 libgconf-java-gjavah.patch |   18 ++++++++++--------
 libgconf-java.spec         |   19 +++++++++++--------
 sources                    |    2 +-
 3 files changed, 22 insertions(+), 17 deletions(-)
---
diff --git a/libgconf-java-gjavah.patch b/libgconf-java-gjavah.patch
index 6cb2955..eeef90d 100644
--- a/libgconf-java-gjavah.patch
+++ b/libgconf-java-gjavah.patch
@@ -1,6 +1,7 @@
---- ./configure.ac.orig	2006-08-03 04:58:13.000000000 +0200
-+++ ./configure.ac	2007-03-05 20:31:37.959117000 +0100
-@@ -55,7 +55,7 @@
+diff -up libgconf-java-2.12.6/configure.ac.gjavah libgconf-java-2.12.6/configure.ac
+--- libgconf-java-2.12.6/configure.ac.gjavah	2007-01-05 07:58:48.000000000 -0500
++++ libgconf-java-2.12.6/configure.ac	2010-09-22 15:30:07.875185001 -0400
+@@ -55,7 +55,7 @@ PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.
  AC_SUBST(GCONF_CFLAGS)
  AC_SUBST(GCONF_LIBS)
  
@@ -9,9 +10,10 @@
  
  AC_CONFIG_FILES([Makefile])
  AC_CONFIG_FILES([gconf-java.pc])
---- ./configure.orig	2006-08-03 08:52:30.000000000 +0200
-+++ ./configure	2007-03-05 20:31:31.442642000 +0100
-@@ -22210,7 +22210,7 @@
+diff -up libgconf-java-2.12.6/configure.gjavah libgconf-java-2.12.6/configure
+--- libgconf-java-2.12.6/configure.gjavah	2007-01-05 09:06:02.000000000 -0500
++++ libgconf-java-2.12.6/configure	2010-09-22 15:30:31.139185002 -0400
+@@ -22569,7 +22569,7 @@ fi
  
  
  
@@ -20,7 +22,7 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
-@@ -22249,7 +22249,7 @@
+@@ -22610,7 +22610,7 @@ fi
  
    test -n "$JAVAH" && break
  done
@@ -28,4 +30,4 @@
 +test -n "$JAVAH" || JAVAH="gjavah -jni"
  
  
-           ac_config_files="$ac_config_files Makefile"
+ ac_config_files="$ac_config_files Makefile"
diff --git a/libgconf-java.spec b/libgconf-java.spec
index 4162117..5dfdc1d 100644
--- a/libgconf-java.spec
+++ b/libgconf-java.spec
@@ -2,19 +2,19 @@
 
 Summary:	Java bindings for GConf
 Name:		%{name_base}
-Version:	2.12.4
-Release: 	15%{?dist}.1
+Version:	2.12.6
+Release: 	2%{?dist}
 License:	LGPLv2
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
 Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.12/%{name_base}-%{version}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Patch:		%{name}-gjavah.patch
+Patch0:		%{name}-gjavah.patch
 
 Requires:	GConf2 >= 2.11.2
-Requires:	glib-java >= 0.2.6
-BuildRequires:	glib-java-devel >= 0.2.6
+Requires:	glib-java >= 0.4.2
+BuildRequires:	glib-java-devel >= 0.4.2
 BuildRequires:  GConf2-devel >= 2.11.2, gcc-java >= 4.1.1
 BuildRequires:  docbook-utils
 # We need javadoc:
@@ -22,7 +22,7 @@ BuildRequires:	java-devel
 
 # Currently, the configure script checks for libgtk-java.
 # See gnome bugs #347254, #350931
-BuildRequires:	libgtk-java-devel >= 2.8.4
+BuildRequires:	libgtk-java-devel >= 2.10.2
 
 %description
 libgconf-java is a language binding that allows developers to use the
@@ -40,7 +40,7 @@ Development part of %{name}.
 
 %prep
 %setup -q -n %{name_base}-%{version}
-%patch
+%patch0 -p1 -b .gjavah
 touch aclocal.m4
 touch configure Makefile.in
 
@@ -105,9 +105,12 @@ rm -rf %{buildroot}
 %{_datadir}/java/*.zip
 
 %changelog
-* Wed Sep 29 2010 jkeating - 2.12.4-15.1
+* Wed Sep 29 2010 jkeating - 2.12.6-2
 - Rebuilt for gcc bug 634757
 
+* Wed Sep 22 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.12.6-1
+- update to 2.12.6
+
 * Wed Aug 25 2010 Adam Tkac <atkac redhat com> - 2.12.4-15
 - rebuild against new libgcj
 
diff --git a/sources b/sources
index 168ffa2..1039e89 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac9f8e35999cedcb2e9009032f0fe256  libgconf-java-2.12.4.tar.bz2
+9e7081679c31abf946c2071fe8ca1895  libgconf-java-2.12.6.tar.bz2