diff --git a/COPASI.spec b/COPASI.spec index d691830..0840b6f 100644 --- a/COPASI.spec +++ b/COPASI.spec @@ -1,7 +1,3 @@ -%if 0%{?fedora} <= 22 -%global _hardened_build 1 -%endif - ##Disabled debug package for unknown error #/usr/lib/rpm/debugedit: canonicalization unexpectedly shrank by one character %global _enable_debug_packages %{nil} @@ -46,7 +42,7 @@ Name: COPASI Summary: Biochemical network simulator Version: 4.16 -Release: 0.18.%{date}git%(echo %{checkout} | cut -c-6)%{?dist} +Release: 0.19.%{date}git%(echo %{checkout} | cut -c-6)%{?dist} ##Artistic 2.0 is main license ##GPLv2+ is related to a Mixed Source Licensing Scenario @@ -252,10 +248,8 @@ sed -e 's|@@qtplot3d_libdir@@|%{_libdir}|g' -i CMakeModules/FindQwtplot3dQt4.cma %build mkdir -p build && pushd build %if 0%{?fedora} < 23 -export LDFLAGS="%{__global_ldflags} -Wl,-z,now -pthread" export CXXFLAGS="-DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} -Wl,-z,relro -Wl,-z,now -DCOPASI_OVERWRITE_USE_LAPACK -DNO_BLAS_WRAP" %else -export LDFLAGS="%{__global_ldflags} -fPIC -pie -Wl,-z,now -pthread" export CXXFLAGS="-DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -DCOPASI_OVERWRITE_USE_LAPACK -DNO_BLAS_WRAP" %endif %cmake -Wno-dev \ @@ -297,9 +291,11 @@ export CXXFLAGS="-DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} -Wl,-z,relro - %endif -DBUILD_GUI:BOOL=ON -DBUILD_COPASISBW:BOOL=ON --DENABLE_MML:BOOL=ON -DENABLE_USE_SBMLUNIT=ON \ %if 0%{?fedora} < 23 - -DCMAKE_EXE_LINKER_FLAGS:STRING=" " \ + -DCMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} -Wl,-z,now -pthread" \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="%{__global_ldflags} -Wl,-z,relro -Wl,-z,now" \ %else - -DCMAKE_EXE_LINKER_FLAGS:STRING="-fPIC -pie" \ + -DCMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -pthread" \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="%{__global_ldflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now" \ %endif -DMML_INCLUDE_DIR:PATH=%{_kde4_includedir}/libkdeedu/qtmml -DMML_LIBRARY:FILEPATH=%{_kde4_libdir}/libqtmmlwidget.a \ -DENABLE_SBW_INTEGRATION=ON -DBUILD_CXX_EXAMPLES=ON \ @@ -322,7 +318,6 @@ popd ## ----> Move to build2 directory ## %if 0%{?with_python3} mkdir -p build2 && pushd build2 -export LDFLAGS="%{__global_ldflags} -fPIC -pie -Wl,-z,now -pthread" export CXXFLAGS="-DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -DCOPASI_OVERWRITE_USE_LAPACK -DNO_BLAS_WRAP" %cmake -Wno-dev \ -DENABLE_PYTHON:BOOL=ON \ @@ -357,7 +352,8 @@ export CXXFLAGS="-DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} -Wl,-z,relro - %endif %endif -DBUILD_GUI:BOOL=OFF -DENABLE_MML:BOOL=OFF -DENABLE_USE_SBMLUNIT=ON \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="-fPIC -pie" \ + -DCMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -pthread" \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="%{__global_ldflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now" \ -DENABLE_SBW_INTEGRATION=ON -DBUILD_CXX_EXAMPLES=ON \ -DENABLE_COPASI_BANDED_GRAPH:BOOL=ON -DENABLE_COPASI_SEDML:BOOL=ON \ -DENABLE_COPASI_NONLIN_DYN_OSCILLATION:BOOL=ON -DENABLE_COPASI_EXTUNIT:BOOL=ON \ @@ -421,6 +417,8 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml <%{name}.desktop CC0-1.0 The COPASI graphical user interface + COPASI + Artistic-2.0 and GPL-3.0+ and BSD @@ -535,6 +533,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/*.appda %{_datadir}/copasi/doc/ %changelog +* Sat Nov 14 2015 Antonio Trande 4.16-0.19.20150817git3bc4e9 +- Rebuilt for libsbml-5.12.0 and Python3.5 + * Tue Nov 10 2015 Fedora Release Engineering - 4.16-0.18.20150817git3bc4e9 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5