commit 9e353f56b63c5b7c1e8e08f0a970a7012866655f
Author: Clément DAVID <clement.david(a)scilab-enterprises.com>
Date: Fri Jan 25 16:33:25 2013 +0100
Upgrade to the Java packaging draft (JNI jar/so location)
- Avoid using build-classpath to ease branch merge (and jnidir changes)
jogl2.spec | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/jogl2.spec b/jogl2.spec
index 0a9f64b..18309cc 100644
--- a/jogl2.spec
+++ b/jogl2.spec
@@ -106,7 +106,7 @@ for file in README.txt; do
done
# git executable should not be used, use true (to avoid checkout) instead
-sed -i 's/executable="git"/executable="true"/'
make/build.xml
+sed -i 's/executable="git"/executable="true"/'
make/build-common.xml
%build
cd make
@@ -114,13 +114,13 @@ ant -Dc.compiler.debug=true \
-Djavacdebug=false \
-Dcommon.gluegen.build.done=true \
\
- -Dantlr.jar=$(build-classpath antlr.jar) \
- -Djunit.jar=$(build-classpath junit.jar) \
- -Dant.jar=$(build-classpath ant.jar) \
- -Dant-junit.jar=/usr/share/java/ant/ant-junit.jar \
- -Dgluegen.jar=$(build-classpath gluegen2) \
- -Dgluegen-rt.jar=%{_libdir}/gluegen2/gluegen2-rt.jar \
- -Dswt.jar=$(build-classpath swt.jar) \
+ -Dantlr.jar=%{_javadir}/antlr.jar \
+ -Djunit.jar=%{_javadir}/junit.jar \
+ -Dant.jar=%{_javadir}/ant.jar \
+ -Dant-junit.jar=%{_javadir}/ant/ant-junit.jar \
+ -Dgluegen.jar=%{_javadir}/gluegen2.jar \
+ -Dgluegen-rt.jar=%{_jnidir}/gluegen2-rt.jar \
+ -Dswt.jar=%{_libdir}/eclipse/swt.jar \
\
-Djavadoc.link=%{_javadocdir}/java \
-Dgluegen.link=%{_javadocdir}/gluegen2 \
@@ -129,12 +129,13 @@ ant -Dc.compiler.debug=true \
javadoc.all
%install
-mkdir -p %{buildroot}%{_libdir}/%{name} \
+mkdir -p %{buildroot}%{_javadir}/%{name} \
+ %{buildroot}%{_libdir}/%{name} \
%{buildroot}%{_jnidir}
-install build/jar/jogl-all.jar %{buildroot}%{_libdir}/%{name}/%{name}.jar
+install build/jar/jogl-all.jar %{buildroot}%{_jnidir}/%{name}.jar
+ln -s ../../..%{_jnidir}/%{name}.jar %{buildroot}%{_libdir}/%{name}/
install -t %{buildroot}%{_libdir}/%{name}/ build/lib/*.so
-ln -s ../%{name}/%{name}.jar %{buildroot}%{_jnidir}/
# Provide JPP pom
mkdir -p %{buildroot}%{_mavenpomdir}
@@ -156,7 +157,7 @@ find %{buildroot}%{_docdir}/%{name} -name '*.html' \
%files
%doc README.txt LICENSE.txt CHANGELOG.txt
%{_libdir}/%{name}
-%{_jnidir}/*
+%{_jnidir}/%{name}.jar
%{_mavendepmapfragdir}/%{name}
%{_mavenpomdir}/JPP-%{name}.pom
@@ -170,7 +171,8 @@ find %{buildroot}%{_docdir}/%{name} -name '*.html' \
%changelog
* Mon Jan 21 2013 Clément David <c.david86(a)gmail.com> - 2.0-0.7.rc11
-- Use build-classpath to locate swt.jar
+- Upgrade to the Java packaging draft (JNI jar/so location)
+- Avoid using build-classpath to ease branch merge (and jnidir changes)
* Fri Jan 04 2013 Clément David <c.david86(a)gmail.com> - 2.0-0.6.rc11
- Update version
@@ -185,7 +187,7 @@ find %{buildroot}%{_docdir}/%{name} -name '*.html' \
* Tue Oct 02 2012 Clément David <c.david86(a)gmail.com> - 2.0-0.3.rc10
- Provide a pom file
-* Mon Sep 20 2012 Clément David <c.david86(a)gmail.com> - 2.0-0.2.rc10
+* Thu Sep 20 2012 Clément David <c.david86(a)gmail.com> - 2.0-0.2.rc10
- Add javadoc full subpackage
- Provide symlink on %%{jnidir}
Show replies by date