From e4655915969e5cb5f0a42722f6150ce02bcdcfe3 Mon Sep 17 00:00:00 2001 From: Mihai Patrascoiu Date: Sep 05 2023 13:48:37 +0000 Subject: Merge branch 'main' into epel7 for upstream release v1.12.1 --- diff --git a/0000_CMake_FindPython3_11.patch b/0000_CMake_FindPython3_11.patch deleted file mode 100644 index 67fe1a6..0000000 --- a/0000_CMake_FindPython3_11.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/cmake/modules/FindPythonEasy.cmake b/cmake/modules/FindPythonEasy.cmake -index d85a81f..b64877c 100644 ---- a/cmake/modules/FindPythonEasy.cmake -+++ b/cmake/modules/FindPythonEasy.cmake -@@ -15,7 +15,7 @@ - LIST(APPEND L_PYTHON_VERSIONS - "1.5" "1.6" - "2.0" "2.1" "2.2" "2.4" "2.5" "2.6" "2.7" "2.8" -- "3" "3.0" "3.1" "3.2" "3.3" "3.4" "3.5" "3.6" "3.7" "3.8" "3.9" "3.10" -+ "3" "3.0" "3.1" "3.2" "3.3" "3.4" "3.5" "3.6" "3.7" "3.8" "3.9" "3.10" "3.11" - ) - - INCLUDE(FindPackageHandleStandardArgs) -@@ -28,6 +28,7 @@ INCLUDE(FindPackageHandleStandardArgs) - HINTS - ${ALT_PYTHON_LOCATION}/bin - PATHS -+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.11\\InstallPath] - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.10\\InstallPath] - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.9\\InstallPath] - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.8\\InstallPath] diff --git a/gfal2-python.spec b/gfal2-python.spec index 9706b54..f5ab524 100644 --- a/gfal2-python.spec +++ b/gfal2-python.spec @@ -24,32 +24,31 @@ # Python path discovery %if 0%{?with_python2} %if 0%{?rhel} == 7 -%{!?python_sitearch: %define python_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?python_sitearch: %define python_sitearch %(%{__python2} -c "from sysconfig import get_path; print get_path('platlib')")} %else -%{!?python2_sitearch: %define python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?python2_sitearch: %define python2_sitearch %(%{__python2} -c "from sysconfig import get_path; print get_path('platlib')")} %endif %endif %if 0%{?with_python3} -%{!?python3_sitearch: %define python3_sitearch %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%{!?python3_sitearch: %define python3_sitearch %(%{__python3} -c "from sysconfig import get_path; print(get_path('platlib'))")} %endif # Python modules filtering %global __provides_exclude_from ^((%{python2_sitearch})|(%{python3_sitearch})/.*\\.so)$ Name: gfal2-python -Version: 1.12.0 +Version: 1.12.1 Release: 1%{?dist} Summary: Python bindings for gfal 2 License: ASL 2.0 URL: http://dmc.web.cern.ch/ -# git clone --branch master https://gitlab.cern.ch/dmc/gfal2-bindings.git gfal2-python-1.12.0 -# pushd gfal2-python-1.12.0 -# git checkout v1.12.0 +# git clone --branch master https://gitlab.cern.ch/dmc/gfal2-bindings.git gfal2-python-1.12.1 +# pushd gfal2-python-1.12.1 +# git checkout v1.12.1 # popd -# tar czf gfal2-python-1.12.0.tar.gz --exclude-vcs gfal2-python-1.12.0 +# tar czf gfal2-python-1.12.1.tar.gz --exclude-vcs gfal2-python-1.12.1 Source0: %{name}-%{version}.tar.gz -Patch0: 0000_CMake_FindPython3_11.patch BuildRequires: gcc-c++ BuildRequires: cmake3 @@ -58,6 +57,7 @@ BuildRequires: boost-devel # Python 2 %if 0%{?with_python2} BuildRequires: python2-devel +BuildRequires: python2-setuptools %endif # Epydoc %if 0%{?with_docs} @@ -65,13 +65,9 @@ BuildRequires: epydoc %endif # Python 3 %if 0%{?with_python3} -%if 0%{?rhel} == 7 BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: boost-python%{python3_pkgversion}-devel -%else -BuildRequires: python3-devel -BuildRequires: boost-python3-devel -%endif %endif %global _description \ @@ -125,7 +121,6 @@ Documentation files for %{name}. %prep %setup -q -%patch0 -p1 %build # Make sure the version in the spec file and the version used @@ -182,6 +177,22 @@ fi %endif %changelog +* Tue Sep 05 2023 Mihai Patrascoiu - 1.12.1-1 +- Upgrade to upstream release 1.12.1 +- Closes bugzilla#2154855, bugzilla#2220000, bugzilla#2225821 + +* Wed Jul 19 2023 Fedora Release Engineering - 1.12.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 1.12.0-4 +- Rebuilt for Python 3.12 + +* Mon Feb 20 2023 Jonathan Wakely - 1.12.0-3 +- Rebuilt for Boost 1.81 + +* Thu Jan 19 2023 Fedora Release Engineering - 1.12.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Aug 15 2022 Mihai Patrascoiu - 1.12.0-1 - Upgrade to upstream release 1.12.0 diff --git a/sources b/sources index a8aacc2..44aab1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gfal2-python-1.12.0.tar.gz) = 8799d3ed3133e423c10b61513f8a8e713f3a15b706f2a1799d92f0fd337cd5bff85d5b5eddce5c3b6ccc1937f9e4217c2e9eda674810a2b33780162c30aa6c5d +SHA512 (gfal2-python-1.12.1.tar.gz) = 56b6674f5ecb81bb6d806013449854f6c9d064ad00fe967681cbe6566d6aa27737e4f019c93fa942efe5d4815494ce1f052782d59ca8611eb09ba31356ec4163