rpms/libgtk-java/devel libgtk-java-gjavah.patch, NONE, 1.1 libgtk-java.spec, 1.71, 1.72

[fedora-cvs-commits at redhat.com]

Author: overholt

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14089

Modified Files:
	libgtk-java.spec 
Added Files:
	libgtk-java-gjavah.patch 
Log Message:
* Wed Feb 21 2007 Andrew Overholt <overholt at redhat.com> 2.8.7-3
- Add patch for gcjh -> gjavah.


libgtk-java-gjavah.patch:
 configure    |    4 ++--
 configure.ac |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE libgtk-java-gjavah.patch ---
--- configure.orig	2007-02-21 11:58:37.000000000 -0500
+++ configure	2007-02-21 11:58:53.000000000 -0500
@@ -22492,7 +22492,7 @@
 
 
 
-for ac_prog in "gcjh -jni" "javah"
+for ac_prog in "gjavah -jni" "javah"
 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 @@
 
   test -n "$JAVAH" && break
 done
-test -n "$JAVAH" || JAVAH="gcjh -jni"
+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])


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- libgtk-java.spec	21 Feb 2007 16:09:15 -0000	1.71
+++ libgtk-java.spec	21 Feb 2007 17:00:47 -0000	1.72
@@ -24,6 +24,7 @@
 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
+Patch1:		%{name}-gjavah.patch
 
 BuildRoot:	%{_tmppath}/%{name_base}-%{version}-root
 
@@ -54,6 +55,7 @@
 
 %setup -q -n %{name_base}-%{version}
 %patch0
+%patch1
 
 %build 
 # if either the C or Java packages has a prefix declared, then we will
@@ -125,6 +127,7 @@
 %changelog
 * Wed Feb 21 2007 Andrew Overholt <overholt at redhat.com> 2.8.7-3
 - Rebuild for new gcj.
+- Add patch for gcjh -> gjavah.
 
 * Tue Oct 26 2006 Andrew Cagney <cagney at redhat.com> - 2.8.7-2
 - Fix Drawwable.c so that regions are eventually free'd using