[jinput] Use add_maven_depmap instead of add_to_maven_depmap to fix FTBFS during mass rebuild.

Jerry James jjames at fedoraproject.org
Sun Aug 4 02:40:06 UTC 2013


commit adb7ae0da3074b1ca078b94d22dbb32fc4ba1a42
Author: Jerry James <loganjerry at gmail.com>
Date:   Sat Aug 3 20:39:20 2013 -0600

    Use add_maven_depmap instead of add_to_maven_depmap to fix FTBFS
    during mass rebuild.

 jinput.spec |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/jinput.spec b/jinput.spec
index c46cb69..1765ae0 100644
--- a/jinput.spec
+++ b/jinput.spec
@@ -95,12 +95,12 @@ javadoc -d javadoc -classpath lib/jutils.jar:dist/jinput.jar -package \
 
 %install
 # jar
-install -Dp -m 644 dist/%{name}.jar \
-    $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}.jar
+install -Dp -m 644 dist/%{name}.jar $RPM_BUILD_ROOT%{_jnidir}/%{name}.jar
 
 # jni
 install -Dp -m 755 dist/libjinput* \
     $RPM_BUILD_ROOT%{_libdir}/%{name}/libjinput.so
+ln -s ../../..%{_jnidir}/%{name}.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/
 
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
@@ -112,14 +112,15 @@ install -pm 644 jinput-platform.pom  \
     $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-platform.pom
 install -pm 644 jinput.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 
-%add_to_maven_depmap JPP-%{name}.pom %{name}.jar
-%add_to_maven_depmap JPP-%{name}-platform.pom 
+%add_maven_depmap
+%add_maven_depmap JPP-%{name}-platform.pom 
 
 %check
 ant versiontest
 
 %files
 %doc README.txt 
+%{_jnidir}/%{name}.jar
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 %{_libdir}/%{name}


More information about the scm-commits mailing list