rpms/java-gnome/devel java-gnome-fedorajpkg-compat.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 java-gnome.spec, 1.1, 1.2 sources, 1.2, 1.3

[abo]

Author: abo

Update of /cvs/pkgs/rpms/java-gnome/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv690

Modified Files:
	.cvsignore java-gnome.spec sources 
Added Files:
	java-gnome-fedorajpkg-compat.patch 
Log Message:
update to 4.0.16 etc


java-gnome-fedorajpkg-compat.patch:
 configure |   28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

--- NEW FILE java-gnome-fedorajpkg-compat.patch ---
=== 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//;



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-gnome/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Apr 2010 19:00:16 -0000	1.2
+++ .cvsignore	22 Jun 2010 06:11:28 -0000	1.3
@@ -1 +1 @@
-java-gnome-4.0.15.tar.bz2
+java-gnome-4.0.16.tar.bz2


Index: java-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-gnome/devel/java-gnome.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- java-gnome.spec	21 Apr 2010 19:00:16 -0000	1.1
+++ java-gnome.spec	22 Jun 2010 06:11:28 -0000	1.2
@@ -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 at 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 at root.snowtree.se> - 4.0.15-3
 - add back the jar symlink
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-gnome/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Apr 2010 19:00:16 -0000	1.2
+++ sources	22 Jun 2010 06:11:28 -0000	1.3
@@ -1 +1 @@
-613492d9d1640213701f5d3e566a06df  java-gnome-4.0.15.tar.bz2
+c95a24124f2af781230d3cf64e48ce7a  java-gnome-4.0.16.tar.bz2