From 300b455b99522c50fcf0fc350dc7198708e45c6e Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Sun, 17 Jul 2016 17:18:09 +0200
Subject: [PATCH] Fix FTBFS

- Specfile cleanup
---
 sdljava.spec | 52 +++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/sdljava.spec b/sdljava.spec
index 10999bc..d2c04b6 100644
--- a/sdljava.spec
+++ b/sdljava.spec
@@ -7,11 +7,10 @@
 
 Name:           sdljava
 Version:        0.9.1
-Release:        31%{?dist}
+Release:        32%{?dist}
 Summary:        Java binding to the SDL API
-Group:          System Environment/Libraries
 License:        LGPLv2+
-Url:            http://sdljava.sourceforge.net/
+URL:            http://sdljava.sourceforge.net/
 # this is http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # with the included Microsoft Copyrighted Arial fonts removed
 Source0:        %{name}-%{version}.tar.gz
@@ -19,10 +18,29 @@ Source1:        %{name}-runtest.sh
 Patch0:         sdljava-0.9.1-regen.patch
 Patch1:         sdljava-0.9.1-ftgl213.patch
 Patch2:         sdljava-0.9.1-ruby19.patch
-BuildRequires:  ftgl-devel glew-devel SDL-devel SDL_gfx-devel SDL_image-devel
-BuildRequires:  SDL_mixer-devel SDL_ttf-devel java-devel jpackage-utils
-BuildRequires:  java-javadoc ant xml-commons-apis swig bsh jdom ruby
-Requires:       bsh jdom
+
+BuildRequires:  ftgl-devel
+BuildRequires:  glew-devel
+BuildRequires:  SDL-devel
+BuildRequires:  SDL_gfx-devel
+BuildRequires:  SDL_image-devel
+BuildRequires:  SDL_mixer-devel
+BuildRequires:  SDL_ttf-devel
+
+BuildRequires:  javapackages-local
+BuildRequires:  ant
+BuildRequires:  swig
+BuildRequires:  bsh
+BuildRequires:  jdom
+BuildRequires:  xml-commons-apis
+
+BuildRequires:  jruby
+BuildRequires:  rubypick
+
+Requires:       java
+Requires:       javapackages-tools
+Requires:       bsh
+Requires:       jdom
 
 %description
 sdljava is a Java binding to the SDL API being developed by Ivan Ganza.
@@ -34,9 +52,7 @@ efficient and easy to use.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Libraries
 BuildArch:      noarch
-Requires:       %{name} = %{version}-%{release}
 
 %description javadoc
 Javadoc for %{name}.
@@ -44,14 +60,12 @@ Javadoc for %{name}.
 
 %package demo
 Summary:        Some examples for %{name}
-Group:          Development/Libraries
 BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 Requires:       /usr/share/fonts/dejavu/DejaVuSans.ttf
 Requires:       /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf
 Requires:       /usr/share/fonts/dejavu/DejaVuSans-Oblique.ttf
 Requires:       /usr/share/fonts/dejavu/DejaVuSans-BoldOblique.ttf
-Requires:       java jpackage-utils
 
 %description demo
 Demonstrations and samples for %{name}.
@@ -62,6 +76,10 @@ Demonstrations and samples for %{name}.
 %patch0 -p1 -z .regen
 %patch1 -p1
 %patch2 -p1
+
+find -name '*.jar' -or -name '*.class' -or -name '*.bat' -name '*.so' -delete
+rm -r etc/build/gljava/windows etc/build/windows
+
 # Newer ftgl no longer exports the FTFace class
 rm src/org/gljava/opengl/ftgl/FTFace.java
 iconv -f ISO_8859-2 -t UTF8 docs/CHANGES_0_9_1 > docs/CHANGES_0_9_1.tmp
@@ -80,11 +98,7 @@ find ./testsrc -name '*.java' | xargs sed -i \
   -e 's|testdata|%{_datadir}/%{name}/testdata|g'
 
 # use system versions of bsh & jdom
-pushd lib
-rm *.jar
-ln -s /usr/share/java/jdom.jar .
-ln -s /usr/share/java/bsh.jar .
-popd
+build-jar-repository -p lib jdom bsh
 
 # copy the Linux Makefiles into place
 cp etc/build/linux/Makefile src/sdljava/native
@@ -126,7 +140,7 @@ if [ -z "$ARCH_DEFINE" ]; then
   export ARCH_DEFINE="-D__%{_arch}__"
 fi
 
-export JAVA_HOME=/usr/lib/jvm/java
+export JAVA_HOME=%{_jvmdir}/java
 
 pushd src/sdljava/native
 make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
@@ -204,6 +218,10 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \
 
 
 %changelog
+* Sun Jul 17 2016 Michael Simacek <msimacek@redhat.com> - 0.9.1-32
+- Fix FTBFS
+- Specfile cleanup
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-31
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild