rpms/libgtk-java/devel libgtk-java.spec,1.51,1.52

[fedora-cvs-commits at redhat.com]

Author: skasal

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

Modified Files:
	libgtk-java.spec 
Log Message:
- Fix a typo in the Makefile.jni snippet.
- Re-run autotools.



Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- libgtk-java.spec	10 May 2006 18:45:14 -0000	1.51
+++ libgtk-java.spec	11 May 2006 17:19:17 -0000	1.52
@@ -13,7 +13,7 @@
 
 %define	name_base 	libgtk-java
 %define	version		2.8.4
-%define release 	1
+%define release 	2
 
 
 Summary:	Java bindings for GTK+
@@ -38,6 +38,7 @@
 BuildRequires:  %{java_pkg_prefix}glib-java-devel >= 0.2.4
 BuildRequires:  %{c_pkg_prefix}gtk2-devel >= 2.8.0
 BuildRequires:  java-devel >= 1.4.2, gcc-java >= 3.3.3, docbook-utils
+BuildRequires:	autoconf automake
 
 # ExcludeArch: s390x
 
@@ -59,9 +60,10 @@
 %setup -q -n %{name_base}-%{version}
 
 %patch1
-# Patch1 added a *.c file, so we have to refresh Makefile.jni, which is
-# included in Makefile.am; the automake generated rules ensure that Makefile.in
-# and Makefile will be refreshed later.
+%patch2
+%patch3
+
+# Patch1 added a *.c file, so we have to refresh Makefile.jni.
 find src/jni -name '[a-zA-Z]*.c' ! -name 'gtk_java.c' | sort |
   while read f ; do
     : Suppress the long trace.
@@ -73,16 +75,19 @@
     cat <<EOF
 jni_gtk_source_files += $f
 $h: src/java/`echo $b | sed -e 's,_,/,g'`.class
-        \$(JAVAH) -o \$@ -classpath \$(CLASSPATH):src/java $c
+	\$(JAVAH) -o \$@ -classpath \$(CLASSPATH):src/java $c
 $d/$b.lo: $h
 CLEANFILES += $h
 EOF
 done > Makefile.jni
 
-%patch2
-%patch3
 
 %build 
+# Re-run automake, we have changed Makefile.jni:
+aclocal -I %{_datadir}/glib-java/macros
+autoconf
+automake
+
 # if either the C or Java packages has a prefix declared, then we will
 # add /opt/frysk/lib/pkgconfig to the pkgconfig path
 if  [  'x%{java_pkg_prefix}' != 'x' ] || [ 'x%{c_pkg_prefix}' != 'x' ]; then
@@ -151,6 +156,10 @@
 
 
 %changelog
+* Thu May 11 2006 Stepan Kasal <skasal at redhat.com>    - 2.8.4-2
+- Fix a typo in the Makefile.jni snippet.
+- Re-run autotools.
+
 * Wed May 10 2006 Stepan Kasal <skasal at redhat.com>    - 2.8.4-1
 - Incorporated the three patches to the spec file.
 - Removed Makefile.jni from the cellrenderer patch.