[java-gnome] Upgrade to 4.1.1 with GNOME 3 support.

[abo]

commit 603c4ab49352e97b4a9f618b660f1a18a292d5c7
Author: Alexander Boström <abo at root.snowtree.se>
Date:   Tue Jul 12 12:12:35 2011 +0200

    Upgrade to 4.1.1 with GNOME 3 support.

 .gitignore                               |    1 +
 java-gnome-4.0.19-libnotify-0.7.patch    |  291 ------------------------------
 java-gnome-4.0.20-libnotify-0.7.patch    |  226 -----------------------
 java-gnome-fedorajpkg-compat.patch       |   65 -------
 java-gnome-jpackage-compatible-new.patch |   89 ---------
 java-gnome.spec                          |   38 ++---
 sources                                  |    2 +-
 7 files changed, 13 insertions(+), 699 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index acf1dc2..014430a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 java-gnome-4.0.16.tar.bz2
 /java-gnome-4.0.19.tar.bz2
 /java-gnome-4.0.20.tar.xz
+/java-gnome-4.1.1.tar.xz
diff --git a/java-gnome.spec b/java-gnome.spec
index d3b7882..2011380 100644
--- a/java-gnome.spec
+++ b/java-gnome.spec
@@ -1,29 +1,26 @@
 Summary:	Java GNOME bindings
 Name:		java-gnome
-Version:	4.0.20
+Version:	4.1.1
 Release:	1%{?dist}
 URL:		http://java-gnome.sourceforge.net
 Source0:	http://ftp.gnome.org/pub/gnome/sources/java-gnome/4.0/java-gnome-%{version}.tar.xz
 # This is the "Classpath" exception.
 License:	GPLv2 with exceptions
 Group:		System Environment/Libraries
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	pkgconfig
 BuildRequires:	pkgconfig(atk)
 BuildRequires:	pkgconfig(cairo-svg)
 BuildRequires:	pkgconfig(enchant)
-BuildRequires:	pkgconfig(gdk-2.0)
+BuildRequires:	pkgconfig(gdk-3.0)
 BuildRequires:	pkgconfig(glib-2.0)
-BuildRequires:	pkgconfig(gtk+-2.0)
-BuildRequires:	pkgconfig(gtk+-unix-print-2.0)
-BuildRequires:	pkgconfig(gtksourceview-2.0)
+BuildRequires:	pkgconfig(gtk+-3.0)
+BuildRequires:	pkgconfig(gtk+-unix-print-3.0)
+BuildRequires:	pkgconfig(gtksourceview-3.0)
 BuildRequires:	pkgconfig(gtkspell-2.0)
-BuildRequires:	pkgconfig(libglade-2.0)
 BuildRequires:	pkgconfig(libnotify)
 BuildRequires:	pkgconfig(pango)
-BuildRequires:	pkgconfig(unique-1.0)
+BuildRequires:	pkgconfig(unique-3.0)
 BuildRequires:	pkgconfig(librsvg-2.0)
-BuildRequires:	pkgconfig(gthread-2.0)
 BuildRequires:	gettext
 BuildRequires:	junit
 BuildRequires:	python
@@ -31,14 +28,6 @@ BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	jpackage-utils
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils
-# A backport from the 4.1 branch, but unfortunately this causes an
-# incompatible change in the gtk-4.0.jar API as it removes the parts
-# that cannot be implemented with libnotify 0.7.
-%if (0%{?fedora} >= 15 || 0%{?rhel} >= 7 || 0%{?fedora}%{?rhel} == 0)
-Patch0:	java-gnome-4.0.20-libnotify-0.7.patch
-%endif
-# Workaround https://bugzilla.redhat.com/show_bug.cgi?id=715804
-Patch1:	java-gnome-javadocbuild.patch
 
 %description
 These are the Java bindings for GTK and GNOME! Featuring a robust 
@@ -64,11 +53,6 @@ design documentation and sample code.
 
 %prep
 %setup -q
-%if (0%{?fedora} >= 15 || 0%{?rhel} >= 7 || 0%{?fedora}%{?rhel} == 0)
-%patch0 -p1 -b .libnotify07
-rm -f doc/examples/*/*.java.libnotify07
-%endif
-%patch1 -p0 -b .javadocbuild
 
 if find -name '*.class' -o -name '*.jar' | grep . >&2; then
     echo >&2 "Prebuilt binaries found in the sources. See https://fedoraproject.org/wiki/Packaging:Java#Pre-built_JAR_files_.2F_Other_bundled_software for instructions."
@@ -90,11 +74,6 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_javadir}
 make install DESTDIR=%{buildroot}
 
-%if (0%{?fedora} >= 13 && 0%{?fedora} < 15)
-mv %{buildroot}%{_libdir}/%{name}/gtk-4.0.jar %{buildroot}%{_libdir}/%{name}/java-gnome.jar
-ln -s java-gnome.jar %{buildroot}%{_libdir}/%{name}/gtk-4.0.jar
-%endif
-
 mkdir -p %{buildroot}%{_javadocdir}
 cp -rp doc/api %{buildroot}%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
@@ -118,6 +97,11 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Tue Jul 12 2011 Alexander Boström <abo at root.snowtree.se> - 4.1.1-1
+- Upgrade to 4.1.1, GNOME 3 deps, remove libnotify patch.
+- Remove javadocbuild patch.
+- Remove BuildRoot and an obsolete conditional.
+
 * Mon Jul 11 2011 Alexander Boström <abo at root.snowtree.se> - 4.0.20-1
 - Upgrade to 4.0.20
 - reapply libnotify patch
diff --git a/sources b/sources
index 70b82ae..03990f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8dad414dbd1b864afec59c76e16d7f4  java-gnome-4.0.20.tar.xz
+7601b6ddbe9c9d44749992ba1669a999  java-gnome-4.1.1.tar.xz