[java-gnome] Remove a confusingly named backup file from the example code. Add a workaround for a javadoc build p

[abo]

commit 795b00288a46f6a5054d648bb5ad84c530da64d2
Author: Alexander Boström <abo at root.snowtree.se>
Date:   Thu Jul 7 00:41:59 2011 +0200

    Remove a confusingly named backup file from the example code.
    Add a workaround for a javadoc build problem (rhbz bug 715804).

 java-gnome-javadocbuild.patch |   19 +++++++++++++++++++
 java-gnome.spec               |   10 +++++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/java-gnome-javadocbuild.patch b/java-gnome-javadocbuild.patch
new file mode 100644
index 0000000..b984e35
--- /dev/null
+++ b/java-gnome-javadocbuild.patch
@@ -0,0 +1,19 @@
+--- build/faster	2011-02-14 07:47:43.000000000 +0100
++++ build/faster.rhbz719118	2011-07-06 23:33:02.000000000 +0200
+@@ -648,7 +648,6 @@
+ 		cmd += "-quiet "
+ 
+ 	cmd += "-d doc/api "
+-	cmd += "-classpath tmp/bindings "
+ 	cmd += "-public "
+ 	cmd += "-nodeprecated "
+ 	cmd += "-source 1.5 "
+@@ -664,7 +663,7 @@
+ 	cmd += "-breakiterator "
+ 	cmd += "-stylesheetfile src/bindings/stylesheet.css "
+ 	cmd += "-overview src/bindings/overview.html "
+-	cmd += "-sourcepath src/bindings "
++	cmd += "-sourcepath src/bindings:generated/bindings "
+ 	cmd += "-encoding UTF-8 "
+ 	cmd += "-subpackages org "
+ 	cmd += "-exclude org.freedesktop.bindings "
diff --git a/java-gnome.spec b/java-gnome.spec
index bfc4a0c..bdc9d48 100644
--- a/java-gnome.spec
+++ b/java-gnome.spec
@@ -1,7 +1,7 @@
 Summary:	Java GNOME bindings
 Name:		java-gnome
 Version:	4.0.19
-Release:	3%{?dist}
+Release:	4%{?dist}
 URL:		http://java-gnome.sourceforge.net
 Source0:	http://ftp.gnome.org/pub/gnome/sources/java-gnome/4.0/java-gnome-%{version}.tar.bz2
 # This is the "Classpath" exception.
@@ -38,6 +38,8 @@ Requires:	jpackage-utils
 %if (0%{?fedora} >= 15 || 0%{?rhel} >= 7 || 0%{?fedora}%{?rhel} == 0)
 Patch0:	java-gnome-4.0.19-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 
@@ -65,7 +67,9 @@ design documentation and sample code.
 %setup -q
 %if (0%{?fedora} >= 15 || 0%{?rhel} >= 7 || 0%{?fedora}%{?rhel} == 0)
 %patch0 -p0 -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."
@@ -115,6 +119,10 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 06 2011 Alexander Boström <abo at root.snowtree.se> - 4.0.19-4
+- remove confusingly named .libnotify07 file from example code
+- add workaround for javadoc build problem (rhbz bug 715804)
+
 * Sun Apr 03 2011 Alexander Boström <abo at root.snowtree.se> - 4.0.19-3
 - https://fedoraproject.org/wiki/Packaging:Java#Filenames does not
   apply to JNI JAR files. Avoid needless symlinking in new branches.