[jogl2] Use build-classpath to locate swt.jar

Clément David davidcl at fedoraproject.org
Mon Jan 21 13:12:24 UTC 2013


commit 14878e28d00c60fadbf4e78e1074cf6df71d17cb
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date:   Mon Jan 21 14:11:59 2013 +0100

    Use build-classpath to locate swt.jar

 .gitignore |    1 +
 jogl2.spec |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b4de45d..ea84850 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ jogl2-*.src.rpm
 /gluegen/
 /noarch/
 /x86_64/
+clog
diff --git a/jogl2.spec b/jogl2.spec
index 197b7f3..0a9f64b 100644
--- a/jogl2.spec
+++ b/jogl2.spec
@@ -1,7 +1,7 @@
 # baserelease defines which build revision of this version we're building.
 # The magical name baserelease is matched by the rpmdev-bumpspec tool, which
 # you should use.
-%global baserelease 6
+%global baserelease 7
 
 %global pkg_name jogl
 %global pkg_version 2.0
@@ -120,7 +120,7 @@ ant -Dc.compiler.debug=true \
     -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=%{_jnidir}/swt.jar \
+    -Dswt.jar=$(build-classpath swt.jar) \
     \
     -Djavadoc.link=%{_javadocdir}/java \
     -Dgluegen.link=%{_javadocdir}/gluegen2 \
@@ -169,6 +169,9 @@ find %{buildroot}%{_docdir}/%{name} -name '*.html' \
 %{_docdir}/%{name}
 
 %changelog
+* Mon Jan 21 2013 Clément David <c.david86 at gmail.com> - 2.0-0.7.rc11
+- Use build-classpath to locate swt.jar
+
 * Fri Jan 04 2013 Clément David <c.david86 at gmail.com> - 2.0-0.6.rc11
 - Update version
 


More information about the scm-commits mailing list