From 03b2e58979f10b0b663deb8ccef09105d1a1b184 Mon Sep 17 00:00:00 2001
From: abo <abo@fedoraproject.org>
Date: Jun 22 2010 06:11:28 +0000
Subject: update to 4.0.16 etc


---

diff --git a/.cvsignore b/.cvsignore
index b845253..dba1fcf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-java-gnome-4.0.15.tar.bz2
+java-gnome-4.0.16.tar.bz2
diff --git a/java-gnome-fedorajpkg-compat.patch b/java-gnome-fedorajpkg-compat.patch
new file mode 100644
index 0000000..daefdd8
--- /dev/null
+++ b/java-gnome-fedorajpkg-compat.patch
@@ -0,0 +1,67 @@
+=== modified file 'configure'
+--- configure	2010-06-18 04:23:36 +0000
++++ configure	2010-06-20 22:57:37 +0000
+@@ -623,7 +623,7 @@
+ 	# and Ubuntu
+ 	$os = "debian";
+ } elsif ( -f "/etc/fedora-release" ) {
+-	output "Fedora Core";
++	output "Fedora";
+ 	$os = "fedora";
+ } elsif ( -f "/etc/SuSE-release" ) {
+ 	output "Open SuSE";
+@@ -645,6 +645,15 @@
+ } elsif ( -f "/usr/bin/cygwin1.dll" ) {
+ 	output "Cygwin";
+ 	$os = "cygwin";
++} elsif ( -f "/etc/centos-release" ) {
++	output "CentOS";
++	$os = "fedora";
++} elsif ( -f "/etc/redhat-release" ) {
++	output "RedHat";
++	$os = "fedora";
++} elsif ( -f "/etc/java/jpackage-release" ) {
++	output "JPackage";
++	$os = "fedora";
+ }
+ 
+ if ($os) {
+@@ -1155,11 +1164,11 @@
+ 		$javadoc_candidate = "$jdk_home/bin/javadoc";
+ 		$vendor = "Specified";
+ 	} else {
+-		$javac_candidate = "/usr/lib/jvm/java-ibm/bin/javac";
+-		$javah_candidate = "/usr/lib/jvm/java-ibm/bin/javah";
+-		$jar_candidate = "/usr/lib/jvm/java-ibm/bin/jar";
+-		$javadoc_candidate = "/usr/lib/jvm/java-ibm/bin/javadoc";
+-		$vendor = "IBM";
++		$javac_candidate = "/usr/bin/javac";
++		$javah_candidate = "/usr/bin/javah";
++		$jar_candidate = "/usr/bin/jar";
++		$javadoc_candidate = "/usr/bin/javadoc";
++		$vendor = "System Default";
+ 	}
+ 	check_compiler($javac, "$vendor javac", $javac_candidate, "-g -source 1.5 -target 1.5");
+ 
+@@ -1564,8 +1573,8 @@
+ 		$java_candidate = "$jdk_home/bin/java";
+ 		$vendor = "Specified";
+ 	} else {
+-		$java_candidate = "/usr/lib/jvm/jre-ibm/bin/java";
+-		$vendor = "IBM";
++		$java_candidate = "/usr/bin/java";
++		$vendor = "System Default";
+ 	}
+ 	check_runtime($java, "$vendor java VM", $java_candidate, "-client -ea");
+ 
+@@ -2090,6 +2099,9 @@
+ 	my $jni_include = "";
+ 	my $java_home = dirname($java);
+ 	$java_home =~ s/\/bin$//;
++	if ($os eq "fedora" && $java_home eq "/usr") {
++	    $java_home = "/usr/lib/jvm/java";
++	}
+ 
+ 	if (!-d "$java_home"."/include") {
+ 		$java_home =~ s/\/jre//;
+
diff --git a/java-gnome.spec b/java-gnome.spec
index 82d59f6..effdf5b 100644
--- a/java-gnome.spec
+++ b/java-gnome.spec
@@ -1,7 +1,7 @@
 Summary:	Java GNOME bindings
 Name:		java-gnome
-Version:	4.0.15
-Release:	3%{?dist}
+Version:	4.0.16
+Release:	1%{?dist}
 URL:		http://java-gnome.sourceforge.net
 Source0:	http://ftp.gnome.org/pub/gnome/sources/java-gnome/4.0/java-gnome-%{version}.tar.bz2
 # This is the "Classpath" exception.
@@ -30,8 +30,11 @@ BuildRequires:	jpackage-utils
 BuildRequires:	xorg-x11-server-Xvfb
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils
-# http://bugzilla.gnome.org/show_bug.cgi?id=523656
-Patch0:	java-gnome-jpackage-compatible-new.patch
+# Pulled from upstream, will be in the next release.
+#  bzr checkout bzr://research.operationaldynamics.com/bzr/java-gnome/mainline/ jgpatch/
+#  cd jgpatch
+#  bzr diff -r 738..739 >java-gnome-fedorajpkg-compat.patch
+Patch0:	java-gnome-fedorajpkg-compat.patch
 
 %description
 These are the Java bindings for GTK and GNOME! Featuring a robust 
@@ -105,6 +108,11 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Tue Jun 22 2010 Alexander Boström <abo@root.snowtree.se> - 4.0.16-1
+- update to 4.0.16
+- simplify the configure script patch
+- pull configure patch from upstream bzr
+
 * Sun Apr 18 2010 Alexander Boström <abo@root.snowtree.se> - 4.0.15-3
 - add back the jar symlink
 
diff --git a/sources b/sources
index 4728e22..eb80e42 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-613492d9d1640213701f5d3e566a06df  java-gnome-4.0.15.tar.bz2
+c95a24124f2af781230d3cf64e48ce7a  java-gnome-4.0.16.tar.bz2