Merge branch 'cmake_integration' of gitlab.mpi-magdeburg.mpg.de:software/slicot into cmake_integration

Author: grisuthedragon

.gitlab-ci.yml

@@ -7,6 +7,7 @@ before_script:
 
 stages:
   - build
+  - deploy
 
 
 linux:
@@ -78,3 +79,17 @@ compilers:
     - cmake --build build-dir --target install
     - (cd build-dir; OMP_NUM_THREADS=1 ctest  --output-on-failure)
 
+
+dist-rpm:
+  stage: deploy
+  variables:
+    OS: fedora
+    OSVERSION: 42
+    RPM_QUIET: 1
+  image: ${CI_REGISTRY_IMAGE}/${OS}:${OSVERSION}
+  needs: []
+  script:
+    - bash ./dist/make_rpm.sh
+    - dnf install -y  ~/rpmbuild/RPMS/$(uname -m)/*.rpm
+
+

.gitlab/docker/fedora-image/Dockerfile.fc40

@@ -1,4 +1,4 @@
 FROM fedora:40
 RUN dnf update -y ; \
-    dnf install -y bash mock git fedora-packager rpmdevtools gcc gcc-fortran ; \
-    dnf install -y cmake flexiblas-devel git
+    dnf install -y bash git rpmdevtools gcc gcc-fortran ; \
+    dnf install -y cmake flexiblas-devel

.gitlab/docker/fedora-image/Dockerfile.fc41

@@ -1,5 +1,5 @@
 FROM fedora:41
 RUN dnf update -y ; \
-    dnf install -y bash mock git fedora-packager rpmdevtools gcc gcc-fortran ; \
+    dnf install -y bash rpmdevtools gcc gcc-fortran ; \
     dnf install -y cmake flexiblas-devel git
 

.gitlab/docker/fedora-image/Dockerfile.fc42

@@ -1,6 +1,6 @@
 FROM fedora:42
 RUN dnf update -y
 RUN dnf upgrade -y
-RUN dnf install -y bash mock git fedora-packager rpmdevtools gcc gcc-fortran ; \
+RUN dnf install -y bash rpmdevtools gcc gcc-fortran ; \
     dnf install -y cmake flexiblas-devel git
 

.gitlab/docker/fedora-image/Dockerfile.fcrawhide

@@ -1,6 +1,6 @@
 FROM fedora:rawhide
 
-RUN dnf install -y bash mock git fedora-packager rpmdevtools gcc gcc-fortran ; \
+RUN dnf install -y bash fedora-packager rpmdevtools gcc gcc-fortran ; \
     dnf install -y cmake flexiblas-devel git
 
 ENV CFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer '

dist/make_rpm.sh

@@ -7,7 +7,11 @@
 . ./.version
 
 BUILDARG=${1:--ta}
-
+if [ -n "$RPM_QUIET" ]; then
+    QUIET="--quiet"
+else
+    QUIET=""
+fi
 RPMSPEC_BASE=slicot.spec
 RPMSPEC=dist/rpm/${RPMSPEC_BASE}.in
 
@@ -22,5 +26,5 @@ tar --exclude="build*" --exclude-vcs --exclude-vcs-ignores \
     -czf /tmp/slicot-${MAJOR}.${MINOR}.${PATCH}.tar.gz .
 rm "${RPMSPEC_BASE}"
 
-rpmbuild ${BUILDARG} /tmp/slicot-${MAJOR}.${MINOR}.${PATCH}.tar.gz
+rpmbuild $QUIET ${BUILDARG} /tmp/slicot-${MAJOR}.${MINOR}.${PATCH}.tar.gz
 

dist/rpm/slicot.spec.in

@@ -2,6 +2,7 @@
 %global minor ##MINOR##
 %global patch ##PATCH##
 
+
 Name:           slicot
 Version:        %{major}.%{minor}.%{patch}
 Release:        1%{?dist}
@@ -13,7 +14,8 @@ Source0:        https://github.com/SLICOT/SLICOT-Reference/archive/v%{version}/%
 
 BuildRequires:  make, cmake >= 3.22
 BuildRequires:  gcc, gcc-fortran
-BuildRequires:  (flexiblas-devel or (blas-devel and lapack-devel))
+BuildRequires:  flexiblas-devel
+# or (blas-devel and lapack-devel))
 %global _description %{expand:
 SLICOT  is a general purpose basic mathematical library implemented
 in Fortran for control theoretical computations. The library provides

slicot.pc.in

@@ -6,5 +6,4 @@ libdir=@CMAKE_INSTALL_FULL_LIBDIR@
 Name: @SLICOT_NAME@
 Description: The SLICOT library
 Version: @PROJECT_VERSION@
-Requires: blas, lapack
 Libs: -L${libdir} -l@SLICOT_NAME@