[libgnome-java/f14/master] update to 2.12.7

[Tom Callaway]

commit 39399fa5369be730f4d35b8fee5745d200006bb3
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Sun Sep 19 13:14:42 2010 +0200

    update to 2.12.7

 libgnome-java-gjavah.patch |   34 ++++++++++++++++++----------------
 libgnome-java.spec         |   29 +++++++++++++----------------
 sources                    |    2 +-
 3 files changed, 32 insertions(+), 33 deletions(-)
---
diff --git a/libgnome-java-gjavah.patch b/libgnome-java-gjavah.patch
index b12ab94..6d9eedd 100644
--- a/libgnome-java-gjavah.patch
+++ b/libgnome-java-gjavah.patch
@@ -1,6 +1,19 @@
---- ./configure.orig	2006-08-03 06:34:18.000000000 +0200
-+++ ./configure	2007-03-05 20:00:16.686278000 +0100
-@@ -22210,7 +22210,7 @@
+diff -up libgnome-java-2.12.7/configure.ac.gjavah libgnome-java-2.12.7/configure.ac
+--- libgnome-java-2.12.7/configure.ac.gjavah	2007-01-05 13:54:03.000000000 +0100
++++ libgnome-java-2.12.7/configure.ac	2010-09-19 11:55:55.073255003 +0200
+@@ -54,7 +54,7 @@ PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 
+ AC_SUBST(GNOME_CFLAGS)
+ AC_SUBST(GNOME_LIBS)
+ 
+-AC_CHECK_PROGS([JAVAH], ["gcjh -jni" "javah"], [gcjh -jni])
++AC_CHECK_PROGS([JAVAH], ["gjavah -jni" "javah"], [gjavah -jni])
+ 
+ AC_CONFIG_FILES([Makefile])
+ AC_CONFIG_FILES([gnome2-java.pc])
+diff -up libgnome-java-2.12.7/configure.gjavah libgnome-java-2.12.7/configure
+--- libgnome-java-2.12.7/configure.gjavah	2007-01-05 14:56:05.000000000 +0100
++++ libgnome-java-2.12.7/configure	2010-09-19 11:56:56.671255004 +0200
+@@ -22569,7 +22569,7 @@ fi
  
  
  
@@ -9,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
@@ -17,15 +30,4 @@
 +test -n "$JAVAH" || JAVAH="gjavah -jni"
  
  
-           ac_config_files="$ac_config_files Makefile"
---- ./configure.ac.orig	2006-08-03 05:22:35.000000000 +0200
-+++ ./configure.ac	2007-03-05 20:00:24.901056000 +0100
-@@ -54,7 +54,7 @@
- AC_SUBST(GNOME_CFLAGS)
- AC_SUBST(GNOME_LIBS)
- 
--AC_CHECK_PROGS([JAVAH], ["gcjh -jni" "javah"], [gcjh -jni])
-+AC_CHECK_PROGS([JAVAH], ["gjavah -jni" "javah"], [gjavah -jni])
- 
- AC_CONFIG_FILES([Makefile])
- AC_CONFIG_FILES([gnome2-java.pc])
+ ac_config_files="$ac_config_files Makefile"
diff --git a/libgnome-java.spec b/libgnome-java.spec
index 6c01b68..318a417 100644
--- a/libgnome-java.spec
+++ b/libgnome-java.spec
@@ -14,25 +14,24 @@
 
 Summary:	Java bindings for libgnome
 Name:		%{java_pkg_prefix}%{name_base}	
-Version:	2.12.4
-Release: 	12%{?dist}
+Version:	2.12.7
+Release: 	1%{?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:	libgnomeui >= 2.11.0
 Requires:	libgnomecanvas >= 2.11.0
-Requires:	libgtk-java >= 2.8.6
-Requires: 	glib-java >= 0.2.4
+Requires:	libgtk-java >= 2.10.2
+Requires: 	glib-java >= 0.4.2
 BuildRequires:	libgnomeui-devel >= 2.11.0
 BuildRequires:	libgnomecanvas-devel >= 2.11.0
 BuildRequires:	gcc-java >= 4.1.1, docbook-utils
-BuildRequires:	libgtk-java-devel >= 2.8.6, java-devel >= 1.4.2
-BuildRequires:	glib-java-devel >= 0.2.6
+BuildRequires:	libgtk-java-devel >= 2.10.2, java-devel >= 1.4.2
+BuildRequires:	glib-java-devel >= 0.4.2
 
 %description
 libgnome-java is a language binding that allows developers to write
@@ -53,7 +52,7 @@ Development part of %{name}.
 
 %prep
 %setup -q -n %{name_base}-%{version}
-%patch
+%patch0 -p1 -b .gjavah
 touch aclocal.m4
 touch configure Makefile.in
 
@@ -79,8 +78,6 @@ touch -r ChangeLog src/java/src.zip
 
 
 %install
-rm -rf %{buildroot}
-
 make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
 
 # rename doc dir to reflect package rename, if the names differ
@@ -103,18 +100,15 @@ install -m 644 src/java/src.zip $RPM_BUILD_ROOT%{_datadir}/java/$zipfile
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
 %{_libdir}/libgnomejava-*.so
 %{_libdir}/libgnomejni-*.so
 %{_datadir}/java/*.jar
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc doc/api
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/libgnomejava.so
@@ -122,6 +116,9 @@ rm -rf %{buildroot}
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Sep 19 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.12.7-1
+- update to 2.12.7
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.4-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index ef6da6f..3384689 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-88ce5ef83c81e385aec8fc28bfba31ca  libgnome-java-2.12.4.tar.bz2
+d0ed6451b093c732bbc23484c71bce1a  libgnome-java-2.12.7.tar.bz2