[sdljava] Rebuild for new SDL_gfx Drop gcj aot bits, Fedora has not been using these for a long long time Upda
Hans de Goede
jwrdegoede at fedoraproject.org
Fri Jul 15 06:57:11 UTC 2011
commit 05b2e7bdf72f520ed2907b6f6cfbf3d32672e8a3
Author: Hans de Goede <hdegoede at redhat.com>
Date: Fri Jul 15 08:58:13 2011 +0200
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 files 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 <hdegoede at redhat.com> - 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 at redhat.com - 0.9.1-15
- Rebuild for new glew soname
More information about the scm-commits
mailing list