diff --git a/.gitignore b/.gitignore index dbcd49a..55e346d 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ /tilt-2.0.9.gem /dacite-1.1.0.tar.gz /pcs-67591ed1487cb0aefa181fdfc166c8a66b55d25a.tar.gz +/dacite-1.5.0.python3.9.fix.tar.gz diff --git a/pcs.spec b/pcs.spec index 60a57fb..23d37e5 100644 --- a/pcs.spec +++ b/pcs.spec @@ -1,6 +1,6 @@ Name: pcs Version: 0.10.5 -Release: 5%{?dist} +Release: 6%{?dist} # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # GPLv2: pcs # ASL 2.0: tornado @@ -21,7 +21,7 @@ Summary: Pacemaker Configuration System %global pyagentx_version 0.4.pcs.2 %global tornado_version 6.0.3 -%global dacite_version 1.1.0 +%global dacite_version 1.5.0.python3.9.fix %global rubygem_tilt_version 2.0.9 # We do not use _libdir macro because upstream is not prepared for it. @@ -41,10 +41,6 @@ Summary: Pacemaker Configuration System # Use /usr/bin/python3 or /usr/bin/python2 # /usr/bin/python will be removed or switched to Python 3 in the future. %global __python %{__python3} -# This package depends on automagic byte compilation -# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 -%global _python_bytecompile_extra 1 - #part after last slash is recognized as filename in look-aside repository #desired name is achived by trick with hash anchor @@ -55,7 +51,9 @@ Source11: https://rubygems.org/downloads/tilt-%{rubygem_tilt_version}.gem Source41: https://github.com/ondrejmular/pyagentx/archive/v%{pyagentx_version}/pyagentx-%{pyagentx_version}.tar.gz Source42: https://github.com/tornadoweb/tornado/archive/v%{tornado_version}/tornado-%{tornado_version}.tar.gz -Source44: https://github.com/konradhalas/dacite/archive/v%{dacite_version}/dacite-%{dacite_version}.tar.gz +# Temporarily use patched version of dacite until it is fixed in upstream +# Source44: https://github.com/konradhalas/dacite/archive/v%%{dacite_version}/dacite-%%{dacite_version}.tar.gz +Source44: https://github.com/ondrejmular/dacite/archive/v%{dacite_version}/dacite-%{dacite_version}.tar.gz Source100: https://github.com/idevat/pcs-web-ui/archive/%{ui_commit}/%{ui_src_name}.tar.gz Source101: https://github.com/idevat/pcs-web-ui/releases/download/%{ui_commit}/pcs-web-ui-node-modules-%{ui_commit}.tar.xz @@ -438,6 +436,10 @@ remove_all_tests %license pyagentx_LICENSE.txt %changelog +* Fri Jul 03 2020 Ondrej Mular - 0.10.5-6 +- Use patched version of dacite compatible with Python 3.9 +- Resolves: rhbz#1838327 + * Tue May 26 2020 Miro HronĨok - 0.10.5-5 - Rebuilt for Python 3.9 diff --git a/sources b/sources index 6dfd18f..66a0cc3 100644 --- a/sources +++ b/sources @@ -4,5 +4,5 @@ SHA512 (tornado-6.0.3.tar.gz) = 8caaa64d14edcb3993dffea3175685d82afb0068a8e8834c SHA512 (pcs-web-ui-0.1.2.tar.gz) = 2fcb1c600cc644234036b47d7d277bb083945f3827c3f561d4301d901f2df579bf3f15da9f185ed3067951b76d17d102088d64aa921be2caa29d393d8342fb2a SHA512 (pcs-web-ui-node-modules-0.1.2.tar.xz) = 48bc9e60170e8aedf744c57d78813b5a2e241a104c9a309f551aeaaa808f1a2bd77c6bae46a5833e1502a0bf222774b2604dfd4f75b4ddc461e50f49bf73f468 SHA512 (tilt-2.0.9.gem) = 522b2b40ca1eefc7df66cb421c66734699a2ffb1e7d1797181c2718f7ca018d3376c1a2b3617b5d3549115af69108db4c3c4632e2682329d5baf24bfdae92b42 -SHA512 (dacite-1.1.0.tar.gz) = d7b1ce482584de3f4bc5c381cac054a7a7fd844e497b15e862f23b89b145d244bcf91eddb5a214e257822d362df19159ae379d71b1a7ff969790652905f7531f SHA512 (pcs-67591ed1487cb0aefa181fdfc166c8a66b55d25a.tar.gz) = ee2f38b3c13c338ad9b36e26f21d704ac278ed9efa466a4030279afadcbb7c755ae444d8967911ad24c99c1114bfe1d8538f9b74114850be63e20b20fa71195c +SHA512 (dacite-1.5.0.python3.9.fix.tar.gz) = 2d735b333a5a6038056f045390ae495f77156bcc9843b613b2c47980888bf15605799d313dfa4d270aef2404bac5af894580c7e0c712f502109b3ae34db2af75