rpms/libgtk-java/devel .cvsignore, 1.17, 1.18 libgtk-java.spec, 1.46, 1.47 sources, 1.17, 1.18 GdkCairoFix.patch, 1.1, NONE libgtk-java-glib-timer-gc.patch, 1.2, NONE

[fedora-cvs-commits at redhat.com]

Author: skasal

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

Modified Files:
	.cvsignore libgtk-java.spec sources 
Removed Files:
	GdkCairoFix.patch libgtk-java-glib-timer-gc.patch 
Log Message:
* Fri Apr 28 2006 Stepan Kasal <skasal at redhat.com>    - 2.8.4-0
- New version, which integrates both patches.
- Remove the patches.
- Try to build on s390x again.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Mar 2006 21:35:17 -0000	1.17
+++ .cvsignore	28 Apr 2006 21:18:53 -0000	1.18
@@ -1,3 +1 @@
-libgtk-java-2.8.2.tar.gz
-libgtk-java-2.8.3.tar.gz
-libgtk-java-2.8.3.0.20060301.rh1.tar.gz
+libgtk-java-2.8.4.tar.gz


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- libgtk-java.spec	15 Mar 2006 16:15:37 -0000	1.46
+++ libgtk-java.spec	28 Apr 2006 21:18:53 -0000	1.47
@@ -12,8 +12,8 @@
 
 
 %define	name_base 	libgtk-java
-%define	version		2.8.3.0.20060301.rh1
-%define release 	2
+%define	version		2.8.4
+%define release 	0
 
 
 Summary:	Java bindings for GTK+
@@ -28,19 +28,14 @@
 BuildRoot:	%{_tmppath}/%{name_base}-%{version}-root
 
 Requires:	%{c_pkg_prefix}gtk2 >= 2.8.0
-Requires:	%{java_pkg_prefix}cairo-java >= 1.0.2.0.20060301.rh1
-Requires:       %{java_pkg_prefix}glib-java >= 0.2.3.0.20060301.rh1
-BuildRequires:  %{java_pkg_prefix}cairo-java-devel >= 1.0.0
-BuildRequires:  %{java_pkg_prefix}glib-java-devel >= 0.2.3
+Requires:	%{java_pkg_prefix}cairo-java >= 1.0.3
+Requires:       %{java_pkg_prefix}glib-java >= 0.2.4
+BuildRequires:  %{java_pkg_prefix}cairo-java-devel >= 1.0.3
+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
 
-# patch that fixes occaision NPE in GdkCairo
-Patch0: GdkCairoFix.patch
-# fixes: http://sourceware.org/bugzilla/show_bug.cgi?id=2333
-Patch10: libgtk-java-glib-timer-gc.patch
-
-ExcludeArch: s390x
+# ExcludeArch: s390x
 
 %description
 libgtk-java is a language binding that allows developers to write GTK
@@ -58,8 +53,6 @@
 %prep
 
 %setup -q -n %{name_base}-%{version}
-%patch0
-%patch10
 
 %build 
 # if either the C or Java packages has a prefix declared, then we will
@@ -130,6 +123,11 @@
 
 
 %changelog
+* Fri Apr 28 2006 Stepan Kasal <skasal at redhat.com>    - 2.8.4-0
+- New version, which integrates both patches.
+- Remove the patches.
+- Try to build on s390x again.
+
 * Wed Mar 15 2006 Phil Muldoon <pmuldoon at redhat.com> - 2.8.3.020060301.rh1-2
 - Added libgtk-java-glib-timer-gc.patch to fix double free on Timer GC
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	1 Mar 2006 21:35:17 -0000	1.17
+++ sources	28 Apr 2006 21:18:53 -0000	1.18
@@ -1 +1 @@
-629c1c2b5f8398154a04a081539ad21f  libgtk-java-2.8.3.0.20060301.rh1.tar.gz
+6fc73a343879ba3a13b9a827a67400fb  libgtk-java-2.8.4.tar.gz


--- GdkCairoFix.patch DELETED ---


--- libgtk-java-glib-timer-gc.patch DELETED ---