From 2390ab43274fe8721e28e2838b38c454384e6457 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 11:13:34 +0000 Subject: [PATCH 01/73] Initialize branch F-8 for sdljava --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From a09e29f029452f3d8329bb6ff7984394d9e119ce Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 20 Nov 2007 21:33:10 +0000 Subject: [PATCH 02/73] - Adjust font symlinks in sdljava-demo package for fontfile name changes in dejavu-fonts (bz 388861) --- sdljava.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index 0a2eb48..d2a4cb7 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -52,6 +52,9 @@ Summary: Some examples for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: /usr/share/fonts/dejavu/DejaVuSans.ttf +Requires: /usr/share/fonts/dejavu/DejaVuSansBold.ttf +Requires: /usr/share/fonts/dejavu/DejaVuSansOblique.ttf +Requires: /usr/share/fonts/dejavu/DejaVuSansBoldOblique.ttf Requires: jpackage-utils %description demo @@ -146,11 +149,11 @@ popd cp -a testdata $RPM_BUILD_ROOT%{_datadir}/%{name} ln -s ../../fonts/dejavu/DejaVuSans.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arial.ttf -ln -s ../../fonts/dejavu/DejaVuSans-Bold.ttf \ +ln -s ../../fonts/dejavu/DejaVuSansBold.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbd.ttf -ln -s ../../fonts/dejavu/DejaVuSans-Oblique.ttf \ +ln -s ../../fonts/dejavu/DejaVuSansOblique.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/ariali.ttf -ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ +ln -s ../../fonts/dejavu/DejaVuSansBoldOblique.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbi.ttf %{_bindir}/aot-compile-rpm @@ -196,6 +199,10 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name} %changelog +* Tue Nov 20 2007 Hans de Goede 0.9.1-6 +- Adjust font symlinks in sdljava-demo package for fontfile name changes in + dejavu-fonts (bz 388861) + * Thu Sep 20 2007 Hans de Goede 0.9.1-5 - BuildRequire icedtea as building with gcj fails (bug 297961) From a19b5bb86ec5955d5247d784242cdefb3a99899a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 9 Dec 2007 22:44:30 +0000 Subject: [PATCH 03/73] - And the dejavu-fonts fontfile names changed back again (what fun) --- sdljava.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index d2a4cb7..c86eb31 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -52,9 +52,9 @@ Summary: Some examples for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: /usr/share/fonts/dejavu/DejaVuSans.ttf -Requires: /usr/share/fonts/dejavu/DejaVuSansBold.ttf -Requires: /usr/share/fonts/dejavu/DejaVuSansOblique.ttf -Requires: /usr/share/fonts/dejavu/DejaVuSansBoldOblique.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: jpackage-utils %description demo @@ -149,11 +149,11 @@ popd cp -a testdata $RPM_BUILD_ROOT%{_datadir}/%{name} ln -s ../../fonts/dejavu/DejaVuSans.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arial.ttf -ln -s ../../fonts/dejavu/DejaVuSansBold.ttf \ +ln -s ../../fonts/dejavu/DejaVuSans-Bold.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbd.ttf -ln -s ../../fonts/dejavu/DejaVuSansOblique.ttf \ +ln -s ../../fonts/dejavu/DejaVuSans-Oblique.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/ariali.ttf -ln -s ../../fonts/dejavu/DejaVuSansBoldOblique.ttf \ +ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbi.ttf %{_bindir}/aot-compile-rpm @@ -199,6 +199,9 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name} %changelog +* Sun Dec 9 2007 Hans de Goede 0.9.1-7 +- And the dejavu-fonts fontfile names changed back again (what fun) + * Tue Nov 20 2007 Hans de Goede 0.9.1-6 - Adjust font symlinks in sdljava-demo package for fontfile name changes in dejavu-fonts (bz 388861) From dc50b2511cc84bd87437cf3f6554c365b6d5ed49 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 9 Dec 2007 23:22:46 +0000 Subject: [PATCH 04/73] - And the dejavu-fonts fontfile names changed back again (what fun) - The gcj bug causing us to not compile has been fixed, use gcj again and drop ExclusiveArch - There is no reason for us to run ldconfig! - Sigh we must now define __arch__ ourself as the newer swig doesn't --- sdljava.spec | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index c86eb31..7bf9ef3 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -19,16 +19,9 @@ Source1: %{name}-runtest.sh Patch0: sdljava-0.9.1-regen.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ftgl-devel glew-devel SDL-devel SDL_gfx-devel SDL_image-devel -BuildRequires: SDL_mixer-devel SDL_ttf-devel java-devel java-gcj-compat-devel -BuildRequires: ant xml-commons-apis swig bsh jdom -# Build fails on fedora 8 test 2 when not using icedtea :( Note it runs fine -# with gcj (bug 297961). -BuildRequires: java-1.7.0-icedtea-devel -# icedtea is i386 and x86_64 -ExclusiveArch: %{ix86} x86_64 +BuildRequires: SDL_mixer-devel SDL_ttf-devel java-gcj-compat-devel +BuildRequires: java-javadoc ant xml-commons-apis swig bsh jdom Requires: bsh jdom -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig %description sdljava is a Java binding to the SDL API being developed by Ivan Ganza. @@ -96,17 +89,37 @@ rm src/org/gljava/opengl/native/glew_wrap.c %build + +# special case ppc as the define is powerpc not ppc and both ppc and ppc64 +# must be set for ppc64 +%ifarch ppc +CFLAGS="$RPM_OPT_FLAGS -D__powerpc__ -fno-strict-aliasing -fPIC" +%endif +%ifarch ppc64 +CFLAGS="$RPM_OPT_FLAGS -D__powerpc__ -D__powerpc64__ -fno-strict-aliasing -fPIC" +%endif + +# special case ix86 as all of ix86 should define __i386__ +%ifarch %{ix86} +CFLAGS="$RPM_OPT_FLAGS -D__i386__ -fno-strict-aliasing -fPIC" +%endif + +# All other archs +if [ -z "$CFLAGS" ]; then + CFLAGS="$RPM_OPT_FLAGS -D__%{_arch}__ -fno-strict-aliasing -fPIC" +fi + pushd src/sdljava/native -make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" -make libsdljava_gfx.so CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" +make CFLAGS="$CFLAGS" +make libsdljava_gfx.so CFLAGS="$CFLAGS" popd pushd src/org/gljava/opengl/native -make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" +make CFLAGS="$CFLAGS" popd pushd src/org/gljava/opengl/native/ftgl -make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" +make CFLAGS="$CFLAGS" popd ant jar javadoc @@ -164,13 +177,11 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/ldconfig if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db fi %postun -/sbin/ldconfig if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db fi @@ -201,6 +212,10 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name} %changelog * Sun Dec 9 2007 Hans de Goede 0.9.1-7 - And the dejavu-fonts fontfile names changed back again (what fun) +- The gcj bug causing us to not compile has been fixed, use gcj again + and drop ExclusiveArch +- There is no reason for us to run ldconfig! +- Sigh we must now define __arch__ ourself as the newer swig doesn't * Tue Nov 20 2007 Hans de Goede 0.9.1-6 - Adjust font symlinks in sdljava-demo package for fontfile name changes in From a02bccbd6b6b702f502eaa32491af3f47c247e00 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 9 Dec 2007 23:53:54 +0000 Subject: [PATCH 05/73] - And the dejavu-fonts fontfile names changed back again (what fun) - The gcj bug causing us to not compile has been fixed, use gcj again and drop ExclusiveArch - There is no reason for us to run ldconfig! - Sigh we must now define __arch__ ourself as the newer swig doesn't --- sdljava-0.9.1-regen.patch | 6 ++--- sdljava.spec | 51 +++++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/sdljava-0.9.1-regen.patch b/sdljava-0.9.1-regen.patch index 36b832f..8613fc7 100644 --- a/sdljava-0.9.1-regen.patch +++ b/sdljava-0.9.1-regen.patch @@ -6,7 +6,7 @@ diff -up sdljava-0.9.1/etc/build/linux/Makefile.regen sdljava-0.9.1/etc/build/li CFLAGS=-O3 -INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I/usr/local/include -I/usr/local/include/SDL -+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I@GCC_INCLUDE_PATH@ -D__NO_CTYPE -D_ISbit ++INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I@GCC_INCLUDE_PATH@ -D__NO_CTYPE -D_ISbit @ARCH_DEFINES@ SDLJAVA_I=SDLAudio.i\ SDLCdrom.i\ @@ -83,7 +83,7 @@ diff -up sdljava-0.9.1/etc/build/gljava/linux/Makefile.regen sdljava-0.9.1/etc/b CFLAGS=-O3 -INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include -+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I@GCC_INCLUDE_PATH@ ++INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I@GCC_INCLUDE_PATH@ @ARCH_DEFINES@ GLJAVA_I=glew.i @@ -112,7 +112,7 @@ diff -up sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile.regen sdljava-0.9.1/ CFLAGS=-O3 -INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/include/FTGL -+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I@GCC_INCLUDE_PATH@ -I/usr/include/freetype2 -I/usr/include/FTGL ++INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I@GCC_INCLUDE_PATH@ -I/usr/include/freetype2 -I/usr/include/FTGL @ARCH_DEFINES@ FTGLJAVA_OBJ=FTGL_wrap.o FTGLJAVA_LIB=-lGLU -lGL -lfreetype -lz -lftgl diff --git a/sdljava.spec b/sdljava.spec index 7bf9ef3..728d95f 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -67,6 +67,29 @@ sed -i "s#@GCC_INCLUDE_PATH@#$GCC_PATH/include#g" \ etc/build/gljava/linux/Makefile \ etc/build/gljava/linux/ftgl/Makefile +# add arch defines for swig <-> SDL_config.h wrapper happiness +# special case ppc as the define is powerpc not ppc and both ppc and ppc64 +# must be set for ppc64 +%ifarch ppc +ARCHDEFS="-D__powerpc__" +%endif +%ifarch ppc64 +ARCHDEFS="-D__powerpc__ -D__powerpc64__" +%endif +# special case ix86 as all of ix86 should define __i386__ +%ifarch %{ix86} +ARCHDEFS="-D__i386__" +%endif +# All other archs +if [ -z "$ARCHDEFS" ]; then + ARCHDEFS="-D__%{_arch}__" +fi +# And actually patch the defines into the makefiles +sed -i "s/@ARCH_DEFINES@/$ARCHDEFS/g" \ + etc/build/linux/Makefile \ + etc/build/gljava/linux/Makefile \ + etc/build/gljava/linux/ftgl/Makefile + # adjust testdata path in demos find ./testsrc -name '*.java' | xargs sed -i \ -e 's|testdata|%{_datadir}/%{name}/testdata|g' @@ -89,37 +112,17 @@ rm src/org/gljava/opengl/native/glew_wrap.c %build - -# special case ppc as the define is powerpc not ppc and both ppc and ppc64 -# must be set for ppc64 -%ifarch ppc -CFLAGS="$RPM_OPT_FLAGS -D__powerpc__ -fno-strict-aliasing -fPIC" -%endif -%ifarch ppc64 -CFLAGS="$RPM_OPT_FLAGS -D__powerpc__ -D__powerpc64__ -fno-strict-aliasing -fPIC" -%endif - -# special case ix86 as all of ix86 should define __i386__ -%ifarch %{ix86} -CFLAGS="$RPM_OPT_FLAGS -D__i386__ -fno-strict-aliasing -fPIC" -%endif - -# All other archs -if [ -z "$CFLAGS" ]; then - CFLAGS="$RPM_OPT_FLAGS -D__%{_arch}__ -fno-strict-aliasing -fPIC" -fi - pushd src/sdljava/native -make CFLAGS="$CFLAGS" -make libsdljava_gfx.so CFLAGS="$CFLAGS" +make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" +make libsdljava_gfx.so CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" popd pushd src/org/gljava/opengl/native -make CFLAGS="$CFLAGS" +make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" popd pushd src/org/gljava/opengl/native/ftgl -make CFLAGS="$CFLAGS" +make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" popd ant jar javadoc From c341374d48dcf335c326e118aa9ab48e4f5e0658 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 10 Dec 2007 10:33:31 +0000 Subject: [PATCH 06/73] - And the dejavu-fonts fontfile names changed back again (what fun) - The gcj bug causing us to not compile has been fixed, use gcj again and drop ExclusiveArch - There is no reason for us to run ldconfig! - Sigh we must now define __arch__ ourself as the newer swig doesn't --- sdljava-0.9.1-regen.patch | 30 ++++++++++++++-------------- sdljava.spec | 42 ++++++++++++++++++--------------------- 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/sdljava-0.9.1-regen.patch b/sdljava-0.9.1-regen.patch index 8613fc7..90aa6e5 100644 --- a/sdljava-0.9.1-regen.patch +++ b/sdljava-0.9.1-regen.patch @@ -6,7 +6,7 @@ diff -up sdljava-0.9.1/etc/build/linux/Makefile.regen sdljava-0.9.1/etc/build/li CFLAGS=-O3 -INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I/usr/local/include -I/usr/local/include/SDL -+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I@GCC_INCLUDE_PATH@ -D__NO_CTYPE -D_ISbit @ARCH_DEFINES@ ++INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I@GCC_INCLUDE_PATH@ -D__NO_CTYPE -D_ISbit SDLJAVA_I=SDLAudio.i\ SDLCdrom.i\ @@ -44,34 +44,34 @@ diff -up sdljava-0.9.1/etc/build/linux/Makefile.regen sdljava-0.9.1/etc/build/li -#SDLVideo_wrap.c: SDLVideo.i common.i -# $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i +SDLAudio_wrap.c: SDLAudio.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i + +SDLCdrom_wrap.c: SDLCdrom.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i + +SDLEvent_wrap.c: SDLEvent.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i + +SDLGFX_wrap.c: SDLGFX.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i + +SDLImage_wrap.c: SDLImage.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i + +SDLJoystick_wrap.c: SDLJoystick.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i + +SDLMain_wrap.c: SDLMain.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i + +SDLMixer_wrap.c: SDLMixer.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i + +SDLTTF_wrap.c: SDLTTF.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i + +SDLVideo_wrap.c: SDLVideo.i common.i -+ $(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i %.o: %.c $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ @@ -83,7 +83,7 @@ diff -up sdljava-0.9.1/etc/build/gljava/linux/Makefile.regen sdljava-0.9.1/etc/b CFLAGS=-O3 -INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include -+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I@GCC_INCLUDE_PATH@ @ARCH_DEFINES@ ++INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I@GCC_INCLUDE_PATH@ GLJAVA_I=glew.i @@ -100,7 +100,7 @@ diff -up sdljava-0.9.1/etc/build/gljava/linux/Makefile.regen sdljava-0.9.1/etc/b -#glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i -# $(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i +glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i -+ $(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i ++ $(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i %.o: %.c $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ @@ -112,7 +112,7 @@ diff -up sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile.regen sdljava-0.9.1/ CFLAGS=-O3 -INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/include/FTGL -+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I@GCC_INCLUDE_PATH@ -I/usr/include/freetype2 -I/usr/include/FTGL @ARCH_DEFINES@ ++INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I@GCC_INCLUDE_PATH@ -I/usr/include/freetype2 -I/usr/include/FTGL FTGLJAVA_OBJ=FTGL_wrap.o FTGLJAVA_LIB=-lGLU -lGL -lfreetype -lz -lftgl @@ -124,7 +124,7 @@ diff -up sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile.regen sdljava-0.9.1/ -# $(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i -# ./post-process.rb +FTGL_wrap.cxx: FTGL.i FTFont.i FTFace.i FTGLBitmapFont.i FTGLExtrdFont.i FTGLOutlineFont.i FTGLPixmapFont.i FTGLPolygonFont.i FTGLTextureFont.i -+ $(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i ++ $(SWIG) -Wall -c++ $(INCLUDE) $(ARCH_DEFINE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i + ./post-process.rb %.o: %.cxx diff --git a/sdljava.spec b/sdljava.spec index 728d95f..accf754 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -67,29 +67,6 @@ sed -i "s#@GCC_INCLUDE_PATH@#$GCC_PATH/include#g" \ etc/build/gljava/linux/Makefile \ etc/build/gljava/linux/ftgl/Makefile -# add arch defines for swig <-> SDL_config.h wrapper happiness -# special case ppc as the define is powerpc not ppc and both ppc and ppc64 -# must be set for ppc64 -%ifarch ppc -ARCHDEFS="-D__powerpc__" -%endif -%ifarch ppc64 -ARCHDEFS="-D__powerpc__ -D__powerpc64__" -%endif -# special case ix86 as all of ix86 should define __i386__ -%ifarch %{ix86} -ARCHDEFS="-D__i386__" -%endif -# All other archs -if [ -z "$ARCHDEFS" ]; then - ARCHDEFS="-D__%{_arch}__" -fi -# And actually patch the defines into the makefiles -sed -i "s/@ARCH_DEFINES@/$ARCHDEFS/g" \ - etc/build/linux/Makefile \ - etc/build/gljava/linux/Makefile \ - etc/build/gljava/linux/ftgl/Makefile - # adjust testdata path in demos find ./testsrc -name '*.java' | xargs sed -i \ -e 's|testdata|%{_datadir}/%{name}/testdata|g' @@ -112,6 +89,25 @@ rm src/org/gljava/opengl/native/glew_wrap.c %build +# We must add -D__%{_arch}__ to swigs arguments as swig doesn't do that itself. +# Special case ppc as the define is powerpc not ppc and both ppc and ppc64 +# must be set for ppc64, also add -D__LONG_DOUBLE_128__ which works around +# swig barfing on bits/stdlib-ldbl.h +%ifarch ppc +export ARCH_DEFINE="-D__powerpc__ -D__LONG_DOUBLE_128__" +%endif +%ifarch ppc64 +export ARCH_DEFINE="-D__powerpc__ -D__powerpc64__ -D__LONG_DOUBLE_128__" +%endif +# special case ix86 as all of ix86 should define __i386__ +%ifarch %{ix86} +export ARCH_DEFINE="-D__i386__" +%endif +# All other archs +if [ -z "$ARCH_DEFINE" ]; then + export ARCH_DEFINE="-D__%{_arch}__" +fi + pushd src/sdljava/native make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" make libsdljava_gfx.so CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" From f2d39718769bb527ca6072a826090a41261c586a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 22 Jan 2008 12:28:37 +0000 Subject: [PATCH 07/73] - Rebuild for new glew --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index accf754..f9dcc2d 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -209,6 +209,9 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name} %changelog +* Tue Jan 22 2008 Hans de Goede 0.9.1-8 +- Rebuild for new glew + * Sun Dec 9 2007 Hans de Goede 0.9.1-7 - And the dejavu-fonts fontfile names changed back again (what fun) - The gcj bug causing us to not compile has been fixed, use gcj again From 73ab97f69d4f83a19b8f0e5c7aca1e9b20a87fd4 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 09:39:39 +0000 Subject: [PATCH 08/73] - Autorebuild for GCC 4.3 --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index f9dcc2d..cd16a77 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -209,6 +209,9 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name} %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0.9.1-9 +- Autorebuild for GCC 4.3 + * Tue Jan 22 2008 Hans de Goede 0.9.1-8 - Rebuild for new glew From 8aa7ac96fe4bcf518fb8c3e4dec27c7bf8708b7a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 8 Dec 2008 09:27:41 +0000 Subject: [PATCH 09/73] - Fixed unowned /usr/share/sdljava dir in the -demo package (bz 474604) --- sdljava.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index cd16a77..52520da 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -205,10 +205,13 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name} %files demo %defattr(-,root,root,-) %{_bindir}/%{name}-*.sh -%{_datadir}/%{name}/testdata +%{_datadir}/%{name} %changelog +* Mon Dec 8 2008 Hans de Goede 0.9.1-10 +- Fixed unowned /usr/share/sdljava dir in the -demo package (bz 474604) + * Tue Feb 19 2008 Fedora Release Engineering - 0.9.1-9 - Autorebuild for GCC 4.3 From 97a085f1585feb91f5171324d2078ff4b5918dbc Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 00:12:30 +0000 Subject: [PATCH 10/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 52520da..4e10d99 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -209,6 +209,9 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name} %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.9.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Dec 8 2008 Hans de Goede 0.9.1-10 - Fixed unowned /usr/share/sdljava dir in the -demo package (bz 474604) From 32761bb4a504de932d11763c76b512f91cd3f1e0 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 22 May 2009 12:14:13 +0000 Subject: [PATCH 11/73] - Rebuild for new ftgl (#501323) --- sdljava.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 4e10d99..bcd64c7 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -17,6 +17,7 @@ Url: http://sdljava.sourceforge.net/ Source0: %{name}-%{version}.tar.gz Source1: %{name}-runtest.sh Patch0: sdljava-0.9.1-regen.patch +Patch1: sdljava-0.9.1-ftgl213.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ftgl-devel glew-devel SDL-devel SDL_gfx-devel SDL_image-devel BuildRequires: SDL_mixer-devel SDL_ttf-devel java-gcj-compat-devel @@ -57,7 +58,11 @@ Demonstrations and samples for %{name}. %prep %setup -q %patch0 -p1 -z .regen +%patch1 -p1 +# 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 +touch -r docs/CHANGES_0_9_1 docs/CHANGES_0_9_1.tmp mv docs/CHANGES_0_9_1.tmp docs/CHANGES_0_9_1 # patch in gcc include path so that swig can find it @@ -209,6 +214,9 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name} %changelog +* Fri May 22 2009 Hans de Goede 0.9.1-12 +- Rebuild for new ftgl (#501323) + * Wed Feb 25 2009 Fedora Release Engineering - 0.9.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From a887a0853d9dac32db1b928af5e7c812ee646104 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 22 May 2009 12:54:50 +0000 Subject: [PATCH 12/73] - Rebuild for new ftgl (#501323) --- sdljava-0.9.1-ftgl213.patch | 35 +++++++++++++++++++++++++++++++++++ sdljava.spec | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 sdljava-0.9.1-ftgl213.patch diff --git a/sdljava-0.9.1-ftgl213.patch b/sdljava-0.9.1-ftgl213.patch new file mode 100644 index 0000000..c08c021 --- /dev/null +++ b/sdljava-0.9.1-ftgl213.patch @@ -0,0 +1,35 @@ +diff -up sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTFont.i~ sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTFont.i +--- sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTFont.i~ 2005-02-20 23:19:13.000000000 +0100 ++++ sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTFont.i 2009-05-22 12:52:37.000000000 +0200 +@@ -1,5 +1,3 @@ +-%feature("notabstract") FTFont; +- + class FTFont + { + public: +diff -up sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTGL.i~ sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTGL.i +--- sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTGL.i~ 2005-02-20 23:19:13.000000000 +0100 ++++ sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTGL.i 2009-05-22 12:55:12.000000000 +0200 +@@ -1,13 +1,6 @@ + %module SWIG_FTGL + %{ +- #include "FTFont.h" +- #include "FTFace.h" +- #include "FTGLBitmapFont.h" +- #include "FTGLExtrdFont.h" +- #include "FTGLOutlineFont.h" +- #include "FTGLPixmapFont.h" +- #include "FTGLPolygonFont.h" +- #include "FTGLTextureFont.h" ++ #include + + void SWIG_BBox(const char* string, FTFont* font, float* llx, float* lly, float* llz, float* urx, float* ury, float* urz) { + font->BBox(string, *llx, *lly, *llz, *urx, *ury, *urz); +@@ -35,7 +28,6 @@ + typedef int FT_Error; + + %include "FTFont.i" +-%include "FTFace.i" + %include "FTGLBitmapFont.i" + %include "FTGLExtrdFont.i" + %include "FTGLOutlineFont.i" diff --git a/sdljava.spec b/sdljava.spec index bcd64c7..6d982f1 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -21,7 +21,7 @@ Patch1: sdljava-0.9.1-ftgl213.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ftgl-devel glew-devel SDL-devel SDL_gfx-devel SDL_image-devel BuildRequires: SDL_mixer-devel SDL_ttf-devel java-gcj-compat-devel -BuildRequires: java-javadoc ant xml-commons-apis swig bsh jdom +BuildRequires: java-javadoc ant xml-commons-apis swig bsh jdom ruby Requires: bsh jdom %description From a093da82a236ca34883413ce6cdc9acc96cb33ce Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 04:04:50 +0000 Subject: [PATCH 13/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 6d982f1..7c9cc46 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -214,6 +214,9 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name} %changelog +* Sun Jul 26 2009 Fedora Release Engineering - 0.9.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri May 22 2009 Hans de Goede 0.9.1-12 - Rebuild for new ftgl (#501323) From c94e159ec6aaea8f2909fff92c571f952a6c66f1 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:15:27 +0000 Subject: [PATCH 14/73] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a9b79dc..31204d1 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: sdljava -# $Id$ +# $Id: Makefile,v 1.1 2007/09/21 16:46:20 kevin Exp $ NAME := sdljava SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 5491ccb3b3962ec71924b57e37f5e7be384d7823 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:38:11 +0000 Subject: [PATCH 15/73] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a9b79dc..c5cbe4e 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := sdljava SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 1b58557374291d210775a9431de2d4b61e0073b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 12:18:54 +0000 Subject: [PATCH 16/73] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c5cbe4e..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: sdljava -# $Id$ -NAME := sdljava -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8 From a2d1443e9bd8558524b546079bec064ed2c6874a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 12:18:57 +0000 Subject: [PATCH 17/73] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 31204d1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: sdljava -# $Id: Makefile,v 1.1 2007/09/21 16:46:20 kevin Exp $ -NAME := sdljava -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From d120d9821881b3fa20ade29fbb8c46f237807bd2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 06:37:28 -0600 Subject: [PATCH 18/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 7c9cc46..d18a439 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -214,6 +214,9 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name} %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 0.9.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun Jul 26 2009 Fedora Release Engineering - 0.9.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From a83f5ca049dad7a31465c554b3fc77b6b95b7207 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 20 Jun 2011 20:03:57 -0400 Subject: [PATCH 19/73] Rebuild for new glew soname --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index d18a439..9ef8ba8 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -214,6 +214,9 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name} %changelog +* Mon Jun 20 2011 ajax@redhat.com - 0.9.1-15 +- Rebuild for new glew soname + * Wed Feb 09 2011 Fedora Release Engineering - 0.9.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 05b2e7bdf72f520ed2907b6f6cfbf3d32672e8a3 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 15 Jul 2011 08:58:13 +0200 Subject: [PATCH 20/73] Rebuild for new SDL_gfx Drop gcj aot bits, Fedora has not been using these for a long long time Update to match latest java packaging guidelines --- sdljava.spec | 49 ++++++++++++++++--------------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index 9ef8ba8..e31915e 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -18,9 +18,8 @@ Source0: %{name}-%{version}.tar.gz Source1: %{name}-runtest.sh Patch0: sdljava-0.9.1-regen.patch Patch1: sdljava-0.9.1-ftgl213.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ftgl-devel glew-devel SDL-devel SDL_gfx-devel SDL_image-devel -BuildRequires: SDL_mixer-devel SDL_ttf-devel java-gcj-compat-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 @@ -35,6 +34,7 @@ efficient and easy to use. %package javadoc Summary: Javadoc for %{name} Group: Development/Libraries +BuildArch: noarch Requires: %{name} = %{version}-%{release} %description javadoc @@ -44,12 +44,13 @@ 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: jpackage-utils +Requires: java jpackage-utils %description demo Demonstrations and samples for %{name}. @@ -113,6 +114,8 @@ if [ -z "$ARCH_DEFINE" ]; then export ARCH_DEFINE="-D__%{_arch}__" fi +export JAVA_HOME=/usr/lib/jvm/java + pushd src/sdljava/native make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" make libsdljava_gfx.so CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" @@ -130,26 +133,24 @@ ant jar javadoc %install -rm -rf $RPM_BUILD_ROOT - # dirs mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_javadir} +# should be just %{_javadocdir}/%{name} but that is a ghosted symlink in older +# versions and rpm does not grok replacing that with a dir mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} # jars install -m 644 lib/%{name}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar + $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # native libraries install -m 755 lib/*.so $RPM_BUILD_ROOT%{_libdir}/%{name} # javadoc cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # demo scripts install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir} @@ -173,39 +174,16 @@ ln -s ../../fonts/dejavu/DejaVuSans-Oblique.ttf \ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbi.ttf -%{_bindir}/aot-compile-rpm - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%post -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - %files %defattr(-,root,root,-) %doc README TODO docs/CHANGES_0_9_1 -%{_javadir}/%{name}*.jar +%{_javadir}/%{name}.jar %{_libdir}/%{name} -%{_libdir}/gcj/%{name} %files javadoc %defattr(-,root,root,-) %doc %{_javadocdir}/%{name}-%{version} -%ghost %doc %{_javadocdir}/%{name} %files demo %defattr(-,root,root,-) @@ -214,6 +192,11 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name} %changelog +* Thu Jul 14 2011 Hans de Goede - 0.9.1-16 +- Rebuild for new SDL_gfx +- Drop gcj aot bits, Fedora has not been using these for a long long time +- Update to match latest java packaging guidelines + * Mon Jun 20 2011 ajax@redhat.com - 0.9.1-15 - Rebuild for new glew soname From 8932078139572b0fdcd304ab36ce6c92ae12a973 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 21:42:42 -0600 Subject: [PATCH 21/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index e31915e..9d1002f 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -192,6 +192,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.9.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Thu Jul 14 2011 Hans de Goede - 0.9.1-16 - Rebuild for new SDL_gfx - Drop gcj aot bits, Fedora has not been using these for a long long time From 81c02ffafa5164c6fd2744cf11d7c7ee7e656131 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 14:13:48 -0500 Subject: [PATCH 22/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 9d1002f..b102e11 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -192,6 +192,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 0.9.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 0.9.1-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From c06f3fabc732a32ebb812dbbbd96c9e9082f4fb3 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 26 Jul 2012 13:13:13 +0200 Subject: [PATCH 23/73] Fix building with ruby 1.9 - Rebuilt for new GLEW --- sdljava-0.9.1-ruby19.patch | 32 ++++++++++++++++++++++++++++++++ sdljava.spec | 8 +++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 sdljava-0.9.1-ruby19.patch diff --git a/sdljava-0.9.1-ruby19.patch b/sdljava-0.9.1-ruby19.patch new file mode 100644 index 0000000..1e72407 --- /dev/null +++ b/sdljava-0.9.1-ruby19.patch @@ -0,0 +1,32 @@ +--- sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/post-process.rb~ 2005-02-20 23:19:13.000000000 +0100 ++++ sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/post-process.rb 2012-07-26 12:45:18.738168697 +0200 +@@ -1,7 +1,7 @@ + #!/usr/bin/ruby -w + + require "find" +-require "ftools" ++require "fileutils" + + # temporary hack until I can figure out a better way to do this + # process the given files, change the methods names to start +@@ -101,16 +101,16 @@ Find.find(".") do |path| + + f = File.new("#{path}.tmp", "w+") + +- f << lines ++ f.puts(lines) + +- f << post if not post == nil ++ f.puts(post) if not post == nil + +- f << "\n}" ++ f.puts("\n}") + + f.close + + # move it to the actual file now +- File.move("#{path}.tmp", path) ++ FileUtils.move("#{path}.tmp", path) + end + + diff --git a/sdljava.spec b/sdljava.spec index b102e11..be4ac7e 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -18,6 +18,7 @@ Source0: %{name}-%{version}.tar.gz 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 @@ -60,6 +61,7 @@ Demonstrations and samples for %{name}. %setup -q %patch0 -p1 -z .regen %patch1 -p1 +%patch2 -p1 # 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 @@ -192,6 +194,10 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Thu Jul 26 2012 Hans de Goede - 0.9.1-19 +- Fix building with ruby 1.9 +- Rebuilt for new GLEW + * Sat Jul 21 2012 Fedora Release Engineering - 0.9.1-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 88a00a69e1bde198c6c9eb6203c594ee13c1c6d6 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 13 Dec 2012 13:42:00 -0500 Subject: [PATCH 24/73] Rebuild for glew 1.9.0 --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index be4ac7e..bc937da 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -194,6 +194,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Thu Dec 13 2012 Adam Jackson - 0.9.1-20 +- Rebuild for glew 1.9.0 + * Thu Jul 26 2012 Hans de Goede - 0.9.1-19 - Fix building with ruby 1.9 - Rebuilt for new GLEW From f2cc62846a72bca6480a5bc99cf118e0e5c2dd86 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 17:42:26 -0600 Subject: [PATCH 25/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index bc937da..2e72714 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -194,6 +194,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 0.9.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Dec 13 2012 Adam Jackson - 0.9.1-20 - Rebuild for glew 1.9.0 From 34ba45fa17c4ea96800bcd38b83e14007f122fb0 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 24 Mar 2013 21:59:27 +0100 Subject: [PATCH 26/73] Fix FTBFS on ARM (rhbz#893157) --- sdljava.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 2e72714..db2de9b 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -111,6 +111,13 @@ export ARCH_DEFINE="-D__powerpc__ -D__powerpc64__ -D__LONG_DOUBLE_128__" %ifarch %{ix86} export ARCH_DEFINE="-D__i386__" %endif +# arm also needs a bunch of special defines +%ifarch %{arm} +export ARCH_DEFINE="-D__arm__ -D__ARMEL__ -D__ARM_EABI__" +%ifnarch armv5tel +export ARCH_DEFINE="$ARCH_DEFINE -D__ARM_PCS_VFP" +%endif +%endif # All other archs if [ -z "$ARCH_DEFINE" ]; then export ARCH_DEFINE="-D__%{_arch}__" @@ -194,6 +201,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Sun Mar 24 2013 Hans de Goede - 0.9.1-22 +- Fix FTBFS on ARM (rhbz#893157) + * Thu Feb 14 2013 Fedora Release Engineering - 0.9.1-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 0b5bac4a5946e66b35794f770cc26676a1ce17a4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 08:59:12 -0500 Subject: [PATCH 27/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index db2de9b..0a5c306 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -201,6 +201,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0.9.1-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Sun Mar 24 2013 Hans de Goede - 0.9.1-22 - Fix FTBFS on ARM (rhbz#893157) From 4966fcb67fa99addcb14fc82f16e81245c893e3e Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 18 Nov 2013 10:52:55 +1000 Subject: [PATCH 28/73] rebuilt for GLEW 1.10 --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 0a5c306..ea6e742 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -201,6 +201,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Mon Nov 18 2013 Dave Airlie - 0.9.1-24 +- rebuilt for GLEW 1.10 + * Sun Aug 04 2013 Fedora Release Engineering - 0.9.1-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 64f7e99304fbb9a50f81b2ca8412ffc2d69764a9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 01:02:43 -0500 Subject: [PATCH 29/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index ea6e742..cefef95 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -201,6 +201,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 0.9.1-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon Nov 18 2013 Dave Airlie - 0.9.1-24 - rebuilt for GLEW 1.10 From fe67f235f5b21f3f0940eaecb00d8371575708d9 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 13 Jun 2014 10:55:47 +0200 Subject: [PATCH 30/73] Rebuild for new SDL_gfx --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index cefef95..fca5ed9 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -201,6 +201,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Fri Jun 13 2014 Hans de Goede - 0.9.1-26 +- Rebuild for new SDL_gfx + * Sun Jun 08 2014 Fedora Release Engineering - 0.9.1-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 9f97639e8863b3e6b8cf5fb6429c5d658e6de228 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 01:52:19 +0000 Subject: [PATCH 31/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index fca5ed9..3a504bd 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -201,6 +201,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 0.9.1-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jun 13 2014 Hans de Goede - 0.9.1-26 - Rebuild for new SDL_gfx From df7f8821cb27cb41eacb578798bfd8d74823428e Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 1 Oct 2014 21:40:06 +0200 Subject: [PATCH 32/73] fix ppc64le build --- sdljava.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 3a504bd..8a4f8f9 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -107,6 +107,9 @@ export ARCH_DEFINE="-D__powerpc__ -D__LONG_DOUBLE_128__" %ifarch ppc64 export ARCH_DEFINE="-D__powerpc__ -D__powerpc64__ -D__LONG_DOUBLE_128__" %endif +%ifarch ppc64le +export ARCH_DEFINE="-D__powerpc__ -D__powerpc64__ -D__LITTLE_ENDIAN__ -D\"__BYTE_ORDER__=1234\" -D\"_CALL_ELF=2\" -D__LONG_DOUBLE_128__" +%endif # special case ix86 as all of ix86 should define __i386__ %ifarch %{ix86} export ARCH_DEFINE="-D__i386__" @@ -201,6 +204,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Wed Oct 01 2014 Karsten Hopp 0.9.1-28 +- fix ppc64le build + * Mon Aug 18 2014 Fedora Release Engineering - 0.9.1-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 100f2fbb34d4ece62b1cf93c25c64b73db3d836b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 00:34:01 +0000 Subject: [PATCH 33/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 8a4f8f9..7f3b942 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -204,6 +204,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0.9.1-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Oct 01 2014 Karsten Hopp 0.9.1-28 - fix ppc64le build From bc4617b30c00659e5849134033caa4f9ae4843e7 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 14 Jan 2016 13:10:39 -0500 Subject: [PATCH 34/73] Rebuild for glew 1.13 --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 7f3b942..84432ff 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -204,6 +204,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Thu Jan 14 2016 Adam Jackson - 0.9.1-30 +- Rebuild for glew 1.13 + * Fri Jun 19 2015 Fedora Release Engineering - 0.9.1-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 534fc727ef316ed2aa00de0258ffd3358d91e14b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 23:48:03 +0000 Subject: [PATCH 35/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 84432ff..10999bc 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Java binding to the SDL API Group: System Environment/Libraries License: LGPLv2+ @@ -204,6 +204,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 0.9.1-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Jan 14 2016 Adam Jackson - 0.9.1-30 - Rebuild for glew 1.13 From 300b455b99522c50fcf0fc350dc7198708e45c6e Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Sun, 17 Jul 2016 17:18:09 +0200 Subject: [PATCH 36/73] 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 - 0.9.1-32 +- Fix FTBFS +- Specfile cleanup + * Thu Feb 04 2016 Fedora Release Engineering - 0.9.1-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 71352383266961953758e9f83265d4dd1eb24b1c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 10 Jan 2017 08:56:02 -0700 Subject: [PATCH 37/73] Rebuild for glew 2.0.0 --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index d2c04b6..d9f2186 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -218,6 +218,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Tue Jan 10 2017 Orion Poplawski - 0.9.1-33 +- Rebuild for glew 2.0.0 + * Sun Jul 17 2016 Michael Simacek - 0.9.1-32 - Fix FTBFS - Specfile cleanup From b77c06ea5bbd9be4a44ed29cb41fb040e845d930 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 13:15:38 +0000 Subject: [PATCH 38/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index d9f2186..594070d 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -218,6 +218,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.9.1-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jan 10 2017 Orion Poplawski - 0.9.1-33 - Rebuild for glew 2.0.0 From cbb880cfbf800ff236fc2437c417498968df0bab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 18:21:47 +0000 Subject: [PATCH 39/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 594070d..2577381 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -218,6 +218,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.9.1-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0.9.1-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 43c6f81c042159399f82c3e2781911f9d77537ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 08:18:07 +0000 Subject: [PATCH 40/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 2577381..3cb574b 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -218,6 +218,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.9.1-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.9.1-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 7920ea8dde864f1a0ee302383dc907cdb6b75ac5 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 4 Sep 2017 10:31:48 +0300 Subject: [PATCH 41/73] Fix build on s390x --- sdljava.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 3cb574b..d5e6f64 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -124,6 +124,9 @@ export ARCH_DEFINE="-D__powerpc__ -D__powerpc64__ -D__LONG_DOUBLE_128__" %ifarch ppc64le export ARCH_DEFINE="-D__powerpc__ -D__powerpc64__ -D__LITTLE_ENDIAN__ -D\"__BYTE_ORDER__=1234\" -D\"_CALL_ELF=2\" -D__LONG_DOUBLE_128__" %endif +%ifarch s390x +export ARCH_DEFINE="-D__s390x__ -D__LONG_DOUBLE_128__" +%endif # special case ix86 as all of ix86 should define __i386__ %ifarch %{ix86} export ARCH_DEFINE="-D__i386__" @@ -218,6 +221,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Mon Sep 04 2017 Michael Simacek - 0.9.1-37 +- Fix build on s390x + * Thu Aug 03 2017 Fedora Release Engineering - 0.9.1-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 196647b8edb99ca1adb872fe5b3466207f7a9ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 26 Oct 2017 11:07:41 +0200 Subject: [PATCH 42/73] Prefer dependency on "%{_bindir}/ruby". rubypick might not be available everywhere, while "%{_bindir}/ruby" always is. --- sdljava.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index d5e6f64..7c09c79 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -35,7 +35,7 @@ BuildRequires: jdom BuildRequires: xml-commons-apis BuildRequires: jruby -BuildRequires: rubypick +BuildRequires: %{_bindir}/ruby Requires: java Requires: javapackages-tools @@ -221,6 +221,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Thu Oct 26 2017 Vít Ondruch - 0.9.1-38 +- Prefer dependency on "%%{_bindir}/ruby". + * Mon Sep 04 2017 Michael Simacek - 0.9.1-37 - Fix build on s390x From dad1dcc0d75e29a5261ee9c36011602b49985b40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 16:25:01 +0000 Subject: [PATCH 43/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 7c09c79..de68bc9 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 38%{?dist} +Release: 39%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -221,6 +221,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.9.1-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Oct 26 2017 Vít Ondruch - 0.9.1-38 - Prefer dependency on "%%{_bindir}/ruby". From 692dd7351f0568bbf96de8059b8d4221f53808b7 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 19 Feb 2018 16:03:16 +0100 Subject: [PATCH 44/73] Add BR on gcc and make --- sdljava.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index de68bc9..717c94f 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 39%{?dist} +Release: 40%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -19,6 +19,8 @@ Patch0: sdljava-0.9.1-regen.patch Patch1: sdljava-0.9.1-ftgl213.patch Patch2: sdljava-0.9.1-ruby19.patch +BuildRequires: gcc-c++ +BuildRequires: make BuildRequires: ftgl-devel BuildRequires: glew-devel BuildRequires: SDL-devel @@ -221,6 +223,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Mon Feb 19 2018 Michael Simacek - 0.9.1-40 +- Add BR on gcc and make + * Fri Feb 09 2018 Fedora Release Engineering - 0.9.1-39 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 505a689fa7971640073f4e01bbb4095f838d74ed Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:19:35 -0500 Subject: [PATCH 45/73] Remove needless use of %defattr --- sdljava.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index 717c94f..3d04492 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -207,17 +207,14 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %files -%defattr(-,root,root,-) %doc README TODO docs/CHANGES_0_9_1 %{_javadir}/%{name}.jar %{_libdir}/%{name} %files javadoc -%defattr(-,root,root,-) %doc %{_javadocdir}/%{name}-%{version} %files demo -%defattr(-,root,root,-) %{_bindir}/%{name}-*.sh %{_datadir}/%{name} From 92baf7bf904c8c7814ddf8e82b3a1537a0c25d1b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 05:54:16 +0000 Subject: [PATCH 46/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 3d04492..7120eca 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 40%{?dist} +Release: 41%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -220,6 +220,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.9.1-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Feb 19 2018 Michael Simacek - 0.9.1-40 - Add BR on gcc and make From 0fc33077309b3ddbb5c2117aa8ca4481f120e64f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 23 Aug 2018 14:08:26 +0200 Subject: [PATCH 47/73] - Rebuilt for glew 2.1.0 --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 7120eca..3b8b86e 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 41%{?dist} +Release: 42%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -220,6 +220,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Thu Aug 23 2018 Nicolas Chauvet - 0.9.1-42 +- Rebuilt for glew 2.1.0 + * Sat Jul 14 2018 Fedora Release Engineering - 0.9.1-41 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 8bdfe70ffd88728969f352a43e7a03a64ba5a05a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 15:07:13 +0000 Subject: [PATCH 48/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 3b8b86e..1c693aa 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 42%{?dist} +Release: 43%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -220,6 +220,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 0.9.1-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Aug 23 2018 Nicolas Chauvet - 0.9.1-42 - Rebuilt for glew 2.1.0 From 0c07d8626632ad9d8a06697559aa892b52bd626c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 22:59:52 +0000 Subject: [PATCH 49/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 1c693aa..94c3a3b 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 43%{?dist} +Release: 44%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -220,6 +220,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 0.9.1-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 0.9.1-43 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From ad8eba37d14c9546ba026737b85434ea14679e6e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 25 Nov 2019 21:31:20 +0100 Subject: [PATCH 50/73] Drop unnecessary BuildRequires: jruby Drop version prefix from javadocs installation the ghosted symlink blocking us from doing this has last shipped in Fedora 16 Update to match latest java packaging guidelines --- sdljava.rpmlintrc | 5 +++++ sdljava.spec | 31 +++++++++++++++++-------------- 2 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 sdljava.rpmlintrc diff --git a/sdljava.rpmlintrc b/sdljava.rpmlintrc new file mode 100644 index 0000000..02003cc --- /dev/null +++ b/sdljava.rpmlintrc @@ -0,0 +1,5 @@ +# We ship a cleaned tarbal with nonfree fonts removed +addFilter("W: invalid-url Source0: sdljava-0.9.1.tar.gz") +# The demos do not have docs / manpages, nor do they need these +addFilter("W: no-manual-page-for-binary .*") +addFilter("W: no-documentation") diff --git a/sdljava.spec b/sdljava.spec index 94c3a3b..ab4e2f8 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,11 +7,11 @@ Name: sdljava Version: 0.9.1 -Release: 44%{?dist} +Release: 45%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ -# this is http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +# this is http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.gz # with the included Microsoft Copyrighted Arial fonts removed Source0: %{name}-%{version}.tar.gz Source1: %{name}-runtest.sh @@ -35,12 +35,10 @@ BuildRequires: swig BuildRequires: bsh BuildRequires: jdom BuildRequires: xml-commons-apis - -BuildRequires: jruby BuildRequires: %{_bindir}/ruby Requires: java -Requires: javapackages-tools +Requires: javapackages-filesystem Requires: bsh Requires: jdom @@ -68,6 +66,7 @@ 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: javapackages-tools %description demo Demonstrations and samples for %{name}. @@ -113,7 +112,7 @@ rm src/org/gljava/opengl/native/glew_wrap.c %build -# We must add -D__%{_arch}__ to swigs arguments as swig doesn't do that itself. +# We must add -D__%%{_arch}__ to swigs arguments as swig doesn't do that itself. # Special case ppc as the define is powerpc not ppc and both ppc and ppc64 # must be set for ppc64, also add -D__LONG_DOUBLE_128__ which works around # swig barfing on bits/stdlib-ldbl.h @@ -168,20 +167,18 @@ ant jar javadoc mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} -mkdir -p $RPM_BUILD_ROOT%{_javadir} -# should be just %{_javadocdir}/%{name} but that is a ghosted symlink in older -# versions and rpm does not grok replacing that with a dir -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +mkdir -p $RPM_BUILD_ROOT%{_jnidir} +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} # jars install -m 644 lib/%{name}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}.jar + $RPM_BUILD_ROOT%{_jnidir}/%{name}.jar # native libraries install -m 755 lib/*.so $RPM_BUILD_ROOT%{_libdir}/%{name} # javadoc -cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # demo scripts install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir} @@ -208,11 +205,11 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %files %doc README TODO docs/CHANGES_0_9_1 -%{_javadir}/%{name}.jar +%{_jnidir}/%{name}.jar %{_libdir}/%{name} %files javadoc -%doc %{_javadocdir}/%{name}-%{version} +%doc %{_javadocdir}/%{name} %files demo %{_bindir}/%{name}-*.sh @@ -220,6 +217,12 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Mon Nov 25 2019 Hans de Goede - 0.9.1-45 +- Drop unnecessary BuildRequires: jruby +- Drop version prefix from javadocs installation the ghosted symlink + blocking us from doing this has last shipped in Fedora 16 +- Update to match latest java packaging guidelines + * Fri Jul 26 2019 Fedora Release Engineering - 0.9.1-44 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From d99103a63ef9762683828065ca5cf0d9885d043e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 26 Nov 2019 10:06:00 +0100 Subject: [PATCH 51/73] Add missing BuildRequires: rubygems --- sdljava.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index ab4e2f8..00d0bd6 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -36,6 +36,7 @@ BuildRequires: bsh BuildRequires: jdom BuildRequires: xml-commons-apis BuildRequires: %{_bindir}/ruby +BuildRequires: rubygems Requires: java Requires: javapackages-filesystem @@ -218,7 +219,7 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog * Mon Nov 25 2019 Hans de Goede - 0.9.1-45 -- Drop unnecessary BuildRequires: jruby +- Replace unnecessary BuildRequires: jruby with BuildRequires: rubygems - Drop version prefix from javadocs installation the ghosted symlink blocking us from doing this has last shipped in Fedora 16 - Update to match latest java packaging guidelines From 3f0a3ea07bf9a57f3f335fe04762c4b9361216a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 23:08:10 +0000 Subject: [PATCH 52/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 00d0bd6..2a3bd20 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 45%{?dist} +Release: 46%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -218,6 +218,9 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 0.9.1-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Nov 25 2019 Hans de Goede - 0.9.1-45 - Replace unnecessary BuildRequires: jruby with BuildRequires: rubygems - Drop version prefix from javadocs installation the ghosted symlink From 5bef068930ce82aa5a0e60bff284dd25857a1cd7 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 6 Mar 2020 16:42:10 +0100 Subject: [PATCH 53/73] Replace path requires on dejavu with Requires: font(dejavusans) (rhbz#1731701) Adjust -demo font paths for F32+ font path changes (rhbz#1806272) --- sdljava.spec | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index 2a3bd20..ecfa9eb 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 46%{?dist} +Release: 47%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -63,10 +63,7 @@ Javadoc for %{name}. Summary: Some examples for %{name} 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: font(dejavusans) Requires: javapackages-tools %description demo @@ -194,13 +191,13 @@ popd #test data cp -a testdata $RPM_BUILD_ROOT%{_datadir}/%{name} -ln -s ../../fonts/dejavu/DejaVuSans.ttf \ +ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arial.ttf -ln -s ../../fonts/dejavu/DejaVuSans-Bold.ttf \ +ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-Bold.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbd.ttf -ln -s ../../fonts/dejavu/DejaVuSans-Oblique.ttf \ +ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-Oblique.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/ariali.ttf -ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ +ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-BoldOblique.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbi.ttf @@ -218,6 +215,10 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Fri Mar 6 2020 Hans de Goede - 0.9.1-47 +- Replace path requires on dejavu with Requires: font(dejavusans) (rhbz#1731701) +- Adjust -demo font paths for F32+ font path changes (rhbz#1806272) + * Thu Jan 30 2020 Fedora Release Engineering - 0.9.1-46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From a5f2e978af62629b8758566c40c062d6713a24a4 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 10 Mar 2020 10:28:53 +0100 Subject: [PATCH 54/73] Use fc-match to generate dejavu font file symlinks in -demo in case the file-paths or names change again in the future --- sdljava.rpmlintrc | 2 ++ sdljava.spec | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/sdljava.rpmlintrc b/sdljava.rpmlintrc index 02003cc..333107f 100644 --- a/sdljava.rpmlintrc +++ b/sdljava.rpmlintrc @@ -1,5 +1,7 @@ # We ship a cleaned tarbal with nonfree fonts removed addFilter("W: invalid-url Source0: sdljava-0.9.1.tar.gz") +# Silence warnings about the nonfree font replacement symlinks +addFilter("W: dangling-symlink .*") # The demos do not have docs / manpages, nor do they need these addFilter("W: no-manual-page-for-binary .*") addFilter("W: no-documentation") diff --git a/sdljava.spec b/sdljava.spec index ecfa9eb..73d383a 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 47%{?dist} +Release: 48%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -37,6 +37,8 @@ BuildRequires: jdom BuildRequires: xml-commons-apis BuildRequires: %{_bindir}/ruby BuildRequires: rubygems +# To generate the replacement font symlinks for the sdljava-demo testdata +BuildRequires: font(dejavusans) fontconfig Requires: java Requires: javapackages-filesystem @@ -191,13 +193,13 @@ popd #test data cp -a testdata $RPM_BUILD_ROOT%{_datadir}/%{name} -ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans.ttf \ +ln -s $(fc-match -f "%{file}" "sans") \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arial.ttf -ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-Bold.ttf \ +ln -s $(fc-match -f "%{file}" "sans:bold") \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbd.ttf -ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-Oblique.ttf \ +ln -s $(fc-match -f "%{file}" "sans:italic") \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/ariali.ttf -ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-BoldOblique.ttf \ +ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbi.ttf @@ -215,6 +217,10 @@ ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-BoldOblique.ttf \ %changelog +* Mon Mar 9 2020 Hans de Goede - 0.9.1-48 +- Use fc-match to generate dejavu font file symlinks in -demo in case the + file-paths or names change again in the future + * Fri Mar 6 2020 Hans de Goede - 0.9.1-47 - Replace path requires on dejavu with Requires: font(dejavusans) (rhbz#1731701) - Adjust -demo font paths for F32+ font path changes (rhbz#1806272) From 0263c91ab9db442f89df0a7d4e0356b5375864b9 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 06:22:00 +0200 Subject: [PATCH 55/73] Rebuilt for JDK-11 --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 73d383a..c1f3f82 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 48%{?dist} +Release: 49%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -217,6 +217,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sat Jul 11 2020 Jiri Vanek - 0.9.1-49 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Mon Mar 9 2020 Hans de Goede - 0.9.1-48 - Use fc-match to generate dejavu font file symlinks in -demo in case the file-paths or names change again in the future From 3c5b02be98e8d71fb518d5d2fa603fefb2218b34 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 10:28:16 +0000 Subject: [PATCH 56/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index c1f3f82..68f1881 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 49%{?dist} +Release: 50%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -217,6 +217,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.9.1-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jul 11 2020 Jiri Vanek - 0.9.1-49 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 94243a36a95a1fd75426c80b20dd808fe2f80d6c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:08:51 +0000 Subject: [PATCH 57/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 68f1881..e0a88dd 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 50%{?dist} +Release: 51%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -217,6 +217,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.9.1-51 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.9.1-50 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7643bad05f7c58bb8fe9086869c98e3934fa12b5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 17:16:54 +0000 Subject: [PATCH 58/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index e0a88dd..471df5e 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 51%{?dist} +Release: 52%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -217,6 +217,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.9.1-52 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 0.9.1-51 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 31ff529f152cb0e9059576cddce61361178a1601 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 2 Dec 2021 12:01:05 +0100 Subject: [PATCH 59/73] Drop sdljava-run-bsh.sh demo Drop now unnecessary bsh Requires --- sdljava.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index 471df5e..3a2ae4d 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 52%{?dist} +Release: 53%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -32,7 +32,6 @@ BuildRequires: SDL_ttf-devel BuildRequires: javapackages-local BuildRequires: ant BuildRequires: swig -BuildRequires: bsh BuildRequires: jdom BuildRequires: xml-commons-apis BuildRequires: %{_bindir}/ruby @@ -42,7 +41,6 @@ BuildRequires: font(dejavusans) fontconfig Requires: java Requires: javapackages-filesystem -Requires: bsh Requires: jdom %description @@ -98,8 +96,8 @@ sed -i "s#@GCC_INCLUDE_PATH@#$GCC_PATH/include#g" \ find ./testsrc -name '*.java' | xargs sed -i \ -e 's|testdata|%{_datadir}/%{name}/testdata|g' -# use system versions of bsh & jdom -build-jar-repository -p lib jdom bsh +# use system versions of jdom +build-jar-repository -p lib jdom # copy the Linux Makefiles into place cp etc/build/linux/Makefile src/sdljava/native @@ -184,6 +182,7 @@ cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir} pushd bin rm runtest.sh +rm run-bsh.sh for i in `ls -1 *.sh`; do sed -i -e 's|./runtest.sh|%{_bindir}/%{name}-runtest.sh|g' $i FN=`echo $i | awk 'BEGIN { FS="." }{ print $1 }'` @@ -217,6 +216,10 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Thu Dec 2 2021 Hans de Goede - 0.9.1-53 +- Drop sdljava-run-bsh.sh demo +- Drop now unnecessary bsh Requires + * Fri Jul 23 2021 Fedora Release Engineering - 0.9.1-52 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 2410884116061ff53ef20407806c9aadf2592ce8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 00:35:37 +0000 Subject: [PATCH 60/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 3a2ae4d..8c4dd46 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 53%{?dist} +Release: 54%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -216,6 +216,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.9.1-54 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Dec 2 2021 Hans de Goede - 0.9.1-53 - Drop sdljava-run-bsh.sh demo - Drop now unnecessary bsh Requires From b1b82c9d07b371ac6c40cc5895463abedfa5ecff Mon Sep 17 00:00:00 2001 From: Jiri Date: Sun, 6 Feb 2022 00:09:31 +0100 Subject: [PATCH 61/73] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 8c4dd46..c8236db 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 54%{?dist} +Release: 55%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -216,6 +216,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sat Feb 05 2022 Jiri Vanek - 0.9.1-55 +- Rebuilt for java-17-openjdk as system jdk + * Sat Jan 22 2022 Fedora Release Engineering - 0.9.1-54 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 54a6e88df818a0cd350ad9302f2a14ae819ddfd8 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 9 Feb 2022 21:09:40 -0700 Subject: [PATCH 62/73] Rebuild for glew 2.2 --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index c8236db..ed27e1e 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 55%{?dist} +Release: 56%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -216,6 +216,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Thu Feb 10 2022 Orion Poplawski - 0.9.1-56 +- Rebuild for glew 2.2 + * Sat Feb 05 2022 Jiri Vanek - 0.9.1-55 - Rebuilt for java-17-openjdk as system jdk From 7e0241216ebca790fd9fd3c7336b759eae8f4932 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 16 Jul 2022 22:02:58 +0200 Subject: [PATCH 63/73] sdljava provides java bindings for SDL and the JDK is no longer build on i686, disable i686 builds (rhbz#2104100) --- sdljava.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index ed27e1e..96589f5 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 56%{?dist} +Release: 57%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -38,6 +38,8 @@ BuildRequires: %{_bindir}/ruby BuildRequires: rubygems # To generate the replacement font symlinks for the sdljava-demo testdata BuildRequires: font(dejavusans) fontconfig +# sdljava provides java bindings for SDL, so it can only run on java_arches +ExclusiveArch: %{java_arches} Requires: java Requires: javapackages-filesystem @@ -71,10 +73,7 @@ Demonstrations and samples for %{name}. %prep -%setup -q -%patch0 -p1 -z .regen -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 find -name '*.jar' -or -name '*.class' -or -name '*.bat' -name '*.so' -delete rm -r etc/build/gljava/windows etc/build/windows @@ -216,6 +215,10 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sat Jul 16 2022 Hans de Goede - 0.9.1-57 +- sdljava provides java bindings for SDL and the JDK is no longer + build on i686, disable i686 builds (rhbz#2104100) + * Thu Feb 10 2022 Orion Poplawski - 0.9.1-56 - Rebuild for glew 2.2 From ca03a2e043d9f93d4045cf9b0d39f6b8e08d8e8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:16:58 +0000 Subject: [PATCH 64/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 96589f5..3509235 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 57%{?dist} +Release: 58%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -215,6 +215,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.9.1-58 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jul 16 2022 Hans de Goede - 0.9.1-57 - sdljava provides java bindings for SDL and the JDK is no longer build on i686, disable i686 builds (rhbz#2104100) From 5d875117c4c31c2e17bde9aeb4d1053c136964c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 02:54:38 +0000 Subject: [PATCH 65/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 3509235..d25186c 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 58%{?dist} +Release: 59%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -215,6 +215,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.9.1-59 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 0.9.1-58 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0fc2bbbc54fce47f65a8cc90ca68ac84fd5352d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:18:36 +0000 Subject: [PATCH 66/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index d25186c..5407f18 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 59%{?dist} +Release: 60%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -215,6 +215,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.9.1-60 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0.9.1-59 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 6371d3550f6c6bebbd7a9e1ae281314a0e531143 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 02:24:29 +0000 Subject: [PATCH 67/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 5407f18..cd3236a 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 60%{?dist} +Release: 61%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -215,6 +215,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.9.1-61 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.9.1-60 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From a66c12f39df69972b497bf46773d849c021e5079 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 18:08:18 +0100 Subject: [PATCH 68/73] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index cd3236a..ecac77a 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 61%{?dist} +Release: 62%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -215,6 +215,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Tue Feb 27 2024 Jiri Vanek - 0.9.1-62 +- Rebuilt for java-21-openjdk as system jdk + * Sat Jan 27 2024 Fedora Release Engineering - 0.9.1-61 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 24b282bd9f27671254ae9f2a6521239e357522db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:06:44 +0000 Subject: [PATCH 69/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index ecac77a..ae139c0 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 62%{?dist} +Release: 63%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -215,6 +215,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.9.1-63 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 0.9.1-62 - Rebuilt for java-21-openjdk as system jdk From 8b167dcb119be306c0ea8b7c2b77e8ce9084b60a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 21:50:35 +0200 Subject: [PATCH 70/73] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- sdljava.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index ae139c0..17613f7 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,9 +7,10 @@ Name: sdljava Version: 0.9.1 -Release: 63%{?dist} +Release: 64%{?dist} Summary: Java binding to the SDL API -License: LGPLv2+ +# Automatically converted from old format: LGPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2+ URL: http://sdljava.sourceforge.net/ # this is http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.gz # with the included Microsoft Copyrighted Arial fonts removed @@ -215,6 +216,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Wed Sep 04 2024 Miroslav Suchý - 0.9.1-64 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 0.9.1-63 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 0d0c6d294d23f0799c52c3dddb5104e8c5b2ed90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:18:06 +0000 Subject: [PATCH 71/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 17613f7..43b9c53 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 64%{?dist} +Release: 65%{?dist} Summary: Java binding to the SDL API # Automatically converted from old format: LGPLv2+ - review is highly recommended. License: LicenseRef-Callaway-LGPLv2+ @@ -216,6 +216,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.9.1-65 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Sep 04 2024 Miroslav Suchý - 0.9.1-64 - convert license to SPDX From 277e2459a072596f8cf31ee05f8f069a3a1c1b27 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:05:28 +0000 Subject: [PATCH 72/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- sdljava.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdljava.spec b/sdljava.spec index 43b9c53..8887c8b 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 65%{?dist} +Release: 66%{?dist} Summary: Java binding to the SDL API # Automatically converted from old format: LGPLv2+ - review is highly recommended. License: LicenseRef-Callaway-LGPLv2+ @@ -216,6 +216,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.9.1-66 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 0.9.1-65 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 88dcd0ea3fffd87f771a4a481fbd9a8dc6ba9136 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 28 Jul 2025 19:23:31 +0200 Subject: [PATCH 73/73] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- sdljava.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index 8887c8b..fc8380d 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 66%{?dist} +Release: 67%{?dist} Summary: Java binding to the SDL API # Automatically converted from old format: LGPLv2+ - review is highly recommended. License: LicenseRef-Callaway-LGPLv2+ @@ -30,8 +30,8 @@ BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel BuildRequires: SDL_ttf-devel -BuildRequires: javapackages-local -BuildRequires: ant +BuildRequires: javapackages-local-openjdk25 +BuildRequires: ant-openjdk25 BuildRequires: swig BuildRequires: jdom BuildRequires: xml-commons-apis @@ -42,7 +42,7 @@ BuildRequires: font(dejavusans) fontconfig # sdljava provides java bindings for SDL, so it can only run on java_arches ExclusiveArch: %{java_arches} -Requires: java +Requires: java-25 Requires: javapackages-filesystem Requires: jdom @@ -216,6 +216,9 @@ ln -s $(fc-match -f "%{file}" "sans:bold:italic") \ %changelog +* Mon Jul 28 2025 jiri vanek - 0.9.1-67 +- Rebuilt for java-25-openjdk as preffered jdk + * Fri Jul 25 2025 Fedora Release Engineering - 0.9.1-66 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild