diff --git a/gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg b/gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg
deleted file mode 100644
index 30cd72996164fbba16fd2ee7098b8d28633c03e8..0000000000000000000000000000000000000000
Binary files a/gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg and /dev/null differ
diff --git a/p11-kit-0.24.1.tar.xz.sig b/p11-kit-0.24.1.tar.xz.sig
deleted file mode 100644
index bfc093a7692f3e40039a2f4a8deab7160234168e..0000000000000000000000000000000000000000
Binary files a/p11-kit-0.24.1.tar.xz.sig and /dev/null differ
diff --git a/p11-kit.spec b/p11-kit.spec
index 7b1f70b5c6a21212ccd041f9fd427b42d8b63899..20df8177db9eacb20fc6dd1c8a87a80673d0ac45 100644
--- a/p11-kit.spec
+++ b/p11-kit.spec
@@ -1,53 +1,36 @@
-%define anolis_release 3
-
-%define alt_ckbi  libnssckbi.so
+%define anolis_release 4
+%define alt_ckbi libnssckbi.so
 
+Name:           p11-kit
 Version:	0.24.1
 Release: 	%{anolis_release}%{?dist}
-Name:           p11-kit
 Summary:        Library for loading and sharing PKCS#11 modules
 
 License:        BSD
-URL:            http://p11-glue.freedesktop.org/p11-kit.html
-Source0:        https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.xz
-Source1:        https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.xz.sig
-Source2:        gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg
-Source3:        trust-extract-compat
-Source4:        p11-kit-client.service
-
-BuildRequires:  gcc
-BuildRequires:  libtasn1-devel >= 2.3
-BuildRequires:  libffi-devel
-BuildRequires:  gettext
-BuildRequires:  gtk-doc
-BuildRequires:  meson
-BuildRequires:  systemd-devel
-BuildRequires:  bash-completion
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  gnupg2
+URL:            http://p11-glue.freedesktop.org/%{name}.html
+Source0:        https://github.com/p11-glue/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
+Source1:        trust-extract-compat
+Source2:        %{name}-client.service
+
+BuildRequires:  gcc meson
+BuildRequires:  libtasn1-devel >= 2.3 libffi-devel systemd systemd-devel
+BuildRequires:  gettext gtk-doc
+BuildRequires:  bash-completion pkgconfig(glib-2.0) gnupg2
 BuildRequires:  /usr/bin/xsltproc
 
 %description
-p11-kit provides a way to load and enumerate PKCS#11 modules, as well
-as a standard configuration setup for installing PKCS#11 modules in
-such a way that they're discoverable.
-
-%package doc
-Summary:        Documentation files for %{name}
-Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
-
-%description    doc
-The %{name}-doc package contains documentation files for %{name}.
+p11-kit aims to solve problems with coordinating the use of PKCS #11 by
+different components or libraries living in the same process, by providing a
+way to load and enumerate PKCS #11 modules, as well as a standard configuration
+setup for installing PKCS #11 modules in such a way that they're discoverable.
 
 %package devel
 Summary:        Development files for %{name}
 Requires:       %{name} = %{version}-%{release}
 
 %description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
-
+The %{name}-devel package contains libraries and header files for developing
+applications that use %{name}.
 
 %package trust
 Summary:            System trust module from %{name}
@@ -57,37 +40,44 @@ Requires(postun):   %{_sbindir}/update-alternatives
 Conflicts:          nss < 3.14.3-9
 
 %description trust
-The %{name}-trust package contains a system trust PKCS#11 module which
-contains certificate anchors and black lists.
-
+The %{name}-trust package contains a system trust PKCS#11 module which contains
+certificate anchors and black lists.
 
 %package server
 Summary:        Server and client commands for %{name}
 Requires:       %{name} = %{version}-%{release}
 
 %description server
-The %{name}-server package contains command line tools that enable to
-export PKCS#11 modules through a Unix domain socket.  Note that this
-feature is still experimental.
+The %{name}-server package contains command line tools that enable to export
+PKCS#11 modules through a Unix domain socket.  Note that this feature is still
+experimental.
 
-%prep
-gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
+%package doc
+Summary:        Documentation files for %{name}
+Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
-%autosetup -p1
+%description    doc
+The %{name}-doc package contains documentation files for %{name}.
+
+%prep
+%autosetup -p1 -n %{name}-%{version}
 
 %build
-%meson -Dgtk_doc=true -Dman=true -Dtrust_paths=%{_sysconfdir}/pki/ca-trust/source:%{_datadir}/pki/ca-trust-source
+%meson \
+  -Dtrust_paths=%{_sysconfdir}/pki/ca-trust/source:%{_datadir}/pki/ca-trust-source \
+  -Dgtk_doc=true \
+  -Dman=true
 %meson_build
 
 %install
 %meson_install
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pkcs11/modules
-install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_libexecdir}/p11-kit/
-# Install the example conf with %%doc instead
+install -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_libexecdir}/%{name}/
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
 mv $RPM_BUILD_ROOT%{_sysconfdir}/pkcs11/pkcs11.conf.example $RPM_BUILD_ROOT%{_docdir}/%{name}/pkcs11.conf.example
 mkdir -p $RPM_BUILD_ROOT%{_userunitdir}
-install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_userunitdir}
+install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_userunitdir}
 %find_lang %{name}
 
 %generate_compatibility_deps
@@ -95,69 +85,68 @@ install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_userunitdir}
 %check
 %meson_test
 
-
 %post trust
-%{_sbindir}/update-alternatives --install %{_libdir}/libnssckbi.so \
-        %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so 30
+%{_sbindir}/update-alternatives --install %{_libdir}/%{alt_ckbi} \
+        %{alt_ckbi} %{_libdir}/pkcs11/%{name}-trust.so 30
 
 %postun trust
 if [ $1 -eq 0 ] ; then
-        # package removal
-        %{_sbindir}/update-alternatives --remove %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so
+        %{_sbindir}/update-alternatives --remove %{alt_ckbi} %{_libdir}/pkcs11/%{name}-trust.so
 fi
 
 
 %files -f %{name}.lang
 %dir %{abidir}
-%{!?_licensedir:%global license %%doc}
 %license COPYING
 %{_docdir}/%{name}/pkcs11.conf.example
 %dir %{_sysconfdir}/pkcs11
 %dir %{_sysconfdir}/pkcs11/modules
-%dir %{_datadir}/p11-kit
-%dir %{_datadir}/p11-kit/modules
-%dir %{_libexecdir}/p11-kit
-%{_bindir}/p11-kit
-%{_libdir}/libp11-kit.so.*
-%{_libdir}/p11-kit-proxy.so
-%{_libexecdir}/p11-kit/p11-kit-remote
-%{_mandir}/man1/trust.1.gz
-%{_mandir}/man8/p11-kit.8.gz
-%{_mandir}/man5/pkcs11.conf.5.gz
-%{_datadir}/bash-completion/completions/p11-kit
-%{abidir}/p11-kit-option.list
-%{abidir}/libp11-kit*.dump
-
-%files doc
-%doc AUTHORS NEWS README
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/modules
+%dir %{_libexecdir}/%{name}
+%{_bindir}/%{name}
+%{_libdir}/lib%{name}.so.*
+%{_libdir}/%{name}-proxy.so
+%{_libexecdir}/%{name}/%{name}-remote
+%{_mandir}/man1/trust.1.zst
+%{_mandir}/man8/%{name}.8.zst
+%{_mandir}/man5/pkcs11.conf.5.zst
+%{_datadir}/bash-completion/completions/%{name}
+%{abidir}/%{name}-option.list
+%{abidir}/lib%{name}*.dump
 
 %files devel
-%{_includedir}/p11-kit-1/
-%{_libdir}/libp11-kit.so
-%{_libdir}/pkgconfig/p11-kit-1.pc
+%{_includedir}/%{name}-1/
+%{_libdir}/lib%{name}.so
+%{_libdir}/pkgconfig/%{name}-1.pc
 %doc %{_datadir}/gtk-doc/
 
 %files trust
 %{_bindir}/trust
 %dir %{_libdir}/pkcs11
-%ghost %{_libdir}/libnssckbi.so
-%{_libdir}/pkcs11/p11-kit-trust.so
-%{_datadir}/p11-kit/modules/p11-kit-trust.module
-%{_libexecdir}/p11-kit/trust-extract-compat
+%ghost %{_libdir}/%{alt_ckbi}
+%{_libdir}/pkcs11/%{name}-trust.so
+%{_datadir}/%{name}/modules/%{name}-trust.module
+%{_libexecdir}/%{name}/trust-extract-compat
 %{_datadir}/bash-completion/completions/trust
 %{abidir}/trust-option.list
-%{abidir}/p11-kit-trust*.dump
+%{abidir}/%{name}-trust*.dump
 
 %files server
-%{_libdir}/pkcs11/p11-kit-client.so
-%{abidir}/p11-kit-client*.dump
-%{_userunitdir}/p11-kit-client.service
-%{_libexecdir}/p11-kit/p11-kit-server
-%{_userunitdir}/p11-kit-server.service
-%{_userunitdir}/p11-kit-server.socket
+%{_libdir}/pkcs11/%{name}-client.so
+%{abidir}/%{name}-client*.dump
+%{_userunitdir}/%{name}-client.service
+%{_libexecdir}/%{name}/%{name}-server
+%{_userunitdir}/%{name}-server.service
+%{_userunitdir}/%{name}-server.socket
 
+%files doc
+%doc AUTHORS NEWS README
 
 %changelog
+* Mon Apr 10 2023 Shawn Wang <shawnwang@linux.alibaba.com> - 0.24.1-4
+- Optimize the spec file
+
 * Tue Oct 18 2022 mgb01105731 <mgb01105731@alibaba-inc.com> - 0.24.1-3
 - optimise spec file