diff --git a/apfel-3.1.0.tar.gz b/apfel-3.1.0.tar.gz deleted file mode 100644 index a8b705b..0000000 --- a/apfel-3.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a7e693536de6a9a84504c221a77cd8154fd939c3332d21dfce74432d468f4fd -size 8059076 diff --git a/apfel-3.1.1.tar.gz b/apfel-3.1.1.tar.gz new file mode 100644 index 0000000..780bb33 --- /dev/null +++ b/apfel-3.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9006b2a9544e504e8f6b5047f665054151870c3c3a4a05db3d4fb46f21908d4b +size 8059223 diff --git a/apfel-dont-set-default-reltype.patch b/apfel-dont-set-default-reltype.patch index ef0839c..f2fd527 100644 --- a/apfel-dont-set-default-reltype.patch +++ b/apfel-dont-set-default-reltype.patch @@ -1,16 +1,16 @@ -Index: apfel-3.1.0/CMakeLists.txt +Index: apfel-3.1.1/CMakeLists.txt =================================================================== ---- apfel-3.1.0.orig/CMakeLists.txt -+++ apfel-3.1.0/CMakeLists.txt -@@ -13,7 +13,6 @@ set(PROJECT_VERSION 3.1.0) - SET(APFEL_VERSION_MAJOR 3) +--- apfel-3.1.1.orig/CMakeLists.txt ++++ apfel-3.1.1/CMakeLists.txt +@@ -14,7 +14,6 @@ SET(APFEL_VERSION_MAJOR 3) SET(APFEL_VERSION_MINOR 1) - SET(APFEL_VERSION_PATCH 0) + SET(APFEL_VERSION_PATCH 1) + add_compile_definitions(APFEL_VERSION=${apfel_VERSION}) -set(CMAKE_VERBOSE_MAKEFILE OFF) include("GNUInstallDirs") option(APFEL_ENABLE_PYTHON "Enables building of python bindings" ON) -@@ -21,7 +20,6 @@ option(APFEL_ENABLE_TESTS "Enables +@@ -22,7 +21,6 @@ option(APFEL_ENABLE_TESTS "Enables option(APFEL_ENABLE_LHAPDF "Enables LHAPDF" ON) option(APFEL_DOWNLOAD_PDFS "Download LHAPDF sets" ON) diff --git a/apfel-fix-project-version.patch b/apfel-fix-project-version.patch deleted file mode 100644 index 3b5eaa2..0000000 --- a/apfel-fix-project-version.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: apfel-3.1.0/CMakeLists.txt -=================================================================== ---- apfel-3.1.0.orig/CMakeLists.txt -+++ apfel-3.1.0/CMakeLists.txt -@@ -8,11 +8,11 @@ cmake_policy(SET CMP0078 OLD) - - # define project name, version and its languages - project(apfel LANGUAGES C CXX Fortran) --set(apfel_VERSION 3.0.7) --set(PROJECT_VERSION 3.0.7) -+set(apfel_VERSION 3.1.0) -+set(PROJECT_VERSION 3.1.0) - SET(APFEL_VERSION_MAJOR 3) --SET(APFEL_VERSION_MINOR 0) --SET(APFEL_VERSION_PATCH 7) -+SET(APFEL_VERSION_MINOR 1) -+SET(APFEL_VERSION_PATCH 0) - set(CMAKE_VERBOSE_MAKEFILE OFF) - include("GNUInstallDirs") - diff --git a/apfel.changes b/apfel.changes index 5bae80b..f6a97cf 100644 --- a/apfel.changes +++ b/apfel.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Dec 28 13:37:17 UTC 2023 - Atri Bhattacharya + +- Update to version 3.1.1: + * CMakeLists.txt: define APFEL_VERSION, like in config.h.in + (gh#scarazza/apfel#53). +- Drop apfel-fix-project-version.patch: incorporated upstream. +- Rebase apfel-dont-set-default-reltype.patch for update. + ------------------------------------------------------------------- Wed Nov 22 08:12:23 UTC 2023 - Atri Bhattacharya diff --git a/apfel.spec b/apfel.spec index f44cf17..b3af1c2 100644 --- a/apfel.spec +++ b/apfel.spec @@ -20,15 +20,13 @@ # Need -ffat-lto-objects for the static lib %define _lto_cflags -flto=auto -ffat-lto-objects Name: apfel -Version: 3.1.0 +Version: 3.1.1 Release: 0 Summary: A Probability Distribution Function Evolution Library License: GPL-3.0-or-later Group: Development/Libraries/C and C++ URL: http://apfel.hepforge.org/ Source: https://github.com/scarrazza/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM apfel-fix-project-version.patch badshah400@gmail.com -- Use the correct version in defining project in CMakeLists.txt -Patch0: apfel-fix-project-version.patch # PATCH-FIX-UPSTREAM apfel-dont-set-default-reltype.patch badshah400@gmail.com -- Don't assume 'RELEASE' as the release type, this should be set by user Patch1: apfel-dont-set-default-reltype.patch BuildRequires: %{python_module LHAPDF}