[glib-java] update to 0.4.2

[Tom Callaway]

commit dd66c1c84e3b37188ae22fc432d95a7dead904c4
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Sun Sep 19 13:00:26 2010 +0200

    update to 0.4.2

 glib-java-gjavah.patch |   24 +++++++++++++-----------
 glib-java.spec         |   30 ++++++++++--------------------
 2 files changed, 23 insertions(+), 31 deletions(-)
---
diff --git a/glib-java-gjavah.patch b/glib-java-gjavah.patch
index fd1489d..0d49a5c 100644
--- a/glib-java-gjavah.patch
+++ b/glib-java-gjavah.patch
@@ -1,17 +1,19 @@
---- configure.ac.orig	2007-02-21 11:28:16.000000000 -0500
-+++ configure.ac	2007-02-21 11:29:03.000000000 -0500
-@@ -61,7 +61,7 @@
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
+diff -up glib-java-0.4.2/configure.ac.gjavah glib-java-0.4.2/configure.ac
+--- glib-java-0.4.2/configure.ac.gjavah	2007-01-05 13:42:59.000000000 +0100
++++ glib-java-0.4.2/configure.ac	2010-09-18 17:34:53.124919971 +0200
+@@ -65,7 +65,7 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0 >
+ AC_SUBST(GOBJECT_CFLAGS)
+ AC_SUBST(GOBJECT_LIBS)
  
 -AC_CHECK_PROGS([JAVAH], ["gcjh -jni" "javah"], [gcjh -jni])
-+AC_CHECK_PROGS([JAVAH], ["gjavah -jni" "javah"], [gjavah -jni])
++AC_CHECK_PROGS([JAVAH], ["gjavah -jni" "javah"], [gcjh -jni])
  
  AC_CONFIG_FILES([Makefile])
  AC_CONFIG_FILES([glib-java.pc])
---- configure.orig	2007-02-21 11:28:13.000000000 -0500
-+++ configure	2007-02-21 11:28:40.000000000 -0500
-@@ -22021,7 +22021,7 @@
+diff -up glib-java-0.4.2/configure.gjavah glib-java-0.4.2/configure
+--- glib-java-0.4.2/configure.gjavah	2007-01-05 14:13:51.000000000 +0100
++++ glib-java-0.4.2/configure	2010-09-18 17:35:03.832919999 +0200
+@@ -22475,7 +22475,7 @@ fi
  
  
  
@@ -20,7 +22,7 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
-@@ -22060,7 +22060,7 @@
+@@ -22516,7 +22516,7 @@ fi
  
    test -n "$JAVAH" && break
  done
@@ -28,4 +30,4 @@
 +test -n "$JAVAH" || JAVAH="gjavah -jni"
  
  
-           ac_config_files="$ac_config_files Makefile"
+ ac_config_files="$ac_config_files Makefile"
diff --git a/glib-java.spec b/glib-java.spec
index f98c0c2..cad2bd2 100644
--- a/glib-java.spec
+++ b/glib-java.spec
@@ -1,17 +1,15 @@
 Summary:	Base Library for the Java-GNOME libraries 
 Name:		glib-java
-Version:	0.2.6
-Release:	17%{?dist}
+Version:	0.4.2
+Release:	1%{?dist}
 URL:		http://java-gnome.sourceforge.net
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.2/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-gjavah.patch
 License:	LGPLv2
 Group:		Development/Libraries
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Requires:	/sbin/ldconfig
-Requires:	glib2 >= 2.7.0
-BuildRequires:	java-devel >= 1.4.2 glib2-devel >= 2.7.0
+Requires:	glib2 >= 2.12.0
+BuildRequires:	java-devel >= 1.4.2 glib2-devel >= 2.12.0
 BuildRequires:	gcc-java >= 4.1.1, docbook-utils
 BuildRequires:	pkgconfig
 
@@ -34,9 +32,8 @@ Development part of %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{version}
-
-%patch0 -p0
+%setup -q
+%patch0 -p1 -b .gjavah
 touch aclocal.m4
 touch configure Makefile.in
 
@@ -57,8 +54,6 @@ touch -r ChangeLog src/java/src.zip
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make  DESTDIR=$RPM_BUILD_ROOT  install %{?_smp_mflags}
 
 # Remove unpackaged files:
@@ -74,20 +69,12 @@ install -m 644 src/java/src.zip $RPM_BUILD_ROOT%{_datadir}/java/$zipfile
 (cd $RPM_BUILD_ROOT%{_datadir}/java &&
   ln -sf $zipfile $zipname.zip)
 
-# Is the NEWS file still empty?  See the file list below.
-test -f NEWS -a ! -s NEWS
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig 
 %postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
-# Do not distribute the NEWS file, it is empty.
-%doc AUTHORS ChangeLog COPYING README 
+%doc AUTHORS ChangeLog COPYING README NEWS
 %{_libdir}/libglibjava-*.so
 %{_libdir}/libglibjni-*.so
 %{_datadir}/java/*.jar
@@ -105,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/java/*.zip
 
 %changelog
+* Sat Sep 18 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-1
+- update to 2.4.2
+
 * Fri Aug 20 2010 Adam Tkac <atkac redhat com> - 0.2.6-17
 - rebuild against new libgcj