The package rpms/COPASI.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/COPASI.git/commit/?id=d75c4ac4a8d....
Change:
-%ifarch %{openblas_arches}
Thanks.
Full change:
============
commit d75c4ac4a8d3d09c0575db8952aae535f22c0933
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Wed Aug 1 11:12:24 2018 +0200
Release 4.24 build-197
diff --git a/.gitignore b/.gitignore
index 5567ff1..9d1e74f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
/COPASI-Build-166.tar.gz
/COPASI-Build-170.tar.gz
/COPASI-Build-184.tar.gz
+/COPASI-Build-197.tar.gz
diff --git a/COPASI-bug2625.patch b/COPASI-bug2625.patch
deleted file mode 100644
index f383f6f..0000000
--- a/COPASI-bug2625.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 26e66f14407b461f25d72569d346f817ec2f7d1f Mon Sep 17 00:00:00 2001
-From: Stefan Hoops <shoops(a)copasi.org>
-Date: Fri, 1 Jun 2018 16:44:31 -0400
-Subject: [PATCH] Bug 2625. Removed qt5_use_modules
-
----
- CMakeLists.txt | 4 ++++
- ChooseQtVersion.cmake | 20 ++++++++++++++++----
- 2 files changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0f2e178c0..990635d41 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -880,6 +880,10 @@ message(STATUS
"-----------------------------------------------------------
- libSBML lib = ${LIBSBML_LIBRARY}
- libSBML include = ${LIBSBML_INCLUDE_DIR}
-
-+ Qt lib = ${QT_LIBRARIES}
-+ Qt include = ${QT_INCLUDE_DIRS}
-+ Qt version = ${QT_VERSION}
-+
- QWT lib = ${QWT_LIBRARY}
- QWT include = ${QWT_INCLUDE_DIR}
- QWT version = ${QWT_VERSION_STRING} (0x${QWT_VERSION_NUMERIC})
-diff --git a/ChooseQtVersion.cmake b/ChooseQtVersion.cmake
-index 52fa6f1d7..1ca2b4915 100644
---- a/ChooseQtVersion.cmake
-+++ b/ChooseQtVersion.cmake
-@@ -1,9 +1,9 @@
--# Copyright (C) 2017 by Pedro Mendes, Virginia Tech Intellectual
-+# Copyright (C) 2017 - 2018 by Pedro Mendes, Virginia Tech Intellectual
- # Properties, Inc., University of Heidelberg, and University of
- # of Connecticut School of Medicine.
- # All rights reserved.
-
--cmake_minimum_required(VERSION 2.8.9)
-+cmake_minimum_required(VERSION 3.1.0)
-
- set(SELECT_QT "Any" CACHE STRING "The prefered Qt version one of: Qt5,
Qt4 or Any" )
- if (DEFINED SELECT_QT)
-@@ -44,6 +44,7 @@ macro(QT_FIND_MODULES)
- if (${SELECT_QT} MATCHES "Qt5" OR
- ${SELECT_QT} MATCHES "Any")
- find_package(Qt5 ${QT_FIND_MODE} COMPONENTS ${_modules_qt5})
-+
- endif()
-
- if (${SELECT_QT} MATCHES "Qt4" OR
-@@ -57,10 +58,21 @@ macro(QT_FIND_MODULES)
-
- if (Qt5_FOUND)
- message(STATUS "Using Qt5")
-+ set(QT_VERSION ${Qt5_VERSION})
-+
-+ foreach(_m ${_modules_qt5})
-+ set(QT_INCLUDE_DIRS ${QT_INCLUDE_DIRS} ${Qt5${_m}_INCLUDE_DIRS})
-+ set(QT_LIBRARIES ${QT_LIBRARIES} ${Qt5${_m}_LIBRARIES})
-+ endforeach(_m ${_modules_qt5})
-+
-+ list(REMOVE_DUPLICATES QT_INCLUDE_DIRS)
- endif (Qt5_FOUND)
-
- if (Qt4_FOUND OR QT4_FOUND)
- message(STATUS "Using Qt4")
-+ include(${QT_USE_FILE})
-+ set(QT_VERSION ${Qt4_VERSION})
-+ set(QT_INCLUDE_DIRS ${QT_INCLUDES})
- endif (Qt4_FOUND OR QT4_FOUND)
- endmacro(QT_FIND_MODULES)
-
-@@ -71,7 +83,7 @@ macro(QT_USE_MODULES _target)
- set_target_properties(${_target} PROPERTIES AUTOMOC TRUE)
-
- if (Qt5_FOUND)
-- qt5_use_modules(${_target} ${_modules_qt5})
-+ target_link_libraries(${_target} ${QT_LIBRARIES})
- else (Qt5_FOUND)
- if (Qt4_FOUND OR QT4_FOUND)
- include(${QT_USE_FILE})
-@@ -83,7 +95,7 @@ endmacro(QT_USE_MODULES)
-
- macro(QT_BIND_TO_TARGET _target)
- if (Qt5_FOUND)
-- qt5_use_modules(${_target} ${_modules_qt5})
-+ target_link_libraries(${_target} ${QT_LIBRARIES})
- else (Qt5_FOUND)
- if (Qt4_FOUND OR QT4_FOUND)
- include(${QT_USE_FILE})
diff --git a/COPASI-libCombine_paths.patch b/COPASI-libCombine_paths.patch
new file mode 100644
index 0000000..f917f7d
--- /dev/null
+++ b/COPASI-libCombine_paths.patch
@@ -0,0 +1,30 @@
+--- CMakeModules/FindLIBCOMBINE.orig.cmake 2018-07-30 20:03:33.000000000 +0200
++++ CMakeModules/FindLIBCOMBINE.cmake 2018-07-31 22:08:43.379406760 +0200
+@@ -27,7 +27,7 @@
+
+ set(COMBINE_LIBRARY_NAME)
+ if (UNIX)
+- set(COMBINE_LIBRARY_NAME Combine-static)
++ set(COMBINE_LIBRARY_NAME Combine)
+ else()
+ set(COMBINE_LIBRARY_NAME libCombine-static)
+ endif()
+@@ -70,8 +70,7 @@
+ # Fallback if no CONFIG is found
+
+ find_path(COMBINE_INCLUDE_DIR combine/combinearchive.h
+- PATHS $ENV{COMBINE_DIR}/include
+- $ENV{COMBINE_DIR}
++ PATHS ${INCLUDE_INSTALL_DIR}
+ ${COPASI_DEPENDENCY_DIR}/include
+ ${COPASI_DEPENDENCY_DIR}
+ ~/Library/Frameworks
+@@ -95,7 +94,7 @@
+ NAMES ${COMBINE_LIBRARY_NAME}
+ PATHS $ENV{COMBINE_DIR}/lib
+ $ENV{COMBINE_DIR}
+- ${COPASI_DEPENDENCY_DIR}/${CMAKE_INSTALL_LIBDIR}
++ ${CMAKE_INSTALL_LIBDIR}
+ ${COPASI_DEPENDENCY_DIR}/lib
+ ${COPASI_DEPENDENCY_DIR}
+ ~/Library/Frameworks
diff --git a/COPASI-qt5_fix.patch b/COPASI-qt5_fix.patch
deleted file mode 100644
index 26532d3..0000000
--- a/COPASI-qt5_fix.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 3019bcd61b7d1d35afb89c0f23dd2fbcdfd2d68f Mon Sep 17 00:00:00 2001
-From: "Frank T. Bergmann" <fbergman(a)caltech.edu>
-Date: Mon, 4 Jun 2018 09:07:49 +0200
-Subject: [PATCH] - issue 2629: fix compilation with 5.11
-
----
- copasi/UI/CScanContainerWidget.cpp | 3 ++-
- copasi/layoutUI/CQScreenshotOptionsDialog.cpp | 3 ++-
- copasi/wizard/wizard.cpp | 1 +
- 3 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/copasi/UI/CScanContainerWidget.cpp b/copasi/UI/CScanContainerWidget.cpp
-index be65cdd9a..1ff617ae4 100644
---- a/copasi/UI/CScanContainerWidget.cpp
-+++ b/copasi/UI/CScanContainerWidget.cpp
-@@ -1,4 +1,4 @@
--// Copyright (C) 2017 by Pedro Mendes, Virginia Tech Intellectual
-+// Copyright (C) 2017 - 2018 by Pedro Mendes, Virginia Tech Intellectual
- // Properties, Inc., University of Heidelberg, and University of
- // of Connecticut School of Medicine.
- // All rights reserved.
-@@ -22,6 +22,7 @@
-
- #include <QApplication>
- #include <QResizeEvent>
-+#include <QHeaderView>
-
- #include "CScanContainerWidget.h"
- #include "CScanWidgetScan.h"
-diff --git a/copasi/layoutUI/CQScreenshotOptionsDialog.cpp
b/copasi/layoutUI/CQScreenshotOptionsDialog.cpp
-index 57e90c057..76f6ad5e5 100644
---- a/copasi/layoutUI/CQScreenshotOptionsDialog.cpp
-+++ b/copasi/layoutUI/CQScreenshotOptionsDialog.cpp
-@@ -1,4 +1,4 @@
--// Copyright (C) 2017 by Pedro Mendes, Virginia Tech Intellectual
-+// Copyright (C) 2017 - 2018 by Pedro Mendes, Virginia Tech Intellectual
- // Properties, Inc., University of Heidelberg, and University of
- // of Connecticut School of Medicine.
- // All rights reserved.
-@@ -13,6 +13,7 @@
- #include <QColor>
- #include <QDoubleValidator>
- #include <QPalette>
-+#include <QButtonGroup>
-
- #include <iostream>
- #include <assert.h>
-diff --git a/copasi/wizard/wizard.cpp b/copasi/wizard/wizard.cpp
-index f97202a60..443a2d422 100644
---- a/copasi/wizard/wizard.cpp
-+++ b/copasi/wizard/wizard.cpp
-@@ -18,6 +18,7 @@
- // All rights reserved.
-
- #include <QtCore/QDir>
-+#include <QButtonGroup>
-
- #include "wizard.h"
- #include "UI/CQMessageBox.h"
diff --git a/COPASI.spec b/COPASI.spec
index 797aac0..5a6e912 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -1,18 +1,6 @@
-# Manual stripping?
-#
https://bugzilla.redhat.com/show_bug.cgi?id=1478284
-%if 0%{?fedora} < 27
-%ifarch s390x
-%global debug_package %{nil}
-%global with_strip 1
-%else
-%global with_strip 0
-%endif
-%endif
-
-%global buildid 184
+%global buildid 197
%global octpkg COPASI
-%global with_python2 1
%global with_python3 1
# Disable Java binding
@@ -41,20 +29,10 @@
%global _docdir_fmt %{name}
-# openblas available on these architectures.
-%if 0%{?fedora} && 0%{?fedora} > 26
-%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64
s390x}
-%else
-%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
-%endif
-%if 0%{?rhel}
-%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
-%endif
-
Name: COPASI
Summary: Biochemical network simulator
-Version: 4.23.%{buildid}
-Release: 15%{?dist}
+Version: 4.24.%{buildid}
+Release: 1%{?dist}
##Artistic 2.0 is main license
##GPLv2+ is related to a Mixed Source Licensing Scenario
@@ -80,12 +58,13 @@ BuildRequires: qwt-qt5-devel
BuildRequires: qwtplot3d-qt5-devel >= 0.3.1a-4
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtwebkit-devel
+BuildRequires: qt5-qtdatavis3d-devel
BuildRequires: libmml-qt5-devel
BuildRequires: freeglut-devel
BuildRequires: libsbml-devel
BuildRequires: libsedml-devel >= 1:0.4.3-3
BuildRequires: libnuml-devel
-BuildRequires: libCombine-static
+BuildRequires: libCombine-devel
BuildRequires: zipper-devel
BuildRequires: minizip-devel
BuildRequires: libsbw-devel
@@ -95,6 +74,7 @@ BuildRequires: mesa-libGLU-devel
BuildRequires: cppunit-devel
BuildRequires: libcurl-devel
BuildRequires: libxslt-devel
+BuildRequires: pkgconf-pkg-config
%ifarch %{openblas_arches}
BuildRequires: openblas-devel, openblas-srpm-macros
%else
@@ -106,7 +86,7 @@ BuildRequires: swig
BuildRequires: expat-devel
BuildRequires: f2c
BuildRequires: flex
-BuildRequires: cmake
+BuildRequires: cmake, gcc, gcc-c++
BuildRequires: bison
BuildRequires: ImageMagick
BuildRequires: libappstream-glib
@@ -114,6 +94,8 @@ BuildRequires: libappstream-glib
Requires: %{name}-data = %{version}-%{release}
Requires: libsedml%{?_isa} >= 1:0.4.3-3
+Obsoletes: python2-%{name} < 4.24.197
+
##This patch sets libraries' installation paths
Patch0: %{name}-fix_install_libpaths.patch
@@ -132,11 +114,8 @@ Patch4: %{name}-fix_exe_permissions.patch
##This patch sets paths to find QTPLOT3D-QT5 files on Fedora
Patch5: %{name}-set_QWTPLOT3D_QT5.patch
-##http://tracker.copasi.org/tracker/show_bug.cgi?id=2625
-Patch6: %{name}-bug2625.patch
-
-##http://tracker.copasi.org/tracker/show_bug.cgi?id=2629
-Patch7: %{name}-qt5_fix.patch
+##This patch sets paths to find libCombine files on Fedora
+Patch6: COPASI-libCombine_paths.patch
%description
COPASI is a software application for simulation and analysis of biochemical
@@ -177,20 +156,11 @@ BuildArch: noarch
%description data
This package provides the COPASI data, example and license files.
-%if 0%{?with_python2}
-%package -n python2-%{name}
-Summary: %{name} Python2 Bindings
-BuildRequires: python2-devel
-%{?python_provide:%python_provide python2-%{name}}
-%description -n python2-%{octpkg}
-This package provides the libraries to
-develop applications with COPASI Python2 bindings.
-%endif
-
%if 0%{?with_python3}
%package -n python3-%{name}
Summary: %{name} Python3 Bindings
BuildRequires: python3-devel
+Obsoletes: python2-%{name} < 4.24.197
%{?python_provide:%python_provide python3-%{name}}
%description -n python3-%{octpkg}
This package provides the libraries to
@@ -275,6 +245,7 @@ done
%patch0 -p0
%patch4 -p0
+%patch6 -p0
%if 0%{?with_qwt6}
%patch3 -p0
@@ -282,12 +253,6 @@ done
%patch1 -p0
%endif
-
-%if 0%{?fedora} > 28
-%patch6 -p1
-%patch7 -p1
-%endif
-
##Set Qwt libdir
sed -e 's|@@libdir@@|%{_libdir}|g' -i CMakeModules/FindQwtQt4.cmake
@@ -315,11 +280,13 @@ export INCBLAS=%{_includedir}
%cmake -Wno-dev \
-DCOPASI_OVERRIDE_VERSION:STRING=%{version} \
-%if 0%{?with_python2}
+%if 0%{?with_python3}
-DENABLE_PYTHON:BOOL=ON \
- -DPYTHON_EXECUTABLE:FILEPATH=%{__python2} \
- -DPYTHON_INCLUDE_DIR:PATH=%{_includedir}/python%{python2_version} \
- -DPYTHON_LIBRARY:FILEPATH=%{_libdir}/libpython%{python2_version}.so \
+ -DPYTHON_EXECUTABLE:FILEPATH=%{__python3} \
+ -DPYTHON_INCLUDE_DIR:PATH=%{_includedir}/python%{python3_version}m \
+ -DPYTHON_LIBRARY:FILEPATH=%{_libdir}/libpython%{python3_version}m.so \
+%else
+ -DENABLE_PYTHON:BOOL=OFF \
%endif
%if 0%{?with_java}
-DENABLE_JAVA:BOOL=ON \
@@ -345,81 +312,18 @@ export INCBLAS=%{_includedir}
%endif
-DCSHARP_COMPILER:FILEPATH=%{_bindir}/mcs \
%if 0%{?with_qwt6}
- -DQWT_VERSION_STRING:STRING=6.1.3 \
+ -DQWT_VERSION_STRING:STRING="%(pkg-config --modversion qwt)" \
%endif
-DSELECT_QT=Qt5 \
-DQT_QMAKE_EXECUTABLE:FILEPATH=%{_bindir}/qmake-qt5 \
- -DQWT_VERSION_STRING:STRING=6.1.3 \
+ -DQWT_VERSION_STRING:STRING="%(pkg-config --modversion Qt5Qwt6)" \
-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" \
-DMML_INCLUDE_DIR:PATH=%{_qt5_headerdir}/libmml-qt5
-DMML_LIBRARY:FILEPATH=%{_qt5_libdir}/libmml.so \
- -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 \
- -DBLAS_blas_LIBRARY:FILEPATH=%{_libdir}/$LIBBLAS
-DLAPACK_lapack_LIBRARY:FILEPATH=%{_libdir}/$LIBLAPACK -DCLAPACK_INCLUDE_DIR:PATH=$INCBLAS
\
- -DENABLE_FLEX_BISON:BOOL=ON -DENABLE_COPASI_PARAMETERFITTING_RESIDUAL_SCALING:BOOL=ON \
- -DENABLE_WITH_MERGEMODEL:BOOL=ON -DENABLE_USE_MATH_CONTAINER:BOOL=ON \
- -DLIBSBML_INCLUDE_DIR:PATH=%{_includedir}/sbml -DLIBSBML_SHARED:BOOL=ON
-DLIBSBML_LIBRARY:FILEPATH=%{_libdir}/libsbml.so \
- -DF2C_INCLUDE_DIR:PATH=%{_includedir} \
- -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
- -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DENABLE_GPROF:BOOL=OFF \
- -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE -DCMAKE_COLOR_MAKEFILE:BOOL=ON \
- -DENABLE_FLEX_BISON:BOOL=ON -DBISON_EXECUTABLE:FILEPATH=%{_bindir}/bison \
- -DPREFER_STATIC:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=YES
-DCombine-static_DIR:PATH=%{_libdir}/cmake ..
-
-%make_build
-popd
-
-## ----> Move to build2 directory ##
-%if 0%{?with_python3}
-mkdir -p build2 && pushd build2
-export CXXFLAGS="-DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} -Wl,-z,relro -fPIC
-pie -Wl,-z,now -DCOPASI_OVERWRITE_USE_LAPACK -DNO_BLAS_WRAP"
-
-%ifarch %{openblas_arches}
-export LIBBLAS=libopenblas.so
-export INCBLAS=%{_includedir}/openblas
-%else
-export LIBBLAS=libblas.so
-export LIBLAPACK=liblapack.so
-export INCBLAS=%{_includedir}
-%endif
-
-%cmake -Wno-dev \
- -DCOPASI_OVERRIDE_VERSION:STRING=%{version} \
- -DENABLE_PYTHON:BOOL=ON \
- -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}
- -DENABLE_JAVA:BOOL=OFF \
- -DBUILD_JAVA_EXAMPLES:BOOL=OFF \
-%endif
-%if 0%{?with_octave}
- -DENABLE_OCTAVE:BOOL=OFF \
- -DCOPASI_version:STRING=%{version} \
- -DOCTAVE_INCLUDE_DIR:PATH=%{_includedir}/octave-%{octave_ver} \
- -DOCTAVE_OCTINTERP_LIBRARY:FILEPATH=%{_libdir}/octave/%{octave_ver}/liboctinterp.so \
- -DOCTAVE_OCTAVE_LIBRARY:FILEPATH=%{_libdir}/octave/%{octave_ver}/liboctave.so \
-%endif
-%if 0%{?with_perl}
- -DENABLE_PERL:BOOL=OFF \
-%endif
-%if 0%{?with_r}
- -DENABLE_R:BOOL=OFF \
- -DR_INCLUDE_DIRS:PATH=%{_includedir}/R \
-%endif
-%if 0%{?with_mono}
- -DENABLE_CSHARP:BOOL=OFF \
- -DBUILD_CS_EXAMPLES:BOOL=OFF \
- -DCSHARP_COMPILER:FILEPATH=%{_bindir}/mcs \
-%endif
- -DBUILD_GUI:BOOL=OFF -DENABLE_MML:BOOL=OFF -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" \
- -DENABLE_SBW_INTEGRATION=ON -DBUILD_CXX_EXAMPLES=ON \
+ -DENABLE_SBW_INTEGRATION=ON -DBUILD_CXX_EXAMPLES=OFF \
-DENABLE_COPASI_BANDED_GRAPH:BOOL=ON -DENABLE_COPASI_SEDML:BOOL=ON \
-DENABLE_COPASI_NONLIN_DYN_OSCILLATION:BOOL=ON -DENABLE_COPASI_EXTUNIT:BOOL=ON \
-DBLAS_blas_LIBRARY:FILEPATH=%{_libdir}/$LIBBLAS
-DLAPACK_lapack_LIBRARY:FILEPATH=%{_libdir}/$LIBLAPACK -DCLAPACK_INCLUDE_DIR:PATH=$INCBLAS
\
@@ -435,18 +339,12 @@ export INCBLAS=%{_includedir}
%make_build
popd
-%endif
%install
%make_install -C build
# Remove directory of examples
-rm -rf $RPM_BUILD_ROOT%{python2_sitearch}/copasi/examples
-
%if 0%{?with_python3}
-%make_install -C build2
-
-# Remove directory of examples
rm -rf $RPM_BUILD_ROOT%{python3_sitearch}/copasi/examples
%endif
@@ -459,32 +357,6 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/%{octpkg}/R.css
chmod a+x $RPM_BUILD_ROOT%{_libdir}/R/library/%{octpkg}/libs/COPASI.so
%endif
-## Stripping of debug symbols
-# Use only if '/usr/lib/rpm/debugedit' fails
-%if 0%{?with_strip}
-
-%if 0%{?with_r}
-%{_bindir}/strip -s $RPM_BUILD_ROOT%{_libdir}/R/library/%{octpkg}/libs/COPASI.so
-%endif
-%{_bindir}/strip -s $RPM_BUILD_ROOT%{_bindir}/*
-%if 0%{?with_mono}
-%{_bindir}/strip -s $RPM_BUILD_ROOT%{_prefix}/lib/mono/copasicsP/*.so
-%endif
-%if 0%{?with_python2}
-%{_bindir}/strip -s $RPM_BUILD_ROOT%{python2_sitearch}/copasi/*.so
-%endif
-%if 0%{?with_python3}
-%{_bindir}/strip -s $RPM_BUILD_ROOT%{python3_sitearch}/copasi/*.so
-%endif
-%if 0%{?with_perl}
-%{_bindir}/strip -s $RPM_BUILD_ROOT%{perl_vendorarch}/auto/COPASI/*.so
-%endif
-%if 0%{?with_java}
-%{_bindir}/strip -s $RPM_BUILD_ROOT%{_libdir}/copasi/*.so
-%endif
-
-%endif
-
%if 0%{?with_octave}
mkdir -p $RPM_BUILD_ROOT%{octpkgdir}/packinfo
install -pm 644 copasi/ArtisticLicense.txt $RPM_BUILD_ROOT%{octpkgdir}/packinfo
@@ -508,12 +380,12 @@ Categories=Science;
EOF
## Install appdata file
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/metainfo/
+mkdir -p $RPM_BUILD_ROOT%{_metainfodir}
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/
%check
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/*.appdata.xml
+appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.xml
%files
%{_bindir}/CopasiSE
@@ -523,20 +395,13 @@ appstream-util validate-relax --nonet
$RPM_BUILD_ROOT%{_datadir}/metainfo/*.appd
%{_bindir}/CopasiSBW
%{_datadir}/icons/copasi/
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/metainfo/*.appdata.xml
+%{_metainfodir}/*.appdata.xml
%files data
%license copasi/ArtisticLicense.txt
%{_datadir}/copasi/
%exclude %{_datadir}/copasi/doc/
-%if 0%{?with_python2}
-%files -n python2-%{octpkg}
-%license copasi/ArtisticLicense.txt
-%{python2_sitearch}/copasi/
-%{python2_sitearch}/*.pth
-%endif
-
%if 0%{?with_python3}
%files -n python3-%{octpkg}
%license copasi/ArtisticLicense.txt
@@ -582,6 +447,12 @@ appstream-util validate-relax --nonet
$RPM_BUILD_ROOT%{_datadir}/metainfo/*.appd
%{_datadir}/copasi/doc/
%changelog
+* Tue Jul 31 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.24.197-1
+- Release 4.24 build-187
+- Erase obsolete patches
+- Drop Python2 binding
+- Disable BUILD_CXX_EXAMPLES
+
* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
4.23.184-15
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index c707395..f6d5ba2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (COPASI-Build-184.tar.gz) =
d63f0081b62dd451de469b9450d7a8fbcf49cf5a0387947798ea7cb10a7ece39b3a4fe3e76b04d0d2ec15605d2636e4579f51b1b551870512602885e92e978d1
+SHA512 (COPASI-Build-197.tar.gz) =
273d4144f81bc65af819583141a754bc2e7c50e26bdcf15265045e19434740d84a5ce8ac09aab393658ff20da48f7a487acb7fd58aebdf483df3b40917b3ef30