[shogun/el5] move Java-bindings to proper location and fix naming-conflict with Mono-bindings
by Björn 'besser82' Esser
commit 2ac52bfd6ba111c9e491a960d1710bb63fe7b320
Author: Björn Esser <bjoern.esser(a)gmail.com>
Date: Mon Feb 24 15:32:25 2014 +0100
move Java-bindings to proper location and fix naming-conflict with Mono-bindings
shogun.spec | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/shogun.spec b/shogun.spec
index 6d22369..6d02243 100644
--- a/shogun.spec
+++ b/shogun.spec
@@ -338,6 +338,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
This package contains the Java-plugin for %{name}.
%files -n java-%{name}
+%{_jnidir}/*
+%{_libdir}/%{name}.java
%endif #0%{?with_java}
###############################################################################
@@ -388,7 +390,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
This package contains the Mono(C#)-plugin for %{name}.
%files -n mono-%{name}
-%{_libdir}/%{name}
+%{_libdir}/%{name}.mono
%endif #ifarch %%{mono_arches}
%endif #0%{?with_mono}
@@ -776,7 +778,7 @@ make install DESTDIR=${CUSTOM_INSTALL_DIR}
popd
# Remove the installed headers and libshogun.so
-rm -rf ${CUSTOM_INSTALL_DIR}%{_includedir} \
+rm -rf ${CUSTOM_INSTALL_DIR}%{_includedir} \
${CUSTOM_INSTALL_DIR}%{_libdir}/lib%{name}.so*
%endif #0%{?with_python3}
@@ -784,10 +786,21 @@ pushd build
make install DESTDIR=${CUSTOM_INSTALL_DIR}
popd
+%if 0%{?with_java}
+# Move Java-bindings to proper location.
+mkdir -p ${CUSTOM_INSTALL_DIR}%{_libdir}/%{name}.java \
+ ${CUSTOM_INSTALL_DIR}%{_jnidir}
+mv ${CUSTOM_INSTALL_DIR}%{_prefix}/lib/jni/libmod%{name}.so \
+ ${CUSTOM_INSTALL_DIR}%{_libdir}/%{name}.java
+mv ${CUSTOM_INSTALL_DIR}%{_javadir}/*.jar ${CUSTOM_INSTALL_DIR}%{_jnidir}
+%endif #0%{?with_java}
+
%if 0%{?with_mono}
# Move Mono(C#)-bindings to the proper location.
-mv ${CUSTOM_INSTALL_DIR}/%{_prefix}/lib/cli/%{name} ${CUSTOM_INSTALL_DIR}%{_libdir}
-%endif
+mkdir -p ${CUSTOM_INSTALL_DIR}%{_libdir}/%{name}.mono
+mv ${CUSTOM_INSTALL_DIR}%{_prefix}/lib/cli/%{name}/libmod%{name}.so \
+ ${CUSTOM_INSTALL_DIR}%{_libdir}/%{name}.mono
+%endif #0%{?with_mono}
# Fix-up the permissions for some plugins.
find ${CUSTOM_INSTALL_DIR} -depth -type f -name '*.so' -print0 | \
10 years, 3 months
[shogun/el5] remove the installed headers and libshogun.so
by Björn 'besser82' Esser
commit 4bd7430ae4baa9dbaac38ab738c4c296fa185fd4
Author: Björn Esser <bjoern.esser(a)gmail.com>
Date: Mon Feb 24 14:49:42 2014 +0100
remove the installed headers and libshogun.so
shogun.spec | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/shogun.spec b/shogun.spec
index e9ddfbf..6d22369 100644
--- a/shogun.spec
+++ b/shogun.spec
@@ -774,6 +774,10 @@ export CUSTOM_INSTALL_DIR="`pwd`/test_install/"
pushd %{py3dir}/build
make install DESTDIR=${CUSTOM_INSTALL_DIR}
popd
+
+# Remove the installed headers and libshogun.so
+rm -rf ${CUSTOM_INSTALL_DIR}%{_includedir} \
+ ${CUSTOM_INSTALL_DIR}%{_libdir}/lib%{name}.so*
%endif #0%{?with_python3}
pushd build
10 years, 3 months
[shogun] keep a clean copy of examples
by Björn 'besser82' Esser
Summary of changes:
2aa35da... keep a clean copy of examples (*)
(*) This commit already existed in another branch; no separate mail sent
10 years, 3 months