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

[abo]

Author: abo

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

Modified Files:
	java-gnome-fedorajpkg-compat.patch java-gnome.spec 
Log Message:
rebase configure patch

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

Index: java-gnome-fedorajpkg-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-gnome/devel/java-gnome-fedorajpkg-compat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- java-gnome-fedorajpkg-compat.patch	22 Jun 2010 06:11:28 -0000	1.1
+++ java-gnome-fedorajpkg-compat.patch	17 Jul 2010 12:42:26 -0000	1.2
@@ -1,6 +1,5 @@
-=== modified file 'configure'
---- configure	2010-06-18 04:23:36 +0000
-+++ configure	2010-06-20 22:57:37 +0000
+--- configure	2010-06-17 02:13:17.000000000 +0200
++++ configure.fedjpkgcompat	2010-07-17 14:08:10.952997785 +0200
 @@ -623,7 +623,7 @@
  	# and Ubuntu
  	$os = "debian";
@@ -10,10 +9,10 @@
  	$os = "fedora";
  } elsif ( -f "/etc/SuSE-release" ) {
  	output "Open SuSE";
-@@ -645,6 +645,15 @@
- } elsif ( -f "/usr/bin/cygwin1.dll" ) {
- 	output "Cygwin";
- 	$os = "cygwin";
+@@ -642,6 +642,15 @@
+ } elsif ( -f "/etc/slackware-version" ) {
+ 	output "Slackware";
+ 	$os = "slackware";
 +} elsif ( -f "/etc/centos-release" ) {
 +	output "CentOS";
 +	$os = "fedora";
@@ -26,7 +25,7 @@
  }
  
  if ($os) {
-@@ -1155,11 +1164,11 @@
+@@ -1146,11 +1155,11 @@
  		$javadoc_candidate = "$jdk_home/bin/javadoc";
  		$vendor = "Specified";
  	} else {
@@ -43,7 +42,7 @@
  	}
  	check_compiler($javac, "$vendor javac", $javac_candidate, "-g -source 1.5 -target 1.5");
  
-@@ -1564,8 +1573,8 @@
+@@ -1515,8 +1524,8 @@
  		$java_candidate = "$jdk_home/bin/java";
  		$vendor = "Specified";
  	} else {
@@ -54,7 +53,7 @@
  	}
  	check_runtime($java, "$vendor java VM", $java_candidate, "-client -ea");
  
-@@ -2090,6 +2099,9 @@
+@@ -1998,6 +2007,9 @@
  	my $jni_include = "";
  	my $java_home = dirname($java);
  	$java_home =~ s/\/bin$//;
@@ -64,4 +63,3 @@
  
  	if (!-d "$java_home"."/include") {
  		$java_home =~ s/\/jre//;
-


Index: java-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-gnome/devel/java-gnome.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- java-gnome.spec	22 Jun 2010 06:11:28 -0000	1.2
+++ java-gnome.spec	17 Jul 2010 12:42:26 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:	Java GNOME bindings
 Name:		java-gnome
 Version:	4.0.16
-Release:	1%{?dist}
+Release:	2%{?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.
@@ -31,9 +31,6 @@ BuildRequires:	xorg-x11-server-Xvfb
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils
 # 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
@@ -108,6 +105,9 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Sat Jul 17 2010 Alexander Boström <abo at root.snowtree.se> - 4.0.16-2
+- rebase configure patch
+
 * 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