[cairo-java/f14/master] update to 1.0.8

[Tom Callaway]

commit 98e9e83aa15a40a50cc84ed86bd42b512ccc221d
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Sun Sep 19 13:04:11 2010 +0200

    update to 1.0.8

 cairo-java-gjavah.patch |   34 ++++++++++++++++++----------------
 cairo-java.spec         |   23 ++++++++++-------------
 sources                 |    2 +-
 3 files changed, 29 insertions(+), 30 deletions(-)
---
diff --git a/cairo-java-gjavah.patch b/cairo-java-gjavah.patch
index 6ac04f9..1b5ff76 100644
--- a/cairo-java-gjavah.patch
+++ b/cairo-java-gjavah.patch
@@ -1,6 +1,19 @@
---- configure.orig	2007-02-21 11:54:13.000000000 -0500
-+++ configure	2007-02-21 11:54:28.000000000 -0500
-@@ -22154,7 +22154,7 @@
+diff -up cairo-java-1.0.8/configure.ac.gjavah cairo-java-1.0.8/configure.ac
+--- cairo-java-1.0.8/configure.ac.gjavah	2007-01-05 13:54:18.000000000 +0100
++++ cairo-java-1.0.8/configure.ac	2010-09-19 11:17:40.700919998 +0200
+@@ -73,7 +73,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6.
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+ 
+-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([cairo-java.pc])
+diff -up cairo-java-1.0.8/configure.gjavah cairo-java-1.0.8/configure
+--- cairo-java-1.0.8/configure.gjavah	2007-01-05 14:24:47.000000000 +0100
++++ cairo-java-1.0.8/configure	2010-09-19 11:18:11.652919999 +0200
+@@ -22511,7 +22511,7 @@ fi
  
  
  
@@ -9,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
-@@ -22193,7 +22193,7 @@
+@@ -22552,7 +22552,7 @@ fi
  
    test -n "$JAVAH" && break
  done
@@ -17,15 +30,4 @@
 +test -n "$JAVAH" || JAVAH="gjavah -jni"
  
  
-           ac_config_files="$ac_config_files Makefile"
---- configure.ac.orig	2007-02-21 11:54:16.000000000 -0500
-+++ configure.ac	2007-02-21 11:54:34.000000000 -0500
-@@ -73,7 +73,7 @@
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
- 
--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([cairo-java.pc])
+ ac_config_files="$ac_config_files Makefile"
diff --git a/cairo-java.spec b/cairo-java.spec
index 726cd09..b918952 100644
--- a/cairo-java.spec
+++ b/cairo-java.spec
@@ -1,18 +1,17 @@
 Summary:	Java bindings for the Cairo library
 Name:		cairo-java
-Version:	1.0.5
-Release: 	13%{?dist}
+Version:	1.0.8
+Release: 	1%{?dist}
 License:	LGPLv2
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
 Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-gjavah.patch
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	fontconfig >= 2.3.1
 Requires: 	cairo >= 1.0.0
-Requires: 	glib-java >= 0.2.6
-BuildRequires:	glib-java-devel >= 0.2.6
+Requires: 	glib-java >= 0.4.2
+BuildRequires:	glib-java-devel >= 0.4.2
 BuildRequires:	fontconfig-devel >= 2.3.1
 BuildRequires:	cairo-devel >= 1.0.0
 BuildRequires:	gcc-java >= 3.3.3
@@ -41,7 +40,7 @@ Development part of %{name}.
 %prep
 
 %setup -q -n %{name}-%{version}
-%patch0 -p0
+%patch0 -p1 -b .gjavah
 touch aclocal.m4
 touch configure Makefile.in
 
@@ -61,8 +60,6 @@ touch -r ChangeLog src/java/src.zip
 
 
 %install
-rm -rf %{buildroot}
-
 make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
 
 # Remove unpackaged files:
@@ -82,18 +79,15 @@ install -m 644 src/java/src.zip $RPM_BUILD_ROOT%{_datadir}/java/$zipfile
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README NEWS 
 %{_libdir}/libcairojava-*.so
 %{_libdir}/libcairojni-*.so
 %{_datadir}/java/*.jar
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc doc/api
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/libcairojava.so
@@ -102,6 +96,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 19 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.8-1
+- update to 1.0.8
+
 * Wed Aug 25 2010 Adam Tkac <atkac redhat com> - 1.0.5-13
 - rebuild against new libgcj
 
diff --git a/sources b/sources
index 91310ca..5007f0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e532ab7d4afe681cfec3b70132d7a80  cairo-java-1.0.5.tar.bz2
+857c194452f6762f17e352a21b33046f  cairo-java-1.0.8.tar.bz2