[scirenderer] use noarch (undo the previous change)

Clément David davidcl at fedoraproject.org
Tue Dec 4 08:11:31 UTC 2012


commit 7d84238f03225dc05df925c8e9dccfd236c3401f
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date:   Tue Dec 4 09:11:09 2012 +0100

    use noarch (undo the previous change)
    
    - avoid using %{libdir} on a noarch package

 scirenderer.spec |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/scirenderer.spec b/scirenderer.spec
index 1ed56b3..1f227a9 100644
--- a/scirenderer.spec
+++ b/scirenderer.spec
@@ -1,6 +1,6 @@
 Name:           scirenderer
 Version:        1.0.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Java rendering library based on JoGL
 
 License:        CeCILL
@@ -19,8 +19,7 @@ Requires:       jpackage-utils
 Requires:       jogl2
 Requires:       jlatexmath
 
-# koji build issue on f19 and f18
-#BuildArch:      noarch   
+BuildArch:      noarch
 
 %description
 This Java API allows 2-D or 3-D plotting from simple 2-D graph to complex
@@ -40,11 +39,10 @@ This package contains the API documentation for %{name}.
 %setup -q
 
 # Update path according to the Fedora Guidelines
-tee >scirenderer-libs.properties << EOF
-jogl2.jar = %{_libdir}/jogl2/jogl2.jar
-gluegen2-rt.jar = %{_libdir}/gluegen2/gluegen2-rt.jar
-jlatexmath.jar = %{_javadir}/jlatexmath.jar
-jni.path = %{_libdir}/java:%{_libdir}/jogl2:%{_libdir}/gluegen2
+tee scirenderer-libs.properties << EOF
+jogl2.jar = $(build-classpath jogl2)
+gluegen2-rt.jar = $(build-classpath gluegen2-rt)
+jlatexmath.jar = $(build-classpath jlatexmath.jar)
 EOF
 
 # fix file-not-utf8
@@ -77,6 +75,10 @@ cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}
 %doc CHANGES
 
 %changelog
+* Mon Dec 03 2012 Clément David <c.david86 at gmail.com> - 1.0.2-4
+- use noarch (undo the previous change)
+- avoid using %%{libdir} on a noarch package
+
 * Wed Nov 28 2012 Clément David <c.david86 at gmail.com> - 1.0.2-3
 - remove noarch to pass the build (f19 and f18)
 


More information about the scm-commits mailing list