The package rpms/python-assimulo.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/python-assimulo.git/commit/?id=85....
Change:
-%ifarch %{arm}
Thanks.
Full change:
============
commit 8523d4659274c3b3cc1708ba3e3bfc0cef4f245f
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Wed Oct 31 15:06:42 2018 +0100
Subpackage python2-assimulo has been removed
diff --git a/python-assimulo.spec b/python-assimulo.spec
index 7354cfa..0424b49 100644
--- a/python-assimulo.spec
+++ b/python-assimulo.spec
@@ -1,7 +1,3 @@
-%if 0%{?fedora} || 0%{?rhel} > 7
-%global with_python3 1
-%endif
-
%global with_check 0
# SuperLUMT is not on these arches
@@ -13,7 +9,7 @@ ExcludeArch: %{power64} aarch64
Name: python-%{pname}
Version: 2.9
-Release: 27.%{date}svn%{checkout}%{?dist}
+Release: 28.%{date}svn%{checkout}%{?dist}
Summary: Ordinary differential and differential algebraic equations solver
License: LGPLv3+ and LGPLv2+ and BSD and GPLv3
URL:
http://www.jmodelica.org/assimulo
@@ -27,14 +23,23 @@ Source0: assimulo-commit-%{checkout}.tar.gz
BuildRequires: openblas-srpm-macros
%ifarch %{openblas_arches}
-BuildRequires: openblas-devel, openblas-srpm-macros, openblas-static, lapack-devel,
lapack-static
+BuildRequires: openblas-devel
+BuildRequires: openblas-srpm-macros
+BuildRequires: openblas-static
+BuildRequires: lapack-devel
+BuildRequires: lapack-static
%else
-BuildRequires: blas-devel, blas-static
-BuildRequires: lapack-devel, lapack-static
+BuildRequires: blas-devel
+BuildRequires: blas-static
+BuildRequires: lapack-devel
+BuildRequires: lapack-static
%endif
BuildRequires: SuperLUMT-devel
BuildRequires: qhull-devel
-BuildRequires: gcc, gcc-gfortran, gcc-c++, dos2unix
+BuildRequires: gcc
+BuildRequires: gcc-gfortran
+BuildRequires: gcc-c++
+BuildRequires: dos2unix
BuildRequires: sundials-devel
%{?el7:BuildRequires: xorg-x11-server-Xvfb}
@@ -59,44 +64,28 @@ and differential algebraic equations (DAEs), f(t,y,yd).
It combines a variety of different solvers written in C, FORTRAN and
Python via a common high-level interface.
-%package -n python2-%{pname}
-Summary: Ordinary differential and differential algebraic equations solver
-%{?python_provide:%python_provide python2-%{pname}}
-
-BuildRequires: python2-devel, python2-setuptools, python2-nose
-BuildRequires: python2-numpy, python2-pytest, python2-Cython, python2-matplotlib
-%{?fedora:BuildRequires: python2-numpy-f2py, python2-scipy}
-%{?el7:BuildRequires: numpy-f2py, scipy}
-Requires: python2-matplotlib
-%{?fedora:Requires: python2-numpy-f2py, python2-scipy}
-%{?el7:Requires: 1:numpy-f2py, scipy}
-
-%description -n python2-%{pname}
-Assimulo is a Cython/Python based simulation package that allows for simulation
-of both ordinary differential equations (ODEs), f(t,y),
-and differential algebraic equations (DAEs), f(t,y,yd).
-It combines a variety of different solvers written in C, FORTRAN and
-Python via a common high-level interface.
-
-%if 0%{?with_python3}
%package -n python3-%{pname}
Summary: Ordinary differential and differential algebraic equations solver
%{?python_provide:%python_provide python3-%{pname}}
-BuildRequires: python3-devel, python3-setuptools, python3-nose
-BuildRequires: python3-numpy, python3-pytest, python3-Cython, python3-matplotlib
-BuildRequires: python3-numpy-f2py, python3-ipython-console, python3-scipy
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-nose
+BuildRequires: python3-numpy
+BuildRequires: python3-pytest
+BuildRequires: python3-Cython
+BuildRequires: python3-matplotlib
+BuildRequires: python3-numpy-f2py
+BuildRequires: python3-ipython-console
+BuildRequires: python3-scipy
Requires: python3-matplotlib, python3-numpy, python3-scipy
%description -n python3-%{pname}
%{summary}.
-%endif # with_python3
%prep
%setup -qc
-mv trunk python2
-
-pushd python2
+pushd trunk
#Fix permissions
find . -type f -name "*.f" -exec chmod 0644 '{}' \;
dos2unix */*
@@ -112,39 +101,13 @@ sed -i 's|/usr/local/lib|%{_libdir}|g' setup.py
sed -i 's|@@lib@@|%{_libdir}|g' setup.py
sed -i 's|@@inc@@|%{_includedir}/SuperLUMT|g' setup.py
-popd
-%if 0%{?with_python3}
-cp -a python2 python3
-pushd python3
dos2unix src/solvers/*
%patch4 -p0
popd
-%endif # with_python3
%build
-pushd python2
-sed -i 's|1s|^#!python|#!%{__python2}|g' setup.py
-
-%ifarch %{openblas_arches}
-export BLASNAME=openblas
-export INCBLAS=-I%{_includedir}/openblas
-%else
-export BLASNAME=
-export INCBLAS=-I%{_includedir}
-%endif
-
-CFLAGS="%{optflags} -Wl,--as-needed" %{__python2} setup.py build
--executable="%{__python2} -s" \
- --blas-home=%{_libdir} --blas-name=$BLASNAME --lapack-home=%{_libdir} \
- --sundials-home=%{_prefix} --superlu-home=%{_libdir} \
- --with_openmp=true \
- --extra-c-flags="$INCBLAS -I%{_includedir}/SuperLUMT" \
- --extra-fortran-link-flags="%{__global_ldflags}" \
- --log=DEBUG
-popd
-
-%if 0%{?with_python3}
-pushd python3
+pushd trunk
sed -i 's|1s|^#!python|#!%{__python3}|g' setup.py
%ifarch %{openblas_arches}
@@ -163,32 +126,15 @@ CFLAGS="%{optflags} -lm -Wl,--as-needed" %{__python3}
setup.py build --executabl
--extra-fortran-link-flags="%{__global_ldflags}" \
--log=DEBUG
popd
-%endif # with_python3
%install
-pushd python2
-%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT --blas-home=%{_libdir}
--sundials-home=%{_prefix} --lapack-home=%{_libdir}
-popd
-%if 0%{?with_python3}
-pushd python3
+pushd trunk
%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT --blas-home=%{_libdir}
--sundials-home=%{_prefix} --lapack-home=%{_libdir}
popd
-%endif
##Fix -x permissions
##Fix wrong-script-end-of-line-encoding errors
-for i in `find $RPM_BUILD_ROOT%{python2_sitearch}/%{pname} -type f \( -name
"*.py" \)`; do
- chmod a+x $i
- dos2unix $i
- sed -i 's|/usr/bin/env python|%{__python2}|' $i
-done
-
-for i in `find $RPM_BUILD_ROOT%{python2_sitearch}/%{pname} -type f \( -name
"*.so" \)`; do
- chmod 0755 $i
-done
-
-%if 0%{?with_python3}
for i in `find $RPM_BUILD_ROOT%{python3_sitearch}/%{pname} -type f \( -name
"*.py" \)`; do
chmod a+x $i
dos2unix $i
@@ -198,39 +144,12 @@ done
for i in `find $RPM_BUILD_ROOT%{python3_sitearch}/%{pname} -type f \( -name
"*.so" \)`; do
chmod 0755 $i
done
-%endif
%if 0%{?with_check}
%check
# test_dasp3_basic disabled
# See
http://www.jmodelica.org/27779
-pushd python2/tests
-%ifarch %{openblas_arches}
-export BLASLIB=libopenblas.so
-export LAPACKLIB=
-%else
-export BLASLIB=libblas.so
-export LAPACKLIB=liblapack.so
-%endif
-rm -f __init__.py
-find . -name '*.pyc' -delete
-LD_PRELOAD=%{_libdir}/$BLASLIB:%{_libdir}/$LAPACKLIB
-LD_PRELOAD=%{_libdir}/libsundials_idas.so
-LD_PRELOAD=%{_libdir}/libsundials_cvodes.so
-export PYTHONPATH=$RPM_BUILD_ROOT%{python2_sitearch}
-%if 0%{?rhel}
-xvfb-run -a nosetests -v --exclude=test_cvode_with_jac_sparse \
-%else
-nosetests -v --exclude=test_cvode_with_jac_sparse \
-%endif
-%ifarch %{arm}
- --exclude=test_glimda
-%endif
-
-popd
-
-%if 0%{?with_python3}
-pushd python3/tests
+pushd trunk/tests
%ifarch %{openblas_arches}
export BLASLIB=libopenblas.so
export LAPACKLIB=
@@ -252,26 +171,20 @@ nosetests-%{python3_version} -v --exclude=test_cvode_with_jac_sparse
\
%ifarch %{arm}
--exclude=test_glimda
%endif
-
popd
%endif
-%endif
-
-%files -n python2-%{pname}
-%doc python2/README python2/CHANGELOG
-%license python2/thirdparty/*/LICENSE_* python2/LICENSE
-%{python2_sitearch}/*.egg-info
-%{python2_sitearch}/assimulo/
-%if 0%{?with_python3}
%files -n python3-%{pname}
-%doc python3/README python3/CHANGELOG
-%license python3/thirdparty/*/LICENSE_* python3/LICENSE
+%doc trunk/README trunk/CHANGELOG
+%license trunk/thirdparty/*/LICENSE_* trunk/LICENSE
%{python3_sitearch}/*.egg-info
%{python3_sitearch}/assimulo/
-%endif
%changelog
+* Wed Oct 31 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.9-28.20180508svn862
+- Subpackage python2-assimulo has been removed
+ See
https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
* Tue Jul 17 2018 Antonio Trande <sagitterATfedoraproject.org> -
2.9-27.20180508svn862
- Disable tests