From 44061b671186d382d022e329b2bd2c6a2120e104 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 6 Jan 2021 00:41:54 +0000 Subject: [PATCH 01/31] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- lhapdf.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/lhapdf.spec b/lhapdf.spec index eec12dd..ccd2cc2 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -15,6 +15,7 @@ Source0: https://www.hepforge.org/archive/lhapdf/LHAPDF-%{version}.tar.gz # Add soname to the shared library, cf. SuSE's spec file. Patch0: %{name}-soname.patch +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: /usr/bin/cython %if ! %{py3default} From 755c89bfb13b1456c51e84a4c1410b0df8f36de6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 16:31:08 +0000 Subject: [PATCH 02/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index ccd2cc2..dc51142 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -6,7 +6,7 @@ Name: lhapdf Version: 6.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Les Houches Accord PDF Interface License: GPLv3+ @@ -206,6 +206,9 @@ rm examples/Makefile* %license COPYING %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 6.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Aug 23 2020 Mattias Ellert - 6.3.0-1 - Update to version 6.3.0 - Drop patch lhapdf-cython-configure.patch (previously backported) From 4860d8a965c0e68b499da02594b18861405dbcda Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:08:50 +0200 Subject: [PATCH 03/31] Rebuilt for Python 3.10 --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index dc51142..86dcd33 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -6,7 +6,7 @@ Name: lhapdf Version: 6.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Les Houches Accord PDF Interface License: GPLv3+ @@ -206,6 +206,9 @@ rm examples/Makefile* %license COPYING %changelog +* Fri Jun 04 2021 Python Maint - 6.3.0-3 +- Rebuilt for Python 3.10 + * Tue Jan 26 2021 Fedora Release Engineering - 6.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From c7f1fe6b0b8f0c9914b6e7a8e1fda6dd6e093d03 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 10:48:39 +0000 Subject: [PATCH 04/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index 86dcd33..fb1cda3 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -6,7 +6,7 @@ Name: lhapdf Version: 6.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Les Houches Accord PDF Interface License: GPLv3+ @@ -206,6 +206,9 @@ rm examples/Makefile* %license COPYING %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 6.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 6.3.0-3 - Rebuilt for Python 3.10 From 34adc86daccb042904b51dd83f788a821befcb73 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Mon, 20 Dec 2021 15:51:46 +0100 Subject: [PATCH 05/31] Update to version 6.4.0 --- lhapdf.spec | 56 ++++++++++++++++++++++------------------------------- sources | 2 +- 2 files changed, 24 insertions(+), 34 deletions(-) diff --git a/lhapdf.spec b/lhapdf.spec index fb1cda3..3fd4700 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,12 +1,6 @@ -%if %{?fedora}%{!?fedora:0} >= 29 || %{?rhel}%{!?rhel:0} >= 8 -%global py3default 1 -%else -%global py3default 0 -%endif - Name: lhapdf -Version: 6.3.0 -Release: 4%{?dist} +Version: 6.4.0 +Release: 1%{?dist} Summary: Les Houches Accord PDF Interface License: GPLv3+ @@ -15,10 +9,10 @@ Source0: https://www.hepforge.org/archive/lhapdf/LHAPDF-%{version}.tar.gz # Add soname to the shared library, cf. SuSE's spec file. Patch0: %{name}-soname.patch -BuildRequires: make +BuildRequires: make BuildRequires: gcc-c++ -BuildRequires: /usr/bin/cython -%if ! %{py3default} +BuildRequires: python%{python3_pkgversion}-Cython +%if %{?rhel}%{!?rhel:0} == 7 BuildRequires: python2-devel %endif BuildRequires: python%{python3_pkgversion}-devel @@ -30,7 +24,7 @@ BuildRequires: doxygen # Obsolete LHAPDF5 packages not provided by LHAPDF6 Obsoletes: octave-lhapdf < 6 Obsoletes: lhapdf-pdfsets-minimal < 6 -%if %{py3default} +%if %{?rhel}%{!?rhel:0} != 7 Obsoletes: python2-lhapdf < %{version}-%{release} %endif @@ -66,7 +60,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package provides development files of LHAPDF, including C++ bindings. -%if ! %{py3default} +%if %{?rhel}%{!?rhel:0} == 7 %package -n python2-%{name} Summary: Les Houches Accord PDF Interface - Python 2 module %{?python_provide:%python_provide python2-%{name}} @@ -88,7 +82,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description -n python%{python3_pkgversion}-%{name} This package provides Python 3 bindings for LHAPDF. -%if %{py3default} +%if %{?rhel}%{!?rhel:0} != 7 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 the command line. It accepts commands "list", "update", "install" and @@ -98,7 +92,7 @@ the command line. It accepts commands "list", "update", "install" and %if %{?rhel}%{!?rhel:0} == 7 %package -n python%{python3_other_pkgversion}-%{name} Summary: Les Houches Accord PDF Interface - Python 3 module -%{?python_provide:%python_provide python%{python3_other_pkgversion}-%{name}} +%{?python_provide:%python_provide python%{?python3_other_pkgversion}-%{name}} Requires: %{name}%{?_isa} = %{version}-%{release} %description -n python%{python3_other_pkgversion}-%{name} @@ -119,8 +113,13 @@ This package provides API documentation and examples for LHAPDF. # Remove cython generated file rm wrappers/python/lhapdf.cpp +%if %{?rhel}%{!?rhel:0} == 7 +sed 's!cython!cython%{python3_version}!' \ + -i wrappers/python/Makefile.am wrappers/python/Makefile.in +%endif + # Fix shebangs -%if %{py3default} +%if %{?rhel}%{!?rhel:0} != 7 sed 's!/usr/bin/env python!%{__python3}!' -i bin/lhapdf examples/*.py %else sed 's!/usr/bin/env python!%{__python2}!' -i bin/lhapdf examples/*.py @@ -128,20 +127,11 @@ sed 's!/usr/bin/env python!%{__python2}!' -i bin/lhapdf examples/*.py sed 's!/usr/bin/env bash!/bin/bash!' -i bin/lhapdf-config.in %build -%if %{py3default} -export PYTHON=%{__python3} -%else -export PYTHON=%{__python2} -%endif -%configure --disable-static --disable-silent-rules - +%configure --disable-static --disable-silent-rules PYTHON=%{__python3} %make_build -%if ! %{py3default} -( cd wrappers/python ; %make_build PYTHON=%{__python3} ) -%endif - %if %{?rhel}%{!?rhel:0} == 7 +( cd wrappers/python ; %make_build PYTHON=%{__python2} ) ( cd wrappers/python ; %make_build PYTHON=%{__python3_other} ) %endif @@ -151,11 +141,8 @@ export PYTHON=%{__python2} %install %make_install -%if ! %{py3default} -( cd wrappers/python ; %make_install PYTHON=%{__python3} ) -%endif - %if %{?rhel}%{!?rhel:0} == 7 +( cd wrappers/python ; %make_install PYTHON=%{__python2} ) ( cd wrappers/python ; %make_install PYTHON=%{__python3_other} ) %endif @@ -180,7 +167,7 @@ rm examples/Makefile* %{_libdir}/libLHAPDF.so %{_libdir}/pkgconfig/%{name}.pc -%if ! %{py3default} +%if %{?rhel}%{!?rhel:0} == 7 %files -n python2-%{name} %{_bindir}/%{name} %{python2_sitearch}/LHAPDF-*.egg-info @@ -188,7 +175,7 @@ rm examples/Makefile* %endif %files -n python%{python3_pkgversion}-%{name} -%if %{py3default} +%if %{?rhel}%{!?rhel:0} != 7 %{_bindir}/%{name} %endif %{python3_sitearch}/LHAPDF-*.egg-info @@ -206,6 +193,9 @@ rm examples/Makefile* %license COPYING %changelog +* Sun Dec 19 2021 Mattias Ellert - 6.4.0-1 +- Update to version 6.4.0 + * Thu Jul 22 2021 Fedora Release Engineering - 6.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 268c359..2c9ca6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (LHAPDF-6.3.0.tar.gz) = 4a5aca6e2f06b59a44acc23ef76f1fae747f38e425803e7625cc68130da0c76d1e0d534b7b1867f09c86ee838d4f769d5097257170740db704c966d91c41f94b +SHA512 (LHAPDF-6.4.0.tar.gz) = 6b3df9d4e8a827f9188d361e62da02339a9b4d60124c63ef50343c38f91487dfe631e4e0a0c28cace3aa6458fe62f8172361d9127d27d58f1c0aacc91c9e9b86 From 1e72a841ac3824cb31eeb9dde617acf501874c84 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 15:36:22 +0000 Subject: [PATCH 06/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index 3fd4700..600fc30 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Les Houches Accord PDF Interface License: GPLv3+ @@ -193,6 +193,9 @@ rm examples/Makefile* %license COPYING %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 6.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sun Dec 19 2021 Mattias Ellert - 6.4.0-1 - Update to version 6.4.0 From d6d18556982547e9ecaf24473d23c81b6d729204 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 16:01:06 +0200 Subject: [PATCH 07/31] Rebuilt for Python 3.11 --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index 600fc30..e5121a2 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Les Houches Accord PDF Interface License: GPLv3+ @@ -193,6 +193,9 @@ rm examples/Makefile* %license COPYING %changelog +* Mon Jun 13 2022 Python Maint - 6.4.0-3 +- Rebuilt for Python 3.11 + * Thu Jan 20 2022 Fedora Release Engineering - 6.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From a87b4890222a7da368f2f5c538c7f55a65b1eb28 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 17:08:58 +0000 Subject: [PATCH 08/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index e5121a2..35f8722 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Les Houches Accord PDF Interface License: GPLv3+ @@ -193,6 +193,9 @@ rm examples/Makefile* %license COPYING %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 6.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 6.4.0-3 - Rebuilt for Python 3.11 From ce1b4487761c0f172dd4166c6c30c846199e288d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 15:39:45 +0000 Subject: [PATCH 09/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index 35f8722..bf5591d 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Les Houches Accord PDF Interface License: GPLv3+ @@ -193,6 +193,9 @@ rm examples/Makefile* %license COPYING %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 6.4.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 6.4.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 8c5318c6dbcd14a9eaa66f7057ab352a2be679a1 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Mon, 13 Mar 2023 19:36:52 +0100 Subject: [PATCH 10/31] Update to version 6.5.4 --- lhapdf.spec | 64 +++++++++++++++++++++++++++++++---------------------- sources | 2 +- 2 files changed, 39 insertions(+), 27 deletions(-) diff --git a/lhapdf.spec b/lhapdf.spec index bf5591d..b73cfc2 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,9 +1,9 @@ Name: lhapdf -Version: 6.4.0 -Release: 5%{?dist} +Version: 6.5.4 +Release: 1%{?dist} Summary: Les Houches Accord PDF Interface -License: GPLv3+ +License: GPL-3.0-only URL: https://lhapdf.hepforge.org/ Source0: https://www.hepforge.org/archive/lhapdf/LHAPDF-%{version}.tar.gz # Add soname to the shared library, cf. SuSE's spec file. @@ -24,9 +24,6 @@ BuildRequires: doxygen # Obsolete LHAPDF5 packages not provided by LHAPDF6 Obsoletes: octave-lhapdf < 6 Obsoletes: lhapdf-pdfsets-minimal < 6 -%if %{?rhel}%{!?rhel:0} != 7 -Obsoletes: python2-lhapdf < %{version}-%{release} -%endif %description LHAPDF is a general purpose C++ interpolator, used for evaluating PDFs @@ -63,7 +60,7 @@ This package provides development files of LHAPDF, including C++ bindings. %if %{?rhel}%{!?rhel:0} == 7 %package -n python2-%{name} Summary: Les Houches Accord PDF Interface - Python 2 module -%{?python_provide:%python_provide python2-%{name}} +%py_provides python2-%{name} Requires: %{name}%{?_isa} = %{version}-%{release} %description -n python2-%{name} @@ -77,7 +74,7 @@ the command line. It accepts commands "list", "update", "install" and %package -n python%{python3_pkgversion}-%{name} Summary: Les Houches Accord PDF Interface - Python 3 module -%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}} +%py_provides python%{python3_pkgversion}-%{name} Requires: %{name}%{?_isa} = %{version}-%{release} %description -n python%{python3_pkgversion}-%{name} @@ -90,12 +87,12 @@ the command line. It accepts commands "list", "update", "install" and %endif %if %{?rhel}%{!?rhel:0} == 7 -%package -n python%{python3_other_pkgversion}-%{name} +%package -n python%{?python3_other_pkgversion}-%{name} Summary: Les Houches Accord PDF Interface - Python 3 module -%{?python_provide:%python_provide python%{?python3_other_pkgversion}-%{name}} +%py_provides python%{python3_other_pkgversion}-%{name} Requires: %{name}%{?_isa} = %{version}-%{release} -%description -n python%{python3_other_pkgversion}-%{name} +%description -n python%{?python3_other_pkgversion}-%{name} This package provides Python 3 bindings for LHAPDF. %endif @@ -127,7 +124,7 @@ sed 's!/usr/bin/env python!%{__python2}!' -i bin/lhapdf examples/*.py sed 's!/usr/bin/env bash!/bin/bash!' -i bin/lhapdf-config.in %build -%configure --disable-static --disable-silent-rules PYTHON=%{__python3} +%configure --disable-static --disable-silent-rules PYTHON=%{__python3} --docdir=%{_pkgdocdir} %make_build %if %{?rhel}%{!?rhel:0} == 7 @@ -139,16 +136,28 @@ sed 's!/usr/bin/env bash!/bin/bash!' -i bin/lhapdf-config.in %make_build doxy %install -%make_install +%make_install PYTHON_PATH=%{python3_sitearch} + +cat << EOF > %{buildroot}%{python3_sitearch}/%{name}-%{version}.egg-info +Name: %{name} +Version: %{version} +EOF %if %{?rhel}%{!?rhel:0} == 7 -( cd wrappers/python ; %make_install PYTHON=%{__python2} ) -( cd wrappers/python ; %make_install PYTHON=%{__python3_other} ) +( cd wrappers/python ; %make_install PYTHON=%{__python2} PYTHON_PATH=%{python2_sitearch} ) +cat << EOF > %{buildroot}%{python2_sitearch}/%{name}-%{version}.egg-info +Name: %{name} +Version: %{version} +EOF +( cd wrappers/python ; %make_install PYTHON=%{__python3_other} PYTHON_PATH=%{python3_other_sitearch} ) +cat << EOF > %{buildroot}%{python3_other_sitearch}/%{name}-%{version}.egg-info +Name: %{name} +Version: %{version} +EOF %endif rm %{buildroot}%{_libdir}/libLHAPDF.la - -rm examples/Makefile* +find %{buildroot}%{_pkgdocdir}/examples -type f -a '!' -name '*.*' -delete %check %make_build check @@ -170,29 +179,32 @@ rm examples/Makefile* %if %{?rhel}%{!?rhel:0} == 7 %files -n python2-%{name} %{_bindir}/%{name} -%{python2_sitearch}/LHAPDF-*.egg-info -%{python2_sitearch}/%{name}.so +%{python2_sitearch}/%{name}-%{version}.egg-info +%{python2_sitearch}/%{name} %endif %files -n python%{python3_pkgversion}-%{name} %if %{?rhel}%{!?rhel:0} != 7 %{_bindir}/%{name} %endif -%{python3_sitearch}/LHAPDF-*.egg-info -%{python3_sitearch}/%{name}.*.so +%{python3_sitearch}/%{name}-%{version}.egg-info +%{python3_sitearch}/%{name} %if %{?rhel}%{!?rhel:0} == 7 -%files -n python%{python3_other_pkgversion}-%{name} -%{python3_other_sitearch}/LHAPDF-*.egg-info -%{python3_other_sitearch}/%{name}.*.so +%files -n python%{?python3_other_pkgversion}-%{name} +%{python3_other_sitearch}/%{name}-%{version}.egg-info +%{python3_other_sitearch}/%{name} %endif %files doc -%doc doc/doxygen -%doc examples +%doc %{_pkgdocdir}/doxygen +%doc %{_pkgdocdir}/examples %license COPYING %changelog +* Mon Mar 13 2023 Mattias Ellert - 6.5.4-1 +- Update to version 6.5.4 + * Thu Jan 19 2023 Fedora Release Engineering - 6.4.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 2c9ca6a..2954e5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (LHAPDF-6.4.0.tar.gz) = 6b3df9d4e8a827f9188d361e62da02339a9b4d60124c63ef50343c38f91487dfe631e4e0a0c28cace3aa6458fe62f8172361d9127d27d58f1c0aacc91c9e9b86 +SHA512 (LHAPDF-6.5.4.tar.gz) = 0e39f7f298e8c72eece9c3d19f471f48b3ee045cd54ecd318e0b2d60ada4f01a2151e6b2b5f27fccdf10c1043352a673492f8792be1964df7eafbe931282a83b From dba26b18dd29bad462d032ebfc4d91f01f993a1e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 21:35:28 +0200 Subject: [PATCH 11/31] Rebuilt for Python 3.12 --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index b73cfc2..3d5f19b 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -202,6 +202,9 @@ find %{buildroot}%{_pkgdocdir}/examples -type f -a '!' -name '*.*' -delete %license COPYING %changelog +* Tue Jun 13 2023 Python Maint - 6.5.4-2 +- Rebuilt for Python 3.12 + * Mon Mar 13 2023 Mattias Ellert - 6.5.4-1 - Update to version 6.5.4 From f3b071207c618540cf5dec7cdd193d0adf54fdbb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 10:06:16 +0000 Subject: [PATCH 12/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index 3d5f19b..d774952 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -202,6 +202,9 @@ find %{buildroot}%{_pkgdocdir}/examples -type f -a '!' -name '*.*' -delete %license COPYING %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 6.5.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 13 2023 Python Maint - 6.5.4-2 - Rebuilt for Python 3.12 From fb8006022ae97eb7d783ecc882118ad789ddcfbe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 03:25:05 +0000 Subject: [PATCH 13/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index d774952..47a197c 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -202,6 +202,9 @@ find %{buildroot}%{_pkgdocdir}/examples -type f -a '!' -name '*.*' -delete %license COPYING %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 6.5.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 6.5.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From e4c051d91a1b47aa4303a1b31f9c236a3b3b257e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 01:22:41 +0000 Subject: [PATCH 14/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index 47a197c..292f673 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -202,6 +202,9 @@ find %{buildroot}%{_pkgdocdir}/examples -type f -a '!' -name '*.*' -delete %license COPYING %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 6.5.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 6.5.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ca620198f53d47ba9b527af6feb206af0a7441dd Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 15/31] Eliminate use of obsolete %patchN syntax (#2283636) --- lhapdf.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index 292f673..aec6262 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -105,7 +105,7 @@ This package provides API documentation and examples for LHAPDF. %prep %setup -q -n LHAPDF-%{version} -%patch0 -p1 +%patch -P0 -p1 # Remove cython generated file rm wrappers/python/lhapdf.cpp From d578229446fd3773dbae76f007e2b3b41c05f654 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Mon, 3 Jun 2024 13:15:32 +0200 Subject: [PATCH 16/31] Rebulld for updated patch syntax --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index aec6262..e83630e 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -202,6 +202,9 @@ find %{buildroot}%{_pkgdocdir}/examples -type f -a '!' -name '*.*' -delete %license COPYING %changelog +* Mon Jun 03 2024 Mattias Ellert - 6.5.4-6 +- Eliminate use of obsolete patchN syntax + * Thu Jan 25 2024 Fedora Release Engineering - 6.5.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5720c7193b7c4090e7987313dd4caca30143b5d9 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 09:49:39 +0200 Subject: [PATCH 17/31] Rebuilt for Python 3.13 --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index e83630e..52378c4 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -202,6 +202,9 @@ find %{buildroot}%{_pkgdocdir}/examples -type f -a '!' -name '*.*' -delete %license COPYING %changelog +* Fri Jun 07 2024 Python Maint - 6.5.4-7 +- Rebuilt for Python 3.13 + * Mon Jun 03 2024 Mattias Ellert - 6.5.4-6 - Eliminate use of obsolete patchN syntax From a4b0d59fcf94d74f371b2760936bc57c6275d756 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 13:09:39 +0000 Subject: [PATCH 18/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- lhapdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lhapdf.spec b/lhapdf.spec index 52378c4..7a8b484 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,6 +1,6 @@ Name: lhapdf Version: 6.5.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only @@ -202,6 +202,9 @@ find %{buildroot}%{_pkgdocdir}/examples -type f -a '!' -name '*.*' -delete %license COPYING %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 6.5.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 6.5.4-7 - Rebuilt for Python 3.13 From 13b28d6b4e4ef1cfa4c23b5641ade7a89a47b6c5 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Thu, 2 Jan 2025 09:49:51 +0100 Subject: [PATCH 19/31] Update to version 6.5.5 Drop soname patch, use new configure option --enable-librelease instead Unbundle yaml-cpp, using new configure option --with-yaml-cpp EPEL 7 EOL specfile cleanup --- lhapdf-soname.patch | 42 ------------------ lhapdf.spec | 106 +++++++++----------------------------------- sources | 2 +- 3 files changed, 22 insertions(+), 128 deletions(-) delete mode 100644 lhapdf-soname.patch diff --git a/lhapdf-soname.patch b/lhapdf-soname.patch deleted file mode 100644 index 45fc089..0000000 --- a/lhapdf-soname.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur LHAPDF-6.3.0.orig/src/Makefile.am LHAPDF-6.3.0/src/Makefile.am ---- LHAPDF-6.3.0.orig/src/Makefile.am 2020-07-01 16:34:05.000000000 +0200 -+++ LHAPDF-6.3.0/src/Makefile.am 2020-07-17 14:22:47.194614043 +0200 -@@ -26,6 +26,7 @@ - libLHAPDFPaths_la_CPPFLAGS = $(AM_CPPFLAGS) -DLHAPDF_INSTALL_PREFIX=\"$(prefix)\" -DLHAPDF_DATA_PREFIX=\"$(datadir)\" - - libLHAPDF_la_LIBADD = libLHAPDFInfo.la libLHAPDFPaths.la -+libLHAPDF_la_LDFLAGS = -release ${PACKAGE_VERSION} - - if ENABLE_LHAGLUE - noinst_LTLIBRARIES += libLHAPDFGlue.la -Endast i LHAPDF-6.3.0/src/: Makefile.am~ -diff -ur LHAPDF-6.3.0.orig/src/Makefile.in LHAPDF-6.3.0/src/Makefile.in ---- LHAPDF-6.3.0.orig/src/Makefile.in 2020-07-17 14:26:10.714078898 +0200 -+++ LHAPDF-6.3.0/src/Makefile.in 2020-07-17 14:23:06.041656793 +0200 -@@ -150,6 +150,9 @@ - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) - am__v_lt_0 = --silent - am__v_lt_1 = -+libLHAPDF_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -+ $(CXXFLAGS) $(libLHAPDF_la_LDFLAGS) $(LDFLAGS) -o $@ - libLHAPDFGlue_la_LIBADD = - am__libLHAPDFGlue_la_SOURCES_DIST = LHAGlue.cc - @ENABLE_LHAGLUE_TRUE@am_libLHAPDFGlue_la_OBJECTS = \ -@@ -448,6 +451,7 @@ - libLHAPDFPaths_la_CPPFLAGS = $(AM_CPPFLAGS) -DLHAPDF_INSTALL_PREFIX=\"$(prefix)\" -DLHAPDF_DATA_PREFIX=\"$(datadir)\" - libLHAPDF_la_LIBADD = libLHAPDFInfo.la libLHAPDFPaths.la \ - $(am__append_3) -+libLHAPDF_la_LDFLAGS = -release ${PACKAGE_VERSION} - @ENABLE_LHAGLUE_TRUE@libLHAPDFGlue_la_SOURCES = LHAGlue.cc - @ENABLE_LHAGLUE_TRUE@libLHAPDFGlue_la_CPPFLAGS = $(AM_CPPFLAGS) -DENABLE_LHAGLUE_CXX - all: all-recursive -@@ -531,7 +535,7 @@ - } - - libLHAPDF.la: $(libLHAPDF_la_OBJECTS) $(libLHAPDF_la_DEPENDENCIES) $(EXTRA_libLHAPDF_la_DEPENDENCIES) -- $(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libLHAPDF_la_OBJECTS) $(libLHAPDF_la_LIBADD) $(LIBS) -+ $(AM_V_CXXLD)$(libLHAPDF_la_LINK) -rpath $(libdir) $(libLHAPDF_la_OBJECTS) $(libLHAPDF_la_LIBADD) $(LIBS) - - libLHAPDFGlue.la: $(libLHAPDFGlue_la_OBJECTS) $(libLHAPDFGlue_la_DEPENDENCIES) $(EXTRA_libLHAPDFGlue_la_DEPENDENCIES) - $(AM_V_CXXLD)$(CXXLINK) $(am_libLHAPDFGlue_la_rpath) $(libLHAPDFGlue_la_OBJECTS) $(libLHAPDFGlue_la_LIBADD) $(LIBS) diff --git a/lhapdf.spec b/lhapdf.spec index 7a8b484..55c500d 100644 --- a/lhapdf.spec +++ b/lhapdf.spec @@ -1,24 +1,17 @@ Name: lhapdf -Version: 6.5.4 -Release: 8%{?dist} +Version: 6.5.5 +Release: 1%{?dist} Summary: Les Houches Accord PDF Interface License: GPL-3.0-only URL: https://lhapdf.hepforge.org/ Source0: https://www.hepforge.org/archive/lhapdf/LHAPDF-%{version}.tar.gz -# Add soname to the shared library, cf. SuSE's spec file. -Patch0: %{name}-soname.patch BuildRequires: make BuildRequires: gcc-c++ +BuildRequires: yaml-cpp-devel BuildRequires: python%{python3_pkgversion}-Cython -%if %{?rhel}%{!?rhel:0} == 7 -BuildRequires: python2-devel -%endif BuildRequires: python%{python3_pkgversion}-devel -%if %{?rhel}%{!?rhel:0} == 7 -BuildRequires: python%{python3_other_pkgversion}-devel -%endif BuildRequires: doxygen # Obsolete LHAPDF5 packages not provided by LHAPDF6 @@ -57,21 +50,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package provides development files of LHAPDF, including C++ bindings. -%if %{?rhel}%{!?rhel:0} == 7 -%package -n python2-%{name} -Summary: Les Houches Accord PDF Interface - Python 2 module -%py_provides python2-%{name} -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description -n python2-%{name} -This package provides Python 2 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 -the command line. It accepts commands "list", "update", "install" and -"upgrade". Please run "lhapdf help" for full usage instructions. -%endif - %package -n python%{python3_pkgversion}-%{name} Summary: Les Houches Accord PDF Interface - Python 3 module %py_provides python%{python3_pkgversion}-%{name} @@ -79,22 +57,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description -n python%{python3_pkgversion}-%{name} This package provides Python 3 bindings for LHAPDF. -%if %{?rhel}%{!?rhel:0} != 7 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 the command line. It accepts commands "list", "update", "install" and "upgrade". Please run "lhapdf help" for full usage instructions. -%endif - -%if %{?rhel}%{!?rhel:0} == 7 -%package -n python%{?python3_other_pkgversion}-%{name} -Summary: Les Houches Accord PDF Interface - Python 3 module -%py_provides python%{python3_other_pkgversion}-%{name} -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description -n python%{?python3_other_pkgversion}-%{name} -This package provides Python 3 bindings for LHAPDF. -%endif %package doc Summary: Les Houches Accord PDF Interface - documentation @@ -105,65 +71,44 @@ This package provides API documentation and examples for LHAPDF. %prep %setup -q -n LHAPDF-%{version} -%patch -P0 -p1 # Remove cython generated file rm wrappers/python/lhapdf.cpp -%if %{?rhel}%{!?rhel:0} == 7 -sed 's!cython!cython%{python3_version}!' \ - -i wrappers/python/Makefile.am wrappers/python/Makefile.in -%endif +# Remove bundled yaml-cpp +rm -rf src/yamlcpp/ # Fix shebangs -%if %{?rhel}%{!?rhel:0} != 7 sed 's!/usr/bin/env python!%{__python3}!' -i bin/lhapdf examples/*.py -%else -sed 's!/usr/bin/env python!%{__python2}!' -i bin/lhapdf examples/*.py -%endif sed 's!/usr/bin/env bash!/bin/bash!' -i bin/lhapdf-config.in %build -%configure --disable-static --disable-silent-rules PYTHON=%{__python3} --docdir=%{_pkgdocdir} +%configure \ + --disable-static \ + --with-yaml-cpp \ + --enable-librelease \ + --docdir=%{_pkgdocdir} \ + PYTHON=%{__python3} %make_build -%if %{?rhel}%{!?rhel:0} == 7 -( cd wrappers/python ; %make_build PYTHON=%{__python2} ) -( cd wrappers/python ; %make_build PYTHON=%{__python3_other} ) -%endif - # Build doxygen documentation %make_build doxy %install -%make_install PYTHON_PATH=%{python3_sitearch} +%make_install -cat << EOF > %{buildroot}%{python3_sitearch}/%{name}-%{version}.egg-info +mkdir %{buildroot}%{python3_sitearch}/%{name}-%{version}.dist-info +cat << EOF > %{buildroot}%{python3_sitearch}/%{name}-%{version}.dist-info/METADATA Name: %{name} Version: %{version} EOF -%if %{?rhel}%{!?rhel:0} == 7 -( cd wrappers/python ; %make_install PYTHON=%{__python2} PYTHON_PATH=%{python2_sitearch} ) -cat << EOF > %{buildroot}%{python2_sitearch}/%{name}-%{version}.egg-info -Name: %{name} -Version: %{version} -EOF -( cd wrappers/python ; %make_install PYTHON=%{__python3_other} PYTHON_PATH=%{python3_other_sitearch} ) -cat << EOF > %{buildroot}%{python3_other_sitearch}/%{name}-%{version}.egg-info -Name: %{name} -Version: %{version} -EOF -%endif - rm %{buildroot}%{_libdir}/libLHAPDF.la find %{buildroot}%{_pkgdocdir}/examples -type f -a '!' -name '*.*' -delete %check %make_build check -%ldconfig_scriptlets - %files %{_libdir}/libLHAPDF-%{version}.so %{_datadir}/LHAPDF @@ -176,32 +121,23 @@ find %{buildroot}%{_pkgdocdir}/examples -type f -a '!' -name '*.*' -delete %{_libdir}/libLHAPDF.so %{_libdir}/pkgconfig/%{name}.pc -%if %{?rhel}%{!?rhel:0} == 7 -%files -n python2-%{name} -%{_bindir}/%{name} -%{python2_sitearch}/%{name}-%{version}.egg-info -%{python2_sitearch}/%{name} -%endif - %files -n python%{python3_pkgversion}-%{name} -%if %{?rhel}%{!?rhel:0} != 7 %{_bindir}/%{name} -%endif -%{python3_sitearch}/%{name}-%{version}.egg-info +%{python3_sitearch}/%{name}-%{version}.dist-info %{python3_sitearch}/%{name} -%if %{?rhel}%{!?rhel:0} == 7 -%files -n python%{?python3_other_pkgversion}-%{name} -%{python3_other_sitearch}/%{name}-%{version}.egg-info -%{python3_other_sitearch}/%{name} -%endif - %files doc %doc %{_pkgdocdir}/doxygen %doc %{_pkgdocdir}/examples %license COPYING %changelog +* 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 +- Unbundle yaml-cpp, using new configure option --with-yaml-cpp +- EPEL 7 EOL specfile cleanup + * Thu Jul 18 2024 Fedora Release Engineering - 6.5.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 2954e5d..8d49b49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (LHAPDF-6.5.4.tar.gz) = 0e39f7f298e8c72eece9c3d19f471f48b3ee045cd54ecd318e0b2d60ada4f01a2151e6b2b5f27fccdf10c1043352a673492f8792be1964df7eafbe931282a83b +SHA512 (LHAPDF-6.5.5.tar.gz) = 80012d5eab1b09a38d8e65bc45f012125508f8d43d1ffcaa76976970f1a3d36305ad29c620715c676cd3c5d6f8bb4c0b55444c952059a742052d9c8bfd5866ac From c2f0fca5bd50455a926ac5cec591a88a2c9a2661 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 10:24:07 +0000 Subject: [PATCH 20/31] 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 21/31] 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 22/31] 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 23/31] 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 24/31] 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 25/31] 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 26/31] 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 27/31] 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 28/31] 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 29/31] 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 30/31] 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 31/31] 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