sagitter pushed to libsedml (master). "Added missing linkage to libsbml"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Jun 12 12:57:07 UTC 2015
From 7491c67d11ffd5ac59c7da15d6d01315d7468518 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter at fedoraproject.org>
Date: Fri, 12 Jun 2015 14:56:46 +0200
Subject: Added missing linkage to libsbml
diff --git a/libsedml.spec b/libsedml.spec
index 553ab8c..2a5af3a 100644
--- a/libsedml.spec
+++ b/libsedml.spec
@@ -27,7 +27,7 @@
%global with_check 0
-%global octpkg SEDML
+%global octpkg libsedml
%if 0%{?with_octave}
# Exclude .oct files from provides
%global __provides_exclude_from ^%{octpkglibdir}/.*\\.oct$
@@ -38,7 +38,7 @@
Name: libsedml
Summary: Library that fully supports SED-ML for SBML
Version: 0.3.0
-Release: 8.%{date}git%(echo %{checkout} | cut -c-6)%{?dist}
+Release: 9.%{date}git%(echo %{checkout} | cut -c-6)%{?dist}
URL: https://github.com/fbergmann/libSEDML
Source0: https://github.com/fbergmann/libSEDML/archive/%{checkout}.zip#/libSEDML-%{checkout}.zip
License: BSD
@@ -170,8 +170,9 @@ of libSEDML libraries.
%patch0 -p0
%build
-######################################################################################################
-mkdir build && pushd build
+
+%if 0%{?with_python3}
+mkdir build2 && pushd build2
export LDFLAGS="%{__global_ldflags} -Wl,--as-needed"
##Fix 'some warnings being treated as errors'
##https://github.com/fbergmann/libSEDML/issues/8
@@ -179,67 +180,62 @@ SEDMLOPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | sed -e 's/-Werror=format-security/-Wno-
export CFLAGS="$SEDMLOPT_FLAGS"
export CXXFLAGS="$SEDMLOPT_FLAGS"
%cmake -Wno-dev \
-%if 0%{?with_python2}
-DWITH_PYTHON:BOOL=ON \
-DWITH_SWIG:BOOL=ON \
- -DPYTHON_EXECUTABLE=%{__python2} \
- -DPYTHON_INCLUDE_DIRS=%{_includedir}/python%{python2_version} \
- -DPYTHON_LIBRARIES=%{_libdir}/libpython%{python2_version}.so \
-%endif
+ -DPYTHON_EXECUTABLE:FILEPATH=%{__python3} \
+ -DPYTHON_INCLUDE_DIR:PATH=%{_includedir}/python%{python3_version}m \
+ -DPYTHON_LIBRARY:FILEPATH=%{_libdir}/libpython%{python3_version}m.so \
%if 0%{?with_java}
- -DWITH_JAVA:BOOL=ON \
- -DWITH_SWIG:BOOL=ON \
+ -DWITH_JAVA:BOOL=OFF \
+ -DWITH_SWIG:BOOL=OFF \
%endif
%if 0%{?with_octave}
- -DWITH_OCTAVE:BOOL=ON \
+ -DWITH_OCTAVE:BOOL=OFF \
%endif
%if 0%{?with_perl}
- -DWITH_PERL:BOOL=ON \
+ -DWITH_PERL:BOOL=OFF \
%endif
%if 0%{?with_ruby}
- -DWITH_RUBY:BOOL=ON \
+ -DWITH_RUBY:BOOL=OFF \
%endif
%if 0%{?with_r}
- -DWITH_R:BOOL=ON \
+ -DWITH_R:BOOL=OFF \
-DR_INCLUDE_DIRS:PATH=%{_includedir}/R \
%endif
%if 0%{?with_mono}
- -DWITH_CSHARP:BOOL=ON \
- -DWITH_SWIG:BOOL=ON \
+ -DWITH_CSHARP:BOOL=OFF \
+ -DWITH_SWIG:BOOL=OFF \
%if 0%{?fedora} > 22
-DCSHARP_COMPILER:FILEPATH=%{_bindir}/mcs \
%endif
%endif
%if 0%{?with_doc}
- -DWITH_DOXYGEN:BOOL=ON \
+ -DWITH_DOXYGEN:BOOL=OFF \
%endif
%if 0%{?with_check}
- -DWITH_CHECK:BOOL=ON \
- -DWITH_EXAMPLES:BOOL=ON \
+ -DWITH_CHECK:BOOL=OFF \
+ -DWITH_EXAMPLES:BOOL=OFF \
%endif
+ -DCMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING="-L%{_libdir} -lxml2 -lz -lbz2 -lpthread -lsbml" \
-DLIBSBML_LIBRARY=%{_libdir} -DLIBSBML_INCLUDE_DIR:PATH=%{_includedir} \
-DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DLIBSEDML_SHARED_VERSION:BOOL=ON \
- -DEXTRA_LIBS:STRING="xml2;bz2;z" -DLIBSBML_STATIC:BOOL=OFF \
+ -DEXTRA_LIBS:STRING="sbml;xml2;bz2;z" -DLIBSBML_STATIC:BOOL=OFF \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-I%{_includedir}/libxml2" \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE -DCMAKE_COLOR_MAKEFILE:BOOL=ON \
-DCPACK_BINARY_TZ:BOOL=OFF -DCPACK_BINARY_TGZ:BOOL=OFF \
-DCPACK_SOURCE_TBZ2:BOOL=OFF -DCPACK_SOURCE_TGZ:BOOL=OFF \
-DCPACK_SOURCE_TZ:BOOL=OFF -DWITH_ZLIB:BOOL=ON -DWITH_CPP_NAMESPACE:BOOL=OFF \
-DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES ..
-##'Parallel make' breaks Java library's building
-%if 0%{?with_java}
-make
-%else
make %{?_smp_mflags}
-%endif
-
popd
+%endif
-## ----> Move to build2 directory ##
+######################################################################################################
+## ----> Move to build directory ##
-%if 0%{?with_python3}
-mkdir build2 && pushd build2
+mkdir build && pushd build
export LDFLAGS="%{__global_ldflags} -Wl,--as-needed"
##Fix 'some warnings being treated as errors'
##https://github.com/fbergmann/libSEDML/issues/8
@@ -247,54 +243,63 @@ SEDMLOPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | sed -e 's/-Werror=format-security/-Wno-
export CFLAGS="$SEDMLOPT_FLAGS"
export CXXFLAGS="$SEDMLOPT_FLAGS"
%cmake -Wno-dev \
+%if 0%{?with_python2}
-DWITH_PYTHON:BOOL=ON \
-DWITH_SWIG:BOOL=ON \
- -DPYTHON_EXECUTABLE=%{__python3} \
- -DPYTHON_INCLUDE_DIRS=%{_includedir}/python%{python3_version} \
- -DPYTHON_LIBRARIES=%{_libdir}/libpython%{python3_version}.so \
+ -DPYTHON_EXECUTABLE:FILEPATH=%{__python2} \
+ -DPYTHON_INCLUDE_DIR:PATH=%{_includedir}/python%{python2_version} \
+ -DPYTHON_LIBRARY:FILEPATH=%{_libdir}/libpython%{python2_version}.so \
+%endif
%if 0%{?with_java}
- -DWITH_JAVA:BOOL=OFF \
- -DWITH_SWIG:BOOL=OFF \
+ -DWITH_JAVA:BOOL=ON \
+ -DWITH_SWIG:BOOL=ON \
%endif
%if 0%{?with_octave}
- -DWITH_OCTAVE:BOOL=OFF \
+ -DWITH_OCTAVE:BOOL=ON \
%endif
%if 0%{?with_perl}
- -DWITH_PERL:BOOL=OFF \
+ -DWITH_PERL:BOOL=ON \
%endif
%if 0%{?with_ruby}
- -DWITH_RUBY:BOOL=OFF \
+ -DWITH_RUBY:BOOL=ON \
%endif
%if 0%{?with_r}
- -DWITH_R:BOOL=OFF \
+ -DWITH_R:BOOL=ON \
-DR_INCLUDE_DIRS:PATH=%{_includedir}/R \
%endif
%if 0%{?with_mono}
- -DWITH_CSHARP:BOOL=OFF \
- -DWITH_SWIG:BOOL=OFF \
+ -DWITH_CSHARP:BOOL=ON \
+ -DWITH_SWIG:BOOL=ON \
%if 0%{?fedora} > 22
-DCSHARP_COMPILER:FILEPATH=%{_bindir}/mcs \
%endif
%endif
%if 0%{?with_doc}
- -DWITH_DOXYGEN:BOOL=OFF \
+ -DWITH_DOXYGEN:BOOL=ON \
%endif
%if 0%{?with_check}
- -DWITH_CHECK:BOOL=OFF \
- -DWITH_EXAMPLES:BOOL=OFF \
+ -DWITH_CHECK:BOOL=ON \
+ -DWITH_EXAMPLES:BOOL=ON \
%endif
+ -DCMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING="-L%{_libdir} -lxml2 -lz -lbz2 -lpthread -lsbml" \
-DLIBSBML_LIBRARY=%{_libdir} -DLIBSBML_INCLUDE_DIR:PATH=%{_includedir} \
-DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DLIBSEDML_SHARED_VERSION:BOOL=ON \
- -DEXTRA_LIBS:STRING="xml2;bz2;z" -DLIBSBML_STATIC:BOOL=OFF \
+ -DEXTRA_LIBS:STRING="sbml;xml2;bz2;z" -DLIBSBML_STATIC:BOOL=OFF \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING=" -I%{_includedir}/libxml2" \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE -DCMAKE_COLOR_MAKEFILE:BOOL=ON \
-DCPACK_BINARY_TZ:BOOL=OFF -DCPACK_BINARY_TGZ:BOOL=OFF \
-DCPACK_SOURCE_TBZ2:BOOL=OFF -DCPACK_SOURCE_TGZ:BOOL=OFF \
-DCPACK_SOURCE_TZ:BOOL=OFF -DWITH_ZLIB:BOOL=ON -DWITH_CPP_NAMESPACE:BOOL=OFF \
-DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES ..
+##'Parallel make' breaks Java library's building
+%if 0%{?with_java}
+make
+%else
make %{?_smp_mflags}
%endif
+
####################################################################################################
%install
@@ -304,15 +309,17 @@ make -C build DESTDIR=$RPM_BUILD_ROOT install
make -C build2 DESTDIR=$RPM_BUILD_ROOT install
%endif
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/libsedml
+
##Only for R library
%if 0%{?with_r}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library build/bindings/r/libSEDML_%{version}_R_*.tar.gz
-test -d lib%{octpkg}/src && (cd lib%{octpkg}/src; rm -f *.o *.so)
-rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/lib%{octpkg}/R.css
+test -d %{octpkg}/src && (cd %{octpkg}/src; rm -f *.o *.so)
+rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/%{octpkg}/R.css
# Make symlink instead hard-link
-ln -sf %{_libdir}/libSEDML.so $RPM_BUILD_ROOT%{_libdir}/R/library/lib%{octpkg}/libs/libSEDML.so
+ln -sf %{_libdir}/libSEDML.so $RPM_BUILD_ROOT%{_libdir}/R/library/libSEDML/libs/libSEDML.so
%endif
##
@@ -389,7 +396,7 @@ cd build
%files -n R-%{octpkg}
%doc *.md
%license LICENSE.txt
-%{_libdir}/R/library/lib%{octpkg}/
+%{_libdir}/R/library/libSEDML/
%{_libdir}/libSEDML.so
%endif
@@ -412,6 +419,10 @@ cd build
%endif
%changelog
+* Thu Jun 11 2015 Antonio Trande <sagitterATfedoraproject.org> 0.3.0-9.20150422git235bb5
+- Added missing linkage to libsbml
+- Fixed Python variables
+
* Mon Jun 08 2015 Antonio Trande <sagitterATfedoraproject.org> 0.3.0-8.20150422git235bb5
- Python2 package is named python-libsedml
- Forced same documentation directory for all sub-packages
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/libsedml.git/commit/?h=master&id=7491c67d11ffd5ac59c7da15d6d01315d7468518
More information about the scm-commits
mailing list