From c2f0fca5bd50455a926ac5cec591a88a2c9a2661 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 10:24:07 +0000 Subject: [PATCH 01/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index 55c500d..47ebf34 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -132,6 +132,9 @@ find %{buildroot}%{_pkgdocdir}/examples -type f -a '!' -name '*.*' -delete %license COPYING %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 6.5.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jan 01 2025 Mattias Ellert - 6.5.5-1 - Update to version 6.5.5 - Drop soname patch, use new configure option --enable-librelease instead From 6c057741efa927559c896ef19f8efab4b65a7e7b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:48:34 +0200 Subject: [PATCH 02/12] Rebuilt for Python 3.14 --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index 47ebf34..55996e9 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -132,6 +132,9 @@ find %{buildroot}%{_pkgdocdir}/examples -type f -a '!' -name '*.*' -delete %license COPYING %changelog +* Mon Jun 02 2025 Python Maint - 6.5.5-3 +- Rebuilt for Python 3.14 + * Fri Jan 17 2025 Fedora Release Engineering - 6.5.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b4139c6b0c29b77a7211fcf56931d6f491048ed4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 19:15:17 +0000 Subject: [PATCH 03/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index 55996e9..3baeff5 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -132,6 +132,9 @@ find %{buildroot}%{_pkgdocdir}/examples -type f -a '!' -name '*.*' -delete %license COPYING %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 6.5.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 02 2025 Python Maint - 6.5.5-3 - Rebuilt for Python 3.14 From b1bda310de11347ee7b1ab0d1e55589da8d3e0fe Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:55:10 +0200 Subject: [PATCH 04/12] Rebuilt for Python 3.14.0rc2 bytecode --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index 3baeff5..c501e70 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -132,6 +132,9 @@ find %{buildroot}%{_pkgdocdir}/examples -type f -a '!' -name '*.*' -delete %license COPYING %changelog +* Fri Aug 15 2025 Python Maint - 6.5.5-5 +- Rebuilt for Python 3.14.0rc2 bytecode + * Thu Jul 24 2025 Fedora Release Engineering - 6.5.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 45ff5ab08577d660820c26f55c99ca71d0db8c24 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:25:37 +0200 Subject: [PATCH 05/12] Rebuilt for Python 3.14.0rc3 bytecode --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index c501e70..a7734de 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -132,6 +132,9 @@ find %{buildroot}%{_pkgdocdir}/examples -type f -a '!' -name '*.*' -delete %license COPYING %changelog +* Fri Sep 19 2025 Python Maint - 6.5.5-6 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 6.5.5-5 - Rebuilt for Python 3.14.0rc2 bytecode From 347206e335996aead3d0937f2727cc06518e6861 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 4 Dec 2025 20:30:32 -0700 Subject: [PATCH 06/12] Rebuild for yaml-cpp 0.8 (epel10) --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index 55c500d..1119bbc 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -132,6 +132,9 @@ find %{buildroot}%{_pkgdocdir}/examples -type f -a '!' -name '*.*' -delete %license COPYING %changelog +* Fri Dec 05 2025 Orion Poplawski - 6.5.5-2 +- Rebuild for yaml-cpp 0.8 (epel10) + * Wed Jan 01 2025 Mattias Ellert - 6.5.5-1 - Update to version 6.5.5 - Drop soname patch, use new configure option --enable-librelease instead From db7609937246790577710321028b2350ac1fe238 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 18:25:15 +0000 Subject: [PATCH 07/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index a7734de..ee38603 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -132,6 +132,9 @@ find %{buildroot}%{_pkgdocdir}/examples -type f -a '!' -name '*.*' -delete %license COPYING %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 6.5.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Sep 19 2025 Python Maint - 6.5.5-6 - Rebuilt for Python 3.14.0rc3 bytecode From 640d3422863ea1015d0d8f0337c9d744268e9b9a Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sat, 28 Mar 2026 20:03:09 +0100 Subject: [PATCH 08/12] Correct the lhapdf-config output (backport from upstream git) --- ...df-config-help-message-to-use-includ.patch | 50 +++++++++++++++++++ lhapdf.spec | 8 ++- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 0001-Correct-the-lhapdf-config-help-message-to-use-includ.patch diff --git a/0001-Correct-the-lhapdf-config-help-message-to-use-includ.patch b/0001-Correct-the-lhapdf-config-help-message-to-use-includ.patch new file mode 100644 index 0000000..911a430 --- /dev/null +++ b/0001-Correct-the-lhapdf-config-help-message-to-use-includ.patch @@ -0,0 +1,50 @@ +From d49e808ed6c027db3a682a731d74ec3ffa7c6076 Mon Sep 17 00:00:00 2001 +From: Andy Buckley +Date: Mon, 9 Mar 2026 19:33:39 +0000 +Subject: [PATCH] Correct the lhapdf-config help message to use --includedir + rather than --incdir, but also add a backward-compatibility handling for + --incdir if given. Thanks to Mark Sutton. + +--- + ChangeLog | 6 ++++++ + bin/lhapdf-config.in | 3 ++- + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/ChangeLog b/ChangeLog +index cd35d70..7eabc3f 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,9 @@ ++2026-03-09 Andy Buckley ++ ++ * Correct the lhapdf-config help message to use --includedir ++ rather than --incdir, but also add a backward-compatibility ++ handling for --incdir if given. Thanks to Mark Sutton. ++ + 2026-02-19 Andy Buckley + + * Version 6.5.6 release. +diff --git a/bin/lhapdf-config.in b/bin/lhapdf-config.in +index b62a217..d13b6f1 100644 +--- a/bin/lhapdf-config.in ++++ b/bin/lhapdf-config.in +@@ -13,7 +13,7 @@ Options: + --help | -h : show this help message + + --prefix : show the installation prefix (cf. autoconf) +- --incdir : show the path to the LHAPDF C++ header directory ++ --includedir : show the path to the LHAPDF C++ header directory + --libdir : show the path to the LHAPDF library directory + --datadir : show the path to the LHAPDF data directory + --pythonpath|--pydir : show the path(s) to the directory containing LHAPDF's Python package +@@ -48,6 +48,7 @@ for opt in "$@"; do + --version) echo "@PACKAGE_VERSION@" && exit 0 ;; + --prefix) show_prefix=1 ;; + --includedir) show_incdir=1 ;; ++ --incdir) show_incdir=1 ;; #< TODO: for backward compatibility from 6.5.7, remove eventually + --libdir) show_libdir=1 ;; + --datadir) show_datdir=1 ;; + --pythonpath) show_pypath=1 ;; +-- +2.53.0 + diff --git a/lhapdf.spec b/lhapdf.spec index 11b3b66..072203f 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -13,6 +13,8 @@ Source3: https://lhapdfsets.web.cern.ch/current/NNPDF31_lo_as_0130.tar.gz # Missing file in source tarfile # See: https://gitlab.com/hepcedar/lhapdf/-/merge_requests/120 Source4: testunc.py +# https://gitlab.com/hepcedar/lhapdf/-/merge_requests/123 +Patch0: 0001-Correct-the-lhapdf-config-help-message-to-use-includ.patch BuildRequires: make BuildRequires: gcc-c++ @@ -78,6 +80,7 @@ This package provides API documentation and examples for LHAPDF. %prep %setup -q -n LHAPDF-%{version} +%patch -P0 -p1 mkdir tests/SETS tar -z -x -f %{SOURCE1} -C tests/SETS @@ -160,6 +163,9 @@ export LD_LIBRARY_PATH=$PWD/src/.libs %license COPYING %changelog +* Sat Mar 28 2026 Mattias Ellert - 6.5.6-2 +- Correct the lhapdf-config output (backport from upstream git) + * Thu Mar 05 2026 Mattias Ellert - 6.5.6-1 - Update to version 6.5.6 - Add PDFs used by new tests to the source RPM From b27d9b9c0cbd7d3378bc2aa800b6a3c7fb864b1a Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Fri, 3 Apr 2026 08:33:23 +0200 Subject: [PATCH 09/12] More fixes to lhapdf-config and lhapdf.pc --- ...ble-I-in-lhapdf-config-cflags-output.patch | 76 +++++++++++++++++++ lhapdf.spec | 17 +++-- 2 files changed, 88 insertions(+), 5 deletions(-) create mode 100644 0001-Fix-double-I-in-lhapdf-config-cflags-output.patch diff --git a/0001-Fix-double-I-in-lhapdf-config-cflags-output.patch b/0001-Fix-double-I-in-lhapdf-config-cflags-output.patch new file mode 100644 index 0000000..f8959a8 --- /dev/null +++ b/0001-Fix-double-I-in-lhapdf-config-cflags-output.patch @@ -0,0 +1,76 @@ +From d4dd6202016754052f7f7f0cfedd3913a08afbbf Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Fri, 3 Apr 2026 07:45:56 +0200 +Subject: [PATCH] Fix double -I in lhapdf-config --cflags output Don't put + -L/usr/lib and -L/usr/lib64 in build flags Fix pkg-config --define-variable + libdir=/path --libs lhapdf + +--- + ChangeLog | 6 ++++++ + bin/lhapdf-config.in | 2 +- + configure | 9 +++++++-- + lhapdf.pc.in | 4 ++-- + 4 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 7eabc3f..74f4c7e 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,9 @@ ++2026-04-03 Mattias Ellert ++ ++ * Fix double -I in lhapdf-config --cflags output ++ * Don't put -L/usr/lib and -L/usr/lib64 in build flags ++ * Fix pkg-config --define-variable libdir=/path --libs lhapdf ++ + 2026-03-09 Andy Buckley + + * Correct the lhapdf-config help message to use --includedir +diff --git a/bin/lhapdf-config.in b/bin/lhapdf-config.in +index d13b6f1..4b5afcd 100644 +--- a/bin/lhapdf-config.in ++++ b/bin/lhapdf-config.in +@@ -102,7 +102,7 @@ if [ "$show_iflags" -eq 1 ]; then + ilhapdf="@includedir@" + test -n "$ilhapdf" && OUT="$OUT -I${ilhapdf}" + iyamlcpp="@YAML_CPP_CPPFLAGS@" +- test -n "$iyamlcpp" && OUT="$OUT -I${iyamlcpp}" ++ test -n "$iyamlcpp" && OUT="$OUT ${iyamlcpp}" + fi + if [ "$show_Lflags" -eq 1 ]; then + llhapdf="@libdir@" +diff --git a/configure b/configure +index 7fafae6..d530cd7 100644 +--- a/configure ++++ b/configure +@@ -19972,8 +19972,13 @@ + YAML_CPP_CPPFLAGS="" + YAML_CPP_LDFLAGS="" + if test "x$yaml_cpp_prefix" != "xno"; then +- YAML_CPP_CPPFLAGS="-I$yaml_cpp_prefix/include" +- YAML_CPP_LDFLAGS="-L$yaml_cpp_prefix/lib -L$yaml_cpp_prefix/lib64 -lyaml-cpp" ++ if test "x$yaml_cpp_prefix" = "x/usr"; then ++ YAML_CPP_CPPFLAGS="" ++ YAML_CPP_LDFLAGS="-lyaml-cpp" ++ else ++ YAML_CPP_CPPFLAGS="-I$yaml_cpp_prefix/include" ++ YAML_CPP_LDFLAGS="-L$yaml_cpp_prefix/lib -L$yaml_cpp_prefix/lib64 -lyaml-cpp" ++ fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lyaml-cpp" >&5 + printf %s "checking for main in -lyaml-cpp... " >&6; } + if test ${ac_cv_lib_yaml_cpp_main+y} +diff --git a/lhapdf.pc.in b/lhapdf.pc.in +index 964d0ae..1a7d80a 100644 +--- a/lhapdf.pc.in ++++ b/lhapdf.pc.in +@@ -8,5 +8,5 @@ Name: lhapdf + Description: LHAPDF parton density library + URL: https://lhapdf.hepforge.org + Version: @VERSION@ +-Libs: -L@libdir@ @YAML_CPP_LDFLAGS@ -lLHAPDF +-Cflags: -I@includedir@ @YAML_CPP_CPPFLAGS@ ++Libs: -L${libdir} @YAML_CPP_LDFLAGS@ -lLHAPDF ++Cflags: -I${includedir} @YAML_CPP_CPPFLAGS@ +-- +2.53.0 + diff --git a/lhapdf.spec b/lhapdf.spec index 072203f..1984317 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -15,6 +15,8 @@ Source3: https://lhapdfsets.web.cern.ch/current/NNPDF31_lo_as_0130.tar.gz Source4: testunc.py # https://gitlab.com/hepcedar/lhapdf/-/merge_requests/123 Patch0: 0001-Correct-the-lhapdf-config-help-message-to-use-includ.patch +# https://gitlab.com/hepcedar/lhapdf/-/merge_requests/124 +Patch1: 0001-Fix-double-I-in-lhapdf-config-cflags-output.patch BuildRequires: make BuildRequires: gcc-c++ @@ -55,16 +57,17 @@ LHAPDF6 is documented in more detail in http://arxiv.org/abs/1412.7420 %package devel Summary: Les Houches Accord PDF Interface - development files Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: yaml-cpp-devel %description devel This package provides development files of LHAPDF, including C++ bindings. -%package -n python%{python3_pkgversion}-%{name} +%package -n python3-%{name} Summary: Les Houches Accord PDF Interface - Python 3 module -%py_provides python%{python3_pkgversion}-%{name} +%py_provides python3-%{name} Requires: %{name}%{?_isa} = %{version}-%{release} -%description -n python%{python3_pkgversion}-%{name} +%description -n python3-%{name} This package provides Python 3 bindings for LHAPDF. This package also provides a script called "lhapdf" which can be used to query the catalog of PDF sets and to install and update them from @@ -81,6 +84,7 @@ This package provides API documentation and examples for LHAPDF. %prep %setup -q -n LHAPDF-%{version} %patch -P0 -p1 +%patch -P1 -p1 mkdir tests/SETS tar -z -x -f %{SOURCE1} -C tests/SETS @@ -152,7 +156,7 @@ export LD_LIBRARY_PATH=$PWD/src/.libs %{_libdir}/libLHAPDF.so %{_libdir}/pkgconfig/%{name}.pc -%files -n python%{python3_pkgversion}-%{name} +%files -n python3-%{name} %{_bindir}/%{name} %{python3_sitearch}/%{name}-%{version}.dist-info %{python3_sitearch}/%{name} @@ -163,6 +167,9 @@ export LD_LIBRARY_PATH=$PWD/src/.libs %license COPYING %changelog +* Fri Apr 03 2026 Mattias Ellert - 6.5.6-3 +- More fixes to lhapdf-config and lhapdf.pc + * Sat Mar 28 2026 Mattias Ellert - 6.5.6-2 - Correct the lhapdf-config output (backport from upstream git) From 912c6e5bfca95d7bc707dfdf5f237cc01cd63173 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 3 Jun 2026 19:03:48 +0200 Subject: [PATCH 10/12] Rebuilt for Python 3.15 --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index 1984317..77238de 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -167,6 +167,9 @@ export LD_LIBRARY_PATH=$PWD/src/.libs %license COPYING %changelog +* Wed Jun 03 2026 Python Maint - 6.5.6-4 +- Rebuilt for Python 3.15 + * Fri Apr 03 2026 Mattias Ellert - 6.5.6-3 - More fixes to lhapdf-config and lhapdf.pc From e6b66cb10f1e338d513516a361142d2abd9a2151 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jul 2026 05:35:03 +0000 Subject: [PATCH 11/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index 77238de..318386a 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -167,6 +167,9 @@ export LD_LIBRARY_PATH=$PWD/src/.libs %license COPYING %changelog +* Thu Jul 16 2026 Fedora Release Engineering - 6.5.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Wed Jun 03 2026 Python Maint - 6.5.6-4 - Rebuilt for Python 3.15 From 867c8c4ed011daa79192c8b45cdde1b1c4c3cefe Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 11:07:55 +0200 Subject: [PATCH 12/12] Rebuilt for Python 3.15.0b4 ABI change --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index 318386a..69013a3 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -167,6 +167,9 @@ export LD_LIBRARY_PATH=$PWD/src/.libs %license COPYING %changelog +* Wed Jul 22 2026 Python Maint - 6.5.6-6 +- Rebuilt for Python 3.15.0b4 ABI change + * Thu Jul 16 2026 Fedora Release Engineering - 6.5.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild