diff --git a/python-joblib.spec b/python-joblib.spec
index 5dea231..5215c60 100644
--- a/python-joblib.spec
+++ b/python-joblib.spec
@@ -2,17 +2,17 @@
 
 %global srcname joblib
 
-Name:           python-%{srcname}
-Version:        1.1.0
-Release:        1%{?dist}
-Summary:        Lightweight pipelining: using Python functions as pipeline jobs
-
-License:        BSD
-URL:            https://joblib.readthedocs.io
-Source0:        %{pypi_source}
-Patch0:         joblib-unbundle-cloudpickle.patch
-Patch1:         joblib-fix-test310.patch
+Name:  python-%{srcname}
+Version: 1.1.0
+Release: 2%{?dist}
+Summary: Lightweight pipelining: using Python functions as pipeline jobs
+
+License: BSD
+URL: https://joblib.readthedocs.io
+Source0: %{pypi_source}
+
 BuildArch:      noarch
+BuildRequires:  python3-devel
 
 %global _description %{expand:
 Joblib is a set of tools to provide lightweight pipelining in Python.
@@ -25,57 +25,54 @@ In particular, joblib offers:
 %description %_description
 
 %package -n python3-%{srcname}
-Summary:       %{summary}
+Summary: %{summary}
 
-BuildRequires:  python3-devel
-BuildRequires:  %{py3_dist setuptools}
-BuildRequires:  %{py3_dist numpy}
-BuildRequires:  %{py3_dist lz4}
-BuildRequires:  %{py3_dist psutil} 
-BuildRequires:  python3-cloudpickle >= 1.6.0
 # Testing
 %if %{with check}
 BuildRequires:  %{py3_dist pytest}
+BuildRequires:  %{py3_dist numpy}
+BuildRequires:  %{py3_dist lz4}
+BuildRequires:  %{py3_dist psutil} 
 BuildRequires:  %{py3_dist threadpoolctl}
 %endif
 
-Requires: python3-cloudpickle >= 1.6.0
 Recommends: %{py3_dist numpy}
 Recommends: %{py3_dist lz4}
 Recommends: %{py3_dist psutil} 
 Provides: bundled(python3dist(loky)) = 2.9.0
-##Provides:       bundled(python3dist(cloudpickle)) = 1.6.0
+Provides: bundled(python3dist(cloudpickle)) = 1.6.0
 
 %description -n python3-%{srcname} %_description
 
 %prep
-%autosetup -n %{srcname}-%{version} -p1
+%autosetup -n %{srcname}-%{version}
+
+%generate_buildrequires
+%pyproject_buildrequires
 
 %build
-%py3_build
+%pyproject_wheel
 
 %install
-%py3_install
+%pyproject_install
+
+%pyproject_save_files joblib
 
 %if %{with check}
 %check
-export PYTHONDONTWRITEBYTECODE=1
-export PYTEST_ADDOPTS='-p no:cacheprovider'
-pushd %{buildroot}%{python3_sitelib}
-pytest -k "not test_parallel_call_cached_function_defined_in_jupyter" \
-   --deselect "test/test_memmapping.py::test_nested_loop_error_in_grandchild_resource_tracker_silent" \
-   --deselect "joblib/test/test_numpy_pickle.py::test_compress_mmap_mode_warning" \
-     joblib
-popd
+%pytest \
+ --deselect "joblib/test/test_memory.py::test_parallel_call_cached_function_defined_in_jupyter" \
+  joblib
+
 %endif
 
-%files -n python3-%{srcname}
+%files -n python3-%{srcname} -f %{pyproject_files}
 %doc README.rst
-%license LICENSE.txt
-%{python3_sitelib}/%{srcname}-*.egg-info
-%{python3_sitelib}/%{srcname}/
 
 %changelog
+* Sun Apr 24 2022 Sergio Pascual <sergiopr@fedoraproject.org> - 1.1.0-2
+- Rewrite with new guidelines
+
 * Sun Apr 24 2022 Sergio Pascual <sergiopr@fedoraproject.org> - 1.1.0-1
 - New upstream source (1.1.0)