[libgtk-java/f14/master] update to 2.10.2

[Tom Callaway]

commit c9d1947e5504164ed6ff0f29a74cf4f7b0927cae
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Sun Sep 19 13:09:11 2010 +0200

    update to 2.10.2

 libgtk-java-gjavah.patch |   34 ++++++++++++++++++----------------
 libgtk-java.spec         |   37 ++++++++++++++++---------------------
 sources                  |    2 +-
 3 files changed, 35 insertions(+), 38 deletions(-)
---
diff --git a/libgtk-java-gjavah.patch b/libgtk-java-gjavah.patch
index a704fec..1778a98 100644
--- a/libgtk-java-gjavah.patch
+++ b/libgtk-java-gjavah.patch
@@ -1,6 +1,19 @@
---- configure.orig	2007-02-21 11:58:37.000000000 -0500
-+++ configure	2007-02-21 11:58:53.000000000 -0500
-@@ -22492,7 +22492,7 @@
+diff -up libgtk-java-2.10.2/configure.ac.gjavah libgtk-java-2.10.2/configure.ac
+--- libgtk-java-2.10.2/configure.ac.gjavah	2007-01-05 13:48:50.000000000 +0100
++++ libgtk-java-2.10.2/configure.ac	2010-09-18 17:28:36.256919999 +0200
+@@ -82,7 +82,7 @@ fi
+ AC_SUBST(PLATFORM_VERSION)
+ AC_SUBST(PLATFORM_LIBRARY)
+ 
+-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([gtk2-java.pc])
+diff -up libgtk-java-2.10.2/configure.gjavah libgtk-java-2.10.2/configure
+--- libgtk-java-2.10.2/configure.gjavah	2007-01-05 14:27:12.000000000 +0100
++++ libgtk-java-2.10.2/configure	2010-09-18 17:28:54.538920000 +0200
+@@ -22927,7 +22927,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
-@@ -22531,7 +22531,7 @@
+@@ -22968,7 +22968,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	2007-02-21 11:58:43.000000000 -0500
-+++ configure.ac	2007-02-21 11:58:56.000000000 -0500
-@@ -83,7 +83,7 @@
- AC_SUBST(PLATFORM_VERSION)
- AC_SUBST(PLATFORM_LIBRARY)
- 
--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([gtk2-java.pc])
+ ac_config_files="$ac_config_files Makefile"
diff --git a/libgtk-java.spec b/libgtk-java.spec
index 0c349b7..e89555c 100644
--- a/libgtk-java.spec
+++ b/libgtk-java.spec
@@ -17,24 +17,22 @@
 
 Summary:	Java bindings for GTK+
 Name:		%{java_pkg_prefix}%{name_base}
-Version:	2.8.7
-Release: 	14%{?dist}
+Version:	2.10.2
+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.8/%{name_base}-%{version}.tar.bz2
-Patch0:		libgtk-java-Drawable-region.patch
+Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.10/%{name_base}-%{version}.tar.bz2
 Patch1:		%{name}-gjavah.patch
 Patch2:		%{name}-gslice.patch
 Patch3:		%{name}-multilib.patch
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-Requires:	%{c_pkg_prefix}gtk2 >= 2.8.0
-Requires:	%{java_pkg_prefix}cairo-java >= 1.0.5
-Requires:	%{java_pkg_prefix}glib-java >= 0.2.6
-BuildRequires:  %{java_pkg_prefix}cairo-java-devel >= 1.0.5
-BuildRequires:  %{java_pkg_prefix}glib-java-devel >= 0.2.6
-BuildRequires:  %{c_pkg_prefix}gtk2-devel >= 2.8.0
+
+Requires:	%{c_pkg_prefix}gtk2 >= 2.10.0
+Requires:	%{java_pkg_prefix}cairo-java >= 1.0.8
+Requires:	%{java_pkg_prefix}glib-java >= 0.4.2
+BuildRequires:  %{java_pkg_prefix}cairo-java-devel >= 1.0.8
+BuildRequires:  %{java_pkg_prefix}glib-java-devel >= 0.4.2
+BuildRequires:  %{c_pkg_prefix}gtk2-devel >= 2.10.0
 BuildRequires:  java-devel >= 1.4.2, gcc-java >= 4.1.1, docbook-utils
 
 %description
@@ -55,8 +53,7 @@ Development part of %{name}.
 %prep
 
 %setup -q -n %{name_base}-%{version}
-%patch0
-%patch1
+%patch1 -p1 -b .gjavah
 %patch2 -b .gslice
 %patch3 -p1
 touch aclocal.m4
@@ -86,8 +83,6 @@ touch -r ChangeLog src/java/src.zip
 find doc -type f -newer ChangeLog | xargs touch -r ChangeLog
 
 %install
-rm -rf %{buildroot}
-
 # The script runExample.sh is both in example_SRCIPTS and example_DATA,
 # which is unhealthy.
 make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT example_DATA= install
@@ -112,11 +107,8 @@ 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 README NEWS THANKS doc/FAQ.html
 %dir %{_includedir}/%{name_base}
 %{_includedir}/%{name_base}/*
@@ -127,7 +119,7 @@ rm -rf %{buildroot}
 %{_datadir}/%{name_base}/*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc doc/api doc/examples
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/libgtkjava.so
@@ -136,6 +128,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 18 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.10.2-1
+- update to 2.10.2
+
 * Wed Aug 25 2010 Adam Tkac <atkac redhat com> - 2.8.7-14
 - rebuild against new libgcj
 
diff --git a/sources b/sources
index 27a904f..cfb91c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd439b47c0b66f08077568bb1515568b  libgtk-java-2.8.7.tar.bz2
+b953f9e106727028ab6ca025357212f0  libgtk-java-2.10.2.tar.bz2