From 866e2d49b21529992cf2d20296c27cd1dc6bc961 Mon Sep 17 00:00:00 2001 From: Laurent Forthomme Date: Tue, 16 Aug 2022 16:35:47 +0200 Subject: [PATCH 1/2] Bumped cepgen to 1.2.1, and adapted dependencies - additionally requires bzlib2 - collateral damage: CMake bumped to version 3.25.2 --- cepgen.spec | 7 ++++--- cmake.spec | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cepgen.spec b/cepgen.spec index 330f3c679b6..1b2b90efc24 100644 --- a/cepgen.spec +++ b/cepgen.spec @@ -1,9 +1,9 @@ -### RPM external cepgen 1.0.2patch1 +### RPM external cepgen 1.2.1 Source: https://github.com/cepgen/cepgen/archive/refs/tags/%{realversion}.tar.gz BuildRequires: cmake ninja -Requires: gsl OpenBLAS hepmc hepmc3 lhapdf pythia6 root +Requires: gsl OpenBLAS hepmc hepmc3 lhapdf pythia6 root bz2lib zlib xz %prep %setup -n %{n}-%{realversion} @@ -24,7 +24,8 @@ export ROOTSYS=${ROOT_ROOT} cmake ../%{n}-%{realversion} \ -G Ninja \ -DCMAKE_INSTALL_PREFIX:PATH="%i" \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_PREFIX_PATH="${BZ2LIB_ROOT};${ZLIB_ROOT};${XZ_ROOT}" ninja -v %{makeprocesses} diff --git a/cmake.spec b/cmake.spec index c9573339940..b34b30a81bf 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,4 +1,4 @@ -### RPM external cmake 3.18.2 +### RPM external cmake 3.25.2 %define downloaddir %(echo %realversion | cut -d. -f1,2) Source: http://www.cmake.org/files/v%{downloaddir}/%n-%realversion.tar.gz Requires: bz2lib curl expat zlib From bd7dbddc0a86dd84a8111f8fddcea7abba5ab7d1 Mon Sep 17 00:00:00 2001 From: Laurent Forthomme Date: Fri, 1 Mar 2024 11:28:59 +0100 Subject: [PATCH 2/2] Bumped to patch version --- cepgen.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cepgen.spec b/cepgen.spec index 1b2b90efc24..0448fb743b8 100644 --- a/cepgen.spec +++ b/cepgen.spec @@ -1,4 +1,4 @@ -### RPM external cepgen 1.2.1 +### RPM external cepgen 1.2.1patch1 Source: https://github.com/cepgen/cepgen/archive/refs/tags/%{realversion}.tar.gz