The package rpms/coin-or-Ipopt.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/coin-or-Ipopt.git/commit/?id=a68dda3....
Change: +%ifarch %{openblas_arches}
Thanks.
Full change: ============
commit a68dda311719ad0a60c180aa3bbadfbfafb098fc Author: sagitter sagitter@fedoraproject.org Date: Fri Feb 23 12:55:26 2018 +0100
Update to Ipopt-3.12.9
diff --git a/.gitignore b/.gitignore index 8e48c11..4203b19 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /Ipopt-3.12.6.tgz /Ipopt-3.12.7.tgz /Ipopt-3.12.8.tgz +/Ipopt-3.12.9.tgz diff --git a/coin-or-Ipopt.spec b/coin-or-Ipopt.spec index 6b37a02..7696284 100644 --- a/coin-or-Ipopt.spec +++ b/coin-or-Ipopt.spec @@ -30,14 +30,14 @@ %global with_mpich 1 %endif
-%ifarch s390x -%if 0%{?fedora} < 26 -%global with_openmpi 0 -%global with_mpich 0 +# openblas available on these architectures. +%if 0%{?fedora} && 0%{?fedora} > 26 +%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64 s390x} %else -%global with_openmpi 1 -%global with_mpich 1 +%{!?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
%global with_asl 1 @@ -45,18 +45,23 @@ Name: coin-or-%{module} Group: Applications/Engineering Summary: Interior Point OPTimizer -Version: 3.12.8 -Release: 6%{?dist} +Version: 3.12.9 +Release: 1%{?dist} License: EPL and GPLv2+ URL: https://projects.coin-or.org/%%7Bmodule%7D Source0: http://www.coin-or.org/download/pkgsource/%%7Bmodule%7D/%%7Bmodule%7D-%%7Bve... -BuildRequires: atlas-devel +%ifarch %{openblas_arches} +BuildRequires: openblas-devel +BuildRequires: openblas-srpm-macros +%else BuildRequires: blas-devel -BuildRequires: gcc-gfortran +BuildRequires: lapack-devel +BuildRequires: atlas-devel +%endif +BuildRequires: gcc-gfortran, gcc-c++ BuildRequires: doxygen BuildRequires: glpk-devel BuildRequires: graphviz -BuildRequires: lapack-devel BuildRequires: MUMPS-devel BuildRequires: metis-devel %if 0%{?with_asl} @@ -65,8 +70,10 @@ BuildRequires: mp-devel BuildRequires: openssh-clients BuildRequires: pkgconfig BuildRequires: readline-devel +BuildRequires: texlive-latex-bin-bin
-Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} +Requires: gcc-gfortran%{?_isa}
# Build with parallel mumps solver Patch0: %{name}-mumps.patch @@ -127,6 +134,7 @@ BuildRequires: ptscotch-openmpi-devel
Requires: %{name}-common = %{version}-%{release} Requires: openmpi +Requires: gcc-gfortran%{?_isa} %description openmpi %{name} libraries compiled against openmpi.
@@ -149,6 +157,7 @@ BuildRequires: ptscotch-mpich-devel
Requires: %{name}-common = %{version}-%{release} Requires: mpich +Requires: gcc-gfortran%{?_isa} %description mpich %{name} libraries compiled against MPICH.
@@ -179,6 +188,19 @@ done
mkdir -p %{name}-%{version}-serial cd %{name}-%{version}-serial + +%ifarch %{openblas_arches} +export LIBBLAS="-L%{_libdir} -lopenblas" +export INCBLAS=-I%{_includedir}/openblas +export LIBLAPACK= +export INCLAPACK=-I%{_includedir} +%else +export LIBBLAS="-L%{_libdir} -lblas" +export INCBLAS=-I%{_includedir} +export LIBLAPACK="-L%{_libdir} -llapack" +export INCLAPACK=-I%{_includedir}/lapacke +%endif + CFLAGS="%{optflags}" OPT_CFLAGS="%{__global_ldflags} -Wl,-z,now" CDEFS="-DIPOPT_BUILD -DHAVE_MPI_INITIALIZED=0" @@ -188,13 +210,13 @@ CXXFLAGS="%{optflags} -Wl,-z,now" OPT_CXXFLAGS="%{__global_ldflags} -Wl,-z,now" CXXDEFS="-DIPOPT_BUILD -DHAVE_MPI_INITIALIZED=0" CPPFLAGS="-I%{_includedir}/MUMPS" -CXXLIBS="-L%{_libdir} -ldmumps -lblas -llapack -lmetis" +CXXLIBS="-L%{_libdir} -ldmumps $LIBBLAS $LIBLAPACK -lmetis" %dconfigure CC=gcc CXX=g++ F77=gfortran CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" \ LDFLAGS="$LDFLAGS" CXXLIBS="$CXXLIBS" \ --with-metis-incdir=%{_includedir} --with-metis-lib="-L%{_libdir} -lmetis" \ --with-mumps-incdir=%{_includedir}/MUMPS --with-mumps-lib="-L%{_libdir} -ldmumps" \ - --with-blas-incdir=%{_includedir}/lapacke --with-blas-lib="-L%{_libdir} -lblas" \ - --with-lapack-incdir=%{_includedir}/lapacke --with-lapack-lib="-L%{_libdir} -llapack" \ + --with-blas-incdir=$INCBLAS --with-blas-lib="$LIBBLAS" \ + --with-lapack-incdir=$INCLAPACK --with-lapack-lib="$LIBLAPACK" \ %if 0%{?with_asl} %if 0%{?rhel} && 0%{?rhel} < 7 --with-asl-lib="-L%{_libdir}/mp -Wl,-rpath -Wl,%{_libdir}/mp -lasl -lmp" --with-asl-incdir="%{_includedir}/asl" \ @@ -248,10 +270,23 @@ OPT_CXXFLAGS="-Wl,-z,relro -Wl,-z,now" CXXDEFS="-DHAVE_MPI_INITIALIZED=1 -DIPOPT_BUILD" CPPFLAGS="%{mpifort_cflags}" CXXLIBS="%{mpi_libs} %{mpifort_libs} -lmpiblacs -lscalapack -ldmumps -lmumps_common -lptscotcherr -lptscotch -lptesmumps" -export CC=%{_libdir}/openmpi/bin/mpicc -export CXX=%{_libdir}/openmpi/bin/mpic++ -export F77=%{_libdir}/openmpi/bin/mpif77 -%dconfigure --with-mumps-incdir=%{_includedir}/openmpi-%{_arch} --with-mumps-lib="-L%{_libdir}/openmpi/lib -ldmumps -lmumps_common" \ +export CC=$MPI_BIN/mpicc +export CXX=$MPI_BIN/mpic++ +export F77=$MPI_BIN/mpif77 + +%ifarch %{openblas_arches} +export LIBBLAS="-L%{_libdir} -lopenblas" +export INCBLAS=-I%{_includedir}/openblas +export LIBLAPACK= +export INCLAPACK=-I%{_includedir} +%else +export LIBBLAS="-L%{_libdir} -lblas" +export INCBLAS=-I%{_includedir} +export LIBLAPACK="-L%{_libdir} -llapack" +export INCLAPACK=-I%{_includedir}/lapacke +%endif + +%dconfigure --with-mumps-incdir=$MPI_INCLUDE --with-mumps-lib="-L$MPI_LIB -ldmumps -lmumps_common" \ %if 0%{?with_asl} %if 0%{?rhel} && 0%{?rhel} < 7 --with-asl-lib="-L%{_libdir}/mp -Wl,-rpath -Wl,%{_libdir}/mp -lasl -lmp" --with-asl-incdir="%{_includedir}/asl" \ @@ -259,9 +294,11 @@ export F77=%{_libdir}/openmpi/bin/mpif77 --with-asl-lib="-lasl -lmp" --with-asl-incdir="%{_includedir}/asl" \ %endif %endif - MPICC=%{_libdir}/openmpi/bin/mpicc \ - MPICXX=%{_libdir}/openmpi/bin/mpic++ \ - MPIF77=%{_libdir}/openmpi/bin/mpif77 \ + --with-blas-incdir=$INCBLAS --with-blas-lib="$LIBBLAS" \ + --with-lapack-incdir=$INCLAPACK --with-lapack-lib="$LIBLAPACK" \ + MPICC=$MPI_BIN/mpicc \ + MPICXX=$MPI_BIN/mpic++ \ + MPIF77=$MPI_BIN/mpif77 \ ADD_CFLAGS="-fopenmp" \ ADD_FFLAGS="-fopenmp" \ ADD_CXXFLAGS="-fopenmp" \ @@ -271,9 +308,9 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%if 0%{?rhel} && 0%{?rhel} < 7 -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{_libdir}/openmpi/lib:%{_libdir}/mp +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MPI_LIB:%{_libdir}/mp %else -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{_libdir}/openmpi/lib +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MPI_LIB %endif make %{?_smp_mflags} all %{_openmpi_unload} @@ -300,10 +337,23 @@ OPT_CXXFLAGS="-Wl,-z,relro -Wl,-z,now" CXXDEFS="-DHAVE_MPI_INITIALIZED=1 -DIPOPT_BUILD" CPPFLAGS="%{mpich_cflags}" CXXLIBS="%{mpich_libs} -lmpiblacs -lscalapack -ldmumps -lmumps_common -lptscotcherr -lptscotch -lptesmumps" -export CC=%{_libdir}/mpich/bin/mpicc -export CXX=%{_libdir}/mpich/bin/mpic++ -export F77=%{_libdir}/mpich/bin/mpifort -%dconfigure --with-mumps-incdir=%{_includedir}/mpich-%{_arch} --with-mumps-lib="-L%{_libdir}/mpich/lib -ldmumps -lmumps_common -lmpich" \ +export CC=$MPI_BIN/mpicc +export CXX=$MPI_BIN/mpic++ +export F77=$MPI_BIN/mpifort + +%ifarch %{openblas_arches} +export LIBBLAS="-L%{_libdir} -lopenblas" +export INCBLAS=-I%{_includedir}/openblas +export LIBLAPACK= +export INCLAPACK=-I%{_includedir} +%else +export LIBBLAS="-L%{_libdir} -lblas" +export INCBLAS=-I%{_includedir} +export LIBLAPACK="-L%{_libdir} -llapack" +export INCLAPACK=-I%{_includedir}/lapacke +%endif + +%dconfigure --with-mumps-incdir=$MPI_INCLUDE --with-mumps-lib="-L$MPI_LIB -ldmumps -lmumps_common -lmpich" \ %if 0%{?with_asl} %if 0%{?rhel} && 0%{?rhel} < 7 --with-asl-lib="-L%{_libdir}/mp -Wl,-rpath -Wl,%{_libdir}/mp -lasl -lmp" --with-asl-incdir="%{_includedir}/asl" \ @@ -311,9 +361,11 @@ export F77=%{_libdir}/mpich/bin/mpifort --with-asl-lib="-lasl -lmp" --with-asl-incdir="%{_includedir}/asl" \ %endif %endif - MPICC=%{_libdir}/mpich/bin/mpicc \ - MPICXX=%{_libdir}/mpich/bin/mpic++ \ - MPIF77=%{_libdir}/mpich/bin/mpif77 \ + --with-blas-incdir=$INCBLAS --with-blas-lib="$LIBBLAS" \ + --with-lapack-incdir=$INCLAPACK --with-lapack-lib="$LIBLAPACK" \ + MPICC=$MPI_BIN/mpicc \ + MPICXX=$MPI_BIN/mpic++ \ + MPIF77=$MPI_BIN/mpif77 \ ADD_CFLAGS="-fopenmp" \ ADD_FFLAGS="-fopenmp" \ ADD_CXXFLAGS="-fopenmp" \ @@ -323,9 +375,9 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%if 0%{?rhel} && 0%{?rhel} < 7 -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{_libdir}/mpich/lib:%{_libdir}/mp +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MPI_LIB:%{_libdir}/mp %else -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{_libdir}/mpich/lib +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MPI_LIB %endif make %{?_smp_mflags} all %{_mpich_unload} @@ -337,19 +389,19 @@ cd .. ####################################################### ## Install MPI version %if 0%{?with_openmpi} - -mkdir -p $RPM_BUILD_ROOT%{_libmpidir} -mkdir -p $RPM_BUILD_ROOT%{_binmpidir} -mkdir -p $RPM_BUILD_ROOT%{_incmpidir} +%{_openmpi_load} +mkdir -p $RPM_BUILD_ROOT$MPI_LIB +mkdir -p $RPM_BUILD_ROOT$MPI_BIN +mkdir -p $RPM_BUILD_ROOT$MPI_INCLUDE mkdir -p %{name}-%{version}-openmpi/headers
cp -a %{name}-%{version}-openmpi/src/Interfaces/.libs/libipopt.so* \ - $RPM_BUILD_ROOT%{_libmpidir} + $RPM_BUILD_ROOT$MPI_LIB %if 0%{?with_asl} cp -a %{name}-%{version}-openmpi/src/Apps/AmplSolver/.libs/libipoptamplinterface.so* \ - $RPM_BUILD_ROOT%{_libmpidir} + $RPM_BUILD_ROOT$MPI_LIB install -pm 755 %{name}-%{version}-openmpi/src/Apps/AmplSolver/.libs/ipopt \ - $RPM_BUILD_ROOT%{_binmpidir} + $RPM_BUILD_ROOT$MPI_BIN %endif
cd %{name}-%{version}-openmpi @@ -362,27 +414,27 @@ done cd ..
##Copy MPI header files -install -p -m 644 %{name}-%{version}-openmpi/headers/* $RPM_BUILD_ROOT%{_incmpidir} - +install -p -m 644 %{name}-%{version}-openmpi/headers/* $RPM_BUILD_ROOT$MPI_INCLUDE +%{_openmpi_unload} %endif
####################################################### ####################################################### ## Install MPICH version %if 0%{?with_mpich} - -mkdir -p $RPM_BUILD_ROOT%{_libmpichdir} -mkdir -p $RPM_BUILD_ROOT%{_binmpichdir} -mkdir -p $RPM_BUILD_ROOT%{_incmpichdir} +%{_mpich_load} +mkdir -p $RPM_BUILD_ROOT$MPI_LIB +mkdir -p $RPM_BUILD_ROOT$MPI_BIN +mkdir -p $RPM_BUILD_ROOT$MPI_INCLUDE mkdir -p %{name}-%{version}-mpich/headers
cp -a %{name}-%{version}-mpich/src/Interfaces/.libs/libipopt.so* \ - $RPM_BUILD_ROOT%{_libmpichdir} + $RPM_BUILD_ROOT$MPI_LIB %if 0%{?with_asl} cp -a %{name}-%{version}-mpich/src/Apps/AmplSolver/.libs/libipoptamplinterface.so* \ - $RPM_BUILD_ROOT%{_libmpichdir} + $RPM_BUILD_ROOT$MPI_LIB install -pm 755 %{name}-%{version}-mpich/src/Apps/AmplSolver/.libs/ipopt \ - $RPM_BUILD_ROOT%{_binmpichdir} + $RPM_BUILD_ROOT$MPI_BIN %endif
cd %{name}-%{version}-mpich @@ -395,8 +447,8 @@ done cd ..
##Copy MPI header files -install -p -m 644 %{name}-%{version}-mpich/headers/* $RPM_BUILD_ROOT%{_incmpichdir} - +install -p -m 644 %{name}-%{version}-mpich/headers/* $RPM_BUILD_ROOT$MPI_INCLUDE +%{_mpich_unload} %endif
####################################################### @@ -460,9 +512,9 @@ cd .. cd %{name}-%{version}-openmpi %if 0%{?with_asl} %if 0%{?rhel} && 0%{?rhel} < 7 -export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libmpidir}:%{_libmpidir}:%{_libdir}/mp +export LD_LIBRARY_PATH=$RPM_BUILD_ROOT$MPI_LIB:$MPI_LIB:%{_libdir}/mp %else -export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libmpidir}:%{_libmpidir} +export LD_LIBRARY_PATH=$RPM_BUILD_ROOT$MPI_LIB:$MPI_LIB %endif %endif make test @@ -474,9 +526,9 @@ cd .. cd %{name}-%{version}-mpich %if 0%{?with_asl} %if 0%{?rhel} && 0%{?rhel} < 7 -export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libmpichdir}:%{_libmpichdir}:%{_libdir}/mp +export LD_LIBRARY_PATH=$RPM_BUILD_ROOT$MPI_LIB:$MPI_LIB:%{_libdir}/mp %else -export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libmpichdir}:%{_libmpichdir} +export LD_LIBRARY_PATH=$RPM_BUILD_ROOT$MPI_LIB:$MPI_LIB %endif %endif MPICH_INTERFACE_HOSTNAME=localhost make test @@ -484,8 +536,7 @@ cd .. %{_mpich_unload} %endif
-%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets
%files %if 0%{?with_asl} @@ -535,6 +586,12 @@ cd .. %{_docdir}/%{name}/*.pdf
%changelog +* Fri Feb 23 2018 Antonio Trande <sagitterATfedoraproject.org> - 3.12.9-1 +- Update to Ipopt-3.12.9 +- Remove old conditional builds +- Rebuild against openblas +- Use %%ldconfig_scriptlets + * Wed Feb 07 2018 Fedora Release Engineering releng@fedoraproject.org - 3.12.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@@ -707,38 +764,37 @@ cd .. - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Mon Apr 7 2014 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 3.11.0-4 -- Correct files conflict (#1084893). +- Correct files conflict (#1084893)
* Wed Aug 7 2013 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 3.11.0-3 -- Switch to unversioned docdir. -- Correct rawhide FTBFS (#992075). +- Switch to unversioned docdir +- Correct rawhide FTBFS (#992075)
* Sat Aug 03 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 3.11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Sat May 11 2013 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 3.11.0-1 -- Update to latest upstream release. -- Adjust patches and build for sources now in toplevel directory. +- Update to latest upstream release +- Adjust patches and build for sources now in toplevel directory
* Thu May 9 2013 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 3.10.4-1 -- Update to latest upstream release. -- Switch to the new upstream tarballs without bundled dependencies. +- Update to latest upstream release +- Switch to the new upstream tarballs without bundled dependencies
* Sat Mar 2 2013 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 3.10.3-2 -- Remove ThirdParty directory. -- Make use of the MUMPS solver (#913152). -- Split html documentation in a doc package. +- Remove ThirdParty directory +- Make use of the MUMPS solver (#913152) +- Split html documentation in a doc package
* Mon Jan 14 2013 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 3.10.3-1 -- Update to latest upstream release. +- Update to latest upstream release
* Sat Jan 12 2013 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 3.10.2-3 -- Rename repackaged tarball. +- Rename repackaged tarball
* Sun Nov 18 2012 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 3.10.2-2 -- Rename package to coin-or-Ipopt. -- Do not package Thirdy party data or data without clean license. +- Rename package to coin-or-Ipopt +- Do not package Thirdy party data or data without clean license
* Sat Sep 29 2012 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 3.10.2-1 -- Initial coinor-Ipopt spec. - +- Initial coinor-Ipopt spec diff --git a/sources b/sources index 602e4cd..16870fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Ipopt-3.12.8.tgz) = a0a91503e29d52bc4afa94cdecf84c6429ce102b80c02bed7e908d0d1b80b3ef761ddc7798d1dfbaf221e3a424bd83e332a40c5af3e49f50dd3261c6a6ea5e81 +SHA512 (Ipopt-3.12.9.tgz) = 24b8292a6dc686c17c045937590c1c86b7d073cc913baf4bb35a17928fe1bdb5e693f9627abdd96c7a0c5701fb2d8c00980fb454e640851b7d069f03dda28702
arch-excludes@lists.fedoraproject.org