From 57e0ea8ac9c2220a8fb557dfc2213efcdcd61b55 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter@fedoraproject.org>
Date: Sep 27 2018 18:38:54 +0000
Subject: Bundle minizip on fedora 30+ (rhbz#1632172) (upstream bug #466)


---

diff --git a/COPASI.spec b/COPASI.spec
index 053a34b..d290553 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -32,7 +32,7 @@
 Name:  COPASI
 Summary: Biochemical network simulator
 Version: 4.24.%{buildid}
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 ##Artistic 2.0 is main license
 ##GPLv2+ is related to a Mixed Source Licensing Scenario
@@ -66,7 +66,6 @@ BuildRequires: libsedml-devel >= 1:0.4.3-3
 BuildRequires: libnuml-devel
 BuildRequires: libCombine-devel
 BuildRequires: zipper-devel
-BuildRequires: minizip-compat-devel
 BuildRequires: libsbw-devel
 BuildRequires: raptor-devel
 BuildRequires: mesa-libGL-devel
@@ -90,6 +89,17 @@ BuildRequires: cmake, gcc, gcc-c++
 BuildRequires: bison
 BuildRequires: ImageMagick
 BuildRequires: libappstream-glib
+# Use new minizip starting from fedora 30
+# rhbz #1632172
+%if 0%{?fedora} == 29
+BuildRequires:  minizip-compat-devel
+%endif
+%if 0%{?fedora} == 28
+BuildRequires:  minizip-devel
+%endif
+%if 0%{?fedora} >= 30
+#BuildRequires:  minizip-devel >= 2.5.0
+%endif
 
 Requires: %{name}-data = %{version}-%{release}
 Requires: libsedml%{?_isa} >= 1:0.4.3-3
@@ -267,7 +277,7 @@ sed -e 's|@@_libmml_libdir@@|%{_qt5_libdir}|g' -i CMakeModules/FindQtMmlQt4.cmak
 
 %build
 mkdir -p build && pushd build
-export CXXFLAGS="-DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -DCOPASI_OVERWRITE_USE_LAPACK -DNO_BLAS_WRAP"
+export CXXFLAGS="-DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} %{__global_ldflags} -DCOPASI_OVERWRITE_USE_LAPACK -DNO_BLAS_WRAP"
 
 %ifarch %{openblas_arches}
 export LIBBLAS=libopenblas.so
@@ -320,8 +330,8 @@ export INCBLAS=%{_includedir}
  -DQWT_LIBRARY:FILEPATH=%{_qt5_libdir}/libqwt-qt5.so \
  -DQWT_INCLUDE_DIR:PATH=%{_qt5_headerdir}/qwt \
  -DBUILD_GUI:BOOL=ON -DBUILD_COPASISBW:BOOL=ON --DENABLE_MML:BOOL=ON -DENABLE_USE_SBMLUNIT=ON \
- -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" \
+ -DCMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} -pthread" \
+ -DCMAKE_EXE_LINKER_FLAGS:STRING="%{__global_ldflags}" \
  -DMML_INCLUDE_DIR:PATH=%{_qt5_headerdir}/libmml-qt5 -DMML_LIBRARY:FILEPATH=%{_qt5_libdir}/libmml.so \
  -DENABLE_SBW_INTEGRATION=ON -DBUILD_CXX_EXAMPLES=OFF \
  -DENABLE_COPASI_BANDED_GRAPH:BOOL=ON -DENABLE_COPASI_SEDML:BOOL=ON \
@@ -447,6 +457,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
 %{_datadir}/copasi/doc/
 
 %changelog
+* Mon Sep 24 2018 Antonio Trande <sagitter@fedoraproject.org> - 4.24.197-4
+- Bundle minizip on fedora 30+ (rhbz#1632172) (upstream bug #466)
+
 * Tue Aug 28 2018 Patrik Novotný <panovotn@redhat.com - 4.24.197-3
 - change requires to minizip-compat(-devel), rhbz#1609830, rhbz#1615381