diff --git a/grpc.spec b/grpc.spec
index da5cd76d786996287153185a5f8cb4ab1a1ead08..924b54aec61e979c8e04c80a5d6a6faf9c52990b 100644
--- a/grpc.spec
+++ b/grpc.spec
@@ -4,9 +4,9 @@
 
 Name:          grpc
 Version:       1.60.0
-Release:       5
+Release:       6
 Summary:       A modern, open source high performance RPC framework that can run in any environment
-License:       ASL 2.0
+License:       Apache-2.0
 URL:           https://www.grpc.io
 Source0:       https://github.com/grpc/grpc/archive/v%{version}/%{name}-%{version}.tar.gz
 
@@ -37,6 +37,7 @@ Summary:       gRPC library development files
 Requires:      %{name} = %{version}-%{release}
 Requires:      pkgconfig(re2)
 Requires:      abseil-cpp-devel
+Requires:      %{name}-plugins = %{version}-%{release}
 
 %description   devel
 Development headers and files for gRPC libraries.
@@ -53,7 +54,7 @@ Plugins to the protocol buffers compiler to generate gRPC sources.
 %package -n python3-grpcio
 Summary:       Python3 language bindings for gRPC
 Requires:      %{name} = %{version}-%{release}
-%{?python_provide:%python_provide python3-%{pypi_name}}
+%{?python_provide:%python_provide python3-grpcio}
 
 %description -n python3-grpcio
 Python3 bindings for gRPC.
@@ -73,9 +74,7 @@ sed -r -i 's/(std=c\+\+)14/\1%{cpp_std}/g' \
     tools/distrib/python/grpcio_tools/setup.py
 
 %build
-mkdir -p cmake/build
-cd cmake/build
-cmake ../../ -DgRPC_INSTALL=ON\
+%cmake -DgRPC_INSTALL=ON\
              -DCMAKE_CXX_STANDARD:STRING=%{cpp_std} \
              -DgRPC_CARES_PROVIDER=package \
              -DgRPC_PROTOBUF_PROVIDER=package \
@@ -83,18 +82,18 @@ cmake ../../ -DgRPC_INSTALL=ON\
              -DgRPC_ZLIB_PROVIDER=package     \
              -DgRPC_RE2_PROVIDER=package      \
              -DgRPC_ABSL_PROVIDER=package     \
-             -DgRPC_INSTALL_LIBDIR=%{buildroot}%{_libdir} \
-             -DgRPC_INSTALL_BINDIR=%{buildroot}%{_bindir} \
-             -DgRPC_INSTALL_INCLUDEDIR=%{buildroot}%{_includedir} \
-             -DgRPC_INSTALL_CMAKEDIR=%{buildroot}%{_prefix}/lib/cmake/%{name} \
-             -DgRPC_INSTALL_SHAREDIR=%{buildroot}%{_datadir}/%{name} \
-             -DgRPC_INSTALL_PKGCONFIGDIR=%{buildroot}%{_libdir}/pkgconfig \
+             -DgRPC_INSTALL_LIBDIR=%{_libdir} \
+             -DgRPC_INSTALL_BINDIR=%{_bindir} \
+             -DgRPC_INSTALL_INCLUDEDIR=%{_includedir} \
+             -DgRPC_INSTALL_CMAKEDIR=%{_libdir}/cmake/%{name} \
+             -DgRPC_INSTALL_SHAREDIR=%{_datadir}/%{name} \
+             -DgRPC_INSTALL_PKGCONFIGDIR=%{_libdir}/pkgconfig \
              -DCMAKE_INSTALL_PREFIX=%{_prefix} \
              -DBUILD_SHARED_LIBS=ON \
              -DCMAKE_VERBOSE_MAKEFILE=ON \
              -DCMAKE_EXE_LINKER_FLAGS=-Wl,--as-needed \
              -DCMAKE_SHARED_LINKER_FLAGS=-Wl,--as-needed
-make -j24 V=1
+%cmake_build
 
 # build python module
 export GRPC_PYTHON_BUILD_WITH_CYTHON=True
@@ -104,20 +103,14 @@ export GRPC_PYTHON_BUILD_SYSTEM_CARES=True
 export GRPC_PYTHON_BUILD_SYSTEM_RE2=True
 export GRPC_PYTHON_BUILD_SYSTEM_ABSL=True
 export CFLAGS="%optflags"
-cd ../..
 %py3_build
 
 %install
-cd cmake/build
-make install/local
-rm -rf %{buildroot}%{_prefix}/lib
+%cmake_install
 
 %delete_la_and_a
-cd ../..
 %py3_install
 
-%ldconfig_scriptlets
-
 %files
 %defattr(-,root,root)
 %doc README.md
@@ -146,19 +139,23 @@ cd ../..
 %{_bindir}/grpc_*_plugin
 
 %files devel
-%defattr(-,root,root)
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/grpc
 %{_includedir}/grpc++
 %{_includedir}/grpcpp
+%{_libdir}/cmake/grpc
 
 %files -n python3-grpcio
-%defattr(-,root,root)
 %{python3_sitearch}/grpc
 %{python3_sitearch}/grpcio-%{version}-py*
 
 %changelog
+* Fri Dec 20 2024 Funda Wang <fundawang@yeah.net> - 1.60.0-6
+- adopt to new cmake macro
+- add requires on plugin package to devel package, as
+  gRPCPluginTargets.cmake referes /usr/bin/grpc_cpp_plugin
+
 * Tue Dec 03 2024 xinghe <xinghe2@h-partners.com> - 1.60.0-5
 - Type:CVE
 - CVE:CVE-2024-11407