diff --git a/nss.spec b/nss.spec
index 319e3549492fb0b5c67a36e6703cebc9c23dd1f7..c8cd73e8c56bd89eea2ebfe34e5ab35bf1c1ebf8 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,4 +1,4 @@
-%define anolis_release 1
+%define anolis_release 2
 %global nspr_version 4.35
 %global nss_version 3.89
 %global baserelease 1
@@ -17,10 +17,10 @@
     %{?__debug_package:%{__debug_install_post}} \
     %{__arch_install_post} \
     %{__os_install_post} \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libsoftokn3.so \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libfreeblpriv3.so \
-    $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.so \
-    %{?with_dbm:$RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libnssdbm3.so} \
+    %{buildroot}/%{unsupported_tools_directory}/shlibsign -i %{buildroot}/%{_libdir}/libsoftokn3.so \
+    %{buildroot}/%{unsupported_tools_directory}/shlibsign -i %{buildroot}/%{_libdir}/libfreeblpriv3.so \
+    %{buildroot}/%{unsupported_tools_directory}/shlibsign -i %{buildroot}/%{_libdir}/libfreebl3.so \
+    %{?with_dbm:%{buildroot}/%{unsupported_tools_directory}/shlibsign -i %{buildroot}/%{_libdir}/libnssdbm3.so} \
 %{nil}
 
 %{lua:
@@ -38,66 +38,52 @@ rpm.define(string.format("nss_release_tag NSS_%s_RTM",
            string.gsub(rpm.expand("%nss_archive_version"), "%.", "_")))
 }
 
-Summary:          Network Security Services
 Name:             nss
 Version:          %{nss_version} 
 Release:          %{anolis_release}%{?dist} 
+Summary:          Network Security Services
 License:          MPLv2.0
-URL:              https://firefox-source-docs.mozilla.org/security/nss/index.html
-Requires:         nspr >= %{nspr_version}
-Requires:         nss-util >= %{nss_version}
-Requires:         nss-softokn >= %{nss_version}
-Requires:         nss-system-init
-Requires:         p11-kit-trust
-Requires:         /usr/bin/update-crypto-policies
-Requires:         crypto-policies >= %{crypto_policies_version}
-BuildRequires:    make
-BuildRequires:    nss-softokn
-BuildRequires:    sqlite-devel
-BuildRequires:    zlib-devel
-BuildRequires:    pkgconfig
-BuildRequires:    gawk
-BuildRequires:    psmisc
-BuildRequires:    perl-interpreter
-BuildRequires:    gcc-c++
-BuildRequires:    nspr-devel >= %{nss_version} 
-
-Source0:          https://ftp.mozilla.org/pub/security/nss/releases/%{nss_release_tag}/src/%{name}-%{nss_version}.tar.gz
-Source1:          nss-util.pc.in
-Source2:          nss-util-config.in
-Source3:          nss-softokn.pc.in
-Source4:          nss-softokn-config.in
-Source6:          nss-softokn-dracut-module-setup.sh
-Source7:          nss-softokn-dracut.conf
-Source8:          nss.pc.in
-Source9:          nss-config.in
+URL:              https://firefox-source-docs.mozilla.org/security/%{name}/index.html
+
+Source0:          https://ftp.mozilla.org/pub/security/%{name}/releases/%{nss_release_tag}/src/%{name}-%{nss_version}.tar.gz
+Source1:          %{name}-util.pc.in
+Source2:          %{name}-util-config.in
+Source3:          %{name}-softokn.pc.in
+Source4:          %{name}-softokn-config.in
+Source6:          %{name}-softokn-dracut-module-setup.sh
+Source7:          %{name}-softokn-dracut.conf
+Source8:          %{name}.pc.in
+Source9:          %{name}-config.in
 %if %{with dbm}
 Source10:         blank-cert8.db
 Source11:         blank-key3.db
 Source12:         blank-secmod.db
+Source23:         cert8.db.xml
+Source25:         key3.db.xml
+Source27:         secmod.db.xml
 %endif
 Source13:         blank-cert9.db
 Source14:         blank-key4.db
 Source15:         system-pkcs11.txt
 Source16:         setup-nsssysinit.sh
-Source20:         nss-config.xml
+Source20:         %{name}-config.xml
 Source21:         setup-nsssysinit.xml
 Source22:         pkcs11.txt.xml
 Source24:         cert9.db.xml
 Source26:         key4.db.xml
-%if %{with dbm}
-Source23:         cert8.db.xml
-Source25:         key3.db.xml
-Source27:         secmod.db.xml
-%endif
-Source28:         nss-p11-kit.config
+Source28:         %{name}-p11-kit.config
 
-Patch4:           iquote.patch
-Patch12:          nss-signtool-format.patch
-Patch40:          nss-no-dbm-man-page.patch
+Requires:         nspr >= %{nspr_version}
+Requires:         %{name}-util >= %{nss_version} %{name}-softokn >= %{nss_version}
+Requires:         %{name}-system-init p11-kit-trust /usr/bin/update-crypto-policies
+Requires:         crypto-policies >= %{crypto_policies_version}
+BuildRequires:    make pkgconfig gawk psmisc perl-interpreter gcc-c++
+BuildRequires:    %{name}-softokn sqlite-devel zlib-devel nspr-devel >= %{nss_version} 
 
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1774659
-Patch51:	nss-3.79-dbtool.patch
+Patch4: iquote.patch
+Patch12: %{name}-signtool-format.patch
+Patch40: %{name}-no-dbm-man-page.patch
+Patch57: %{name}-3.79-dbtool.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -106,78 +92,34 @@ server applications. Applications built with NSS can support SSL v2
 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509
 v3 certificates, and other security standards.
 
-%package tools
-Summary:          Tools for the Network Security Services
-Requires:         %{name} = %{version}-%{release}
-
-%description tools
-Network Security Services (NSS) is a set of libraries designed to
-support cross-platform development of security-enabled client and
-server applications. Applications built with NSS can support SSL v2
-and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509
-v3 certificates, and other security standards.
-
-Install the nss-tools package if you need command-line tools to
-manipulate the NSS certificate and key database.
-
-%package sysinit
-Summary:          System NSS Initialization
-Provides:         nss-system-init
-Requires:         nss = %{version}-%{release}
-Requires(post):   coreutils, sed
-
-%description sysinit
-Default Operating System module that manages applications loading
-NSS globally on the system. This module loads the system defined
-PKCS #11 modules for NSS and chains with other NSS modules to load
-any system or user configured modules.
-
 %package devel
 Summary:          Development libraries for Network Security Services
-Provides:         nss-static = %{version}-%{release}
-Requires:         nss = %{version}-%{release}
-Requires:         nss-util-devel
-Requires:         nss-softokn-devel
+Provides:         %{name}-static = %{version}-%{release}
+Requires:         %{name} = %{version}-%{release}
+Requires:         %{name}-util-devel
+Requires:         %{name}-softokn-devel
 Requires:         nspr-devel >= %{nspr_version}
 BuildRequires:    xmlto
 
 %description devel
-Header and Library files for doing development with Network Security Services.
-
+The %{name}-devel provides Header and Library files for doing development
+with Network Security Services.
 
 %package pkcs11-devel
 Summary:          Development libraries for PKCS #11 (Cryptoki) using NSS
-Provides:         nss-pkcs11-devel-static = %{version}-%{release}
-Requires:         nss-devel = %{version}-%{release}
-Requires:         nss-softokn-freebl-devel = %{version}-%{release}
+Provides:         %{name}-pkcs11-devel-static = %{version}-%{release}
+Requires:         %{name}-devel = %{version}-%{release}
+Requires:         %{name}-softokn-freebl-devel = %{version}-%{release}
 
 %description pkcs11-devel
-Library files for developing PKCS #11 modules using basic NSS
-low level services.
-
-
-%package util
-Summary:          Network Security Services Utilities Library
-Requires:         nspr >= %{nspr_version}
-
-%description util
-Utilities for Network Security Services and the Softoken module
-
-%package util-devel
-Summary:          Development libraries for Network Security Services Utilities
-Requires:         nss-util = %{version}-%{release}
-Requires:         nspr-devel >= %{nspr_version}
-Requires:         pkgconfig
-
-%description util-devel
-Header and library files for doing development with Network Security Services.
-
+The %{name}-pkcs11-devel provides Library files for developing PKCS #11
+modules using basic NSS low level services.
 
 %package softokn
 Summary:          Network Security Services Softoken Module
 Requires:         nspr >= %{nspr_version}
-Requires:         nss-util >= %{version}-%{release}
-Requires:         nss-softokn-freebl >= %{version}-%{release}
+Requires:         %{name}-util >= %{version}-%{release}
+Requires:         %{name}-softokn-freebl >= %{version}-%{release}
 
 %description softokn
 Network Security Services Softoken Cryptographic Module
@@ -185,19 +127,19 @@ Network Security Services Softoken Cryptographic Module
 %package softokn-freebl
 Summary:          Freebl library for the Network Security Services
 Requires:         nspr >= 4.12
-Requires:         nss-util >= 3.33
-Conflicts:        nss < 3.12.2.99.3-5
+Requires:         %{name}-util >= 3.33
+Conflicts:        %{name} < 3.12.2.99.3-5
 Conflicts:        filesystem < 3
 
 %description softokn-freebl
 NSS Softoken Cryptographic Module Freebl Library
 
-Install the nss-softokn-freebl package if you need the freebl library.
+Install the %{name}-softokn-freebl package if you need the freebl library.
 
 %package softokn-freebl-devel
 Summary:          Header and Library files for doing development with the Freebl library for NSS
-Provides:         nss-softokn-freebl-static = %{version}-%{release}
-Requires:         nss-softokn-freebl = %{version}-%{release}
+Provides:         %{name}-softokn-freebl-static = %{version}-%{release}
+Requires:         %{name}-softokn-freebl = %{version}-%{release}
 
 %description softokn-freebl-devel
 NSS Softoken Cryptographic Module Freebl Library Development Tools
@@ -208,13 +150,53 @@ Developers should rely only on the officially supported NSS public API.
 
 %package softokn-devel
 Summary:          Development libraries for Network Security Services
-Requires:         nss-softokn = %{version}-%{release}
-Requires:         nss-softokn-freebl-devel = %{version}-%{release}
+Requires:         %{name}-softokn = %{version}-%{release}
+Requires:         %{name}-softokn-freebl-devel = %{version}-%{release}
 Requires:         nspr-devel >= %{nspr_version}
-Requires:         nss-util-devel >= %{version}-%{release}
+Requires:         %{name}-util-devel >= %{version}-%{release}
 
 %description softokn-devel
-Header and library files for doing development with Network Security Services.
+The %{name}-softokn-devel provides header and library files for doing
+development with Network Security Services.
+
+%package sysinit
+Summary:          System NSS Initialization
+Provides:         %{name}-system-init
+Requires:         %{name} = %{version}-%{release}
+Requires(post):   coreutils, sed
+
+%description sysinit
+Default Operating System module that manages applications loading
+NSS globally on the system. This module loads the system defined
+PKCS #11 modules for NSS and chains with other NSS modules to load
+any system or user configured modules.
+
+%package tools
+Summary:          Tools for the Network Security Services
+Requires:         %{name} = %{version}-%{release}
+
+%description tools
+The %{name}-tools provides tools for the Network Security Services.
+Install the %{name}-tools package if you need command-line tools to
+manipulate the NSS certificate and key database.
+
+%package util
+Summary:          Network Security Services Utilities Library
+Requires:         nspr >= %{nspr_version}
+
+%description util
+The %{name}-util provides Utilities for Network Security Services and
+the Softoken module
+
+%package util-devel
+Summary:          Development libraries for Network Security Services Utilities
+Requires:         %{name}-util = %{version}-%{release}
+Requires:         nspr-devel >= %{nspr_version}
+Requires:         pkgconfig
+
+%description util-devel
+The %{name}-util-devel provides Header and library files for doing development
+with Network Security Services.
 
 %package doc
 Summary:        Documentation files for %{name}
@@ -225,30 +207,29 @@ BuildArch:      noarch
 The %{name}-doc package contains documentation files for %{name}.
 
 %prep
-
 %setup -q -T -b 0 -n %{name}-%{nss_version}
-pushd nss
+pushd %{name}
 %autopatch -p1 -M 99
 popd
-find nss/lib/libpkix -perm /u+x -type f -exec chmod -x {} \;
+find %{name}/lib/libpkix -perm /u+x -type f -exec chmod -x {} \;
 
 
 %build
-export IN_TREE_FREEBL_HEADERS_FIRST=1
-export NSS_FORCE_FIPS=1
 export BUILD_OPT=1
-export XCFLAGS=$RPM_OPT_FLAGS
-export XCFLAGS="$XCFLAGS -Wno-array-parameter"
-export LDFLAGS=$RPM_LD_FLAGS
 export DSO_LDOPTS=$RPM_LD_FLAGS
-export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+export IN_TREE_FREEBL_HEADERS_FIRST=1
+export LDFLAGS=$RPM_LD_FLAGS
+export NSS_FORCE_FIPS=1
 export NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed 's/-I//'`
 export NSPR_LIB_DIR=%{_libdir}
 export NSS_USE_SYSTEM_SQLITE=1
 export NSS_ALLOW_SSLKEYLOGFILE=1
 export NSS_SEED_ONLY_DEV_URANDOM=1
 export NSS_DISABLE_GTESTS=1
+export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+export XCFLAGS=$RPM_OPT_FLAGS
+export XCFLAGS="$XCFLAGS -Wno-array-parameter"
 
 %if %{with dbm}
 %else
@@ -261,18 +242,18 @@ export USE_64=1
 %endif
 %endif
 
-export POLICY_FILE="nss.config"
+export POLICY_FILE="%{name}.config"
 export POLICY_PATH="/etc/crypto-policies/back-ends"
 
-%{__make} -C ./nss all
-%{__make} -C ./nss latest
+%{__make} -C ./%{name} all
+%{__make} -C ./%{name} latest
 
-pushd ./nss
+pushd ./%{name}
 %{__make} clean_docs build_docs
 popd
 
 mkdir -p ./dist/docs/nroff
-cp ./nss/doc/nroff/* ./dist/docs/nroff
+cp ./%{name}/doc/nroff/* ./dist/docs/nroff
 
 mkdir -p ./dist/pkgconfig
 
@@ -282,11 +263,11 @@ cat %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
                           -e "s,%%includedir%%,%{_includedir}/nss3,g" \
                           -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
                           -e "s,%%NSSUTIL_VERSION%%,%{nss_version},g" > \
-                          ./dist/pkgconfig/nss-util.pc
+                          ./dist/pkgconfig/%{name}-util.pc
 
-NSSUTIL_VMAJOR=`cat nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMAJOR" | awk '{print $3}'`
-NSSUTIL_VMINOR=`cat nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMINOR" | awk '{print $3}'`
-NSSUTIL_VPATCH=`cat nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VPATCH" | awk '{print $3}'`
+NSSUTIL_VMAJOR=`cat %{name}/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMAJOR" | awk '{print $3}'`
+NSSUTIL_VMINOR=`cat %{name}/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMINOR" | awk '{print $3}'`
+NSSUTIL_VPATCH=`cat %{name}/lib/util/nssutil.h | grep "#define.*NSSUTIL_VPATCH" | awk '{print $3}'`
 
 cat %{SOURCE2} | sed -e "s,@libdir@,%{_libdir},g" \
                           -e "s,@prefix@,%{_prefix},g" \
@@ -295,9 +276,9 @@ cat %{SOURCE2} | sed -e "s,@libdir@,%{_libdir},g" \
                           -e "s,@MOD_MAJOR_VERSION@,$NSSUTIL_VMAJOR,g" \
                           -e "s,@MOD_MINOR_VERSION@,$NSSUTIL_VMINOR,g" \
                           -e "s,@MOD_PATCH_VERSION@,$NSSUTIL_VPATCH,g" \
-                          > ./dist/pkgconfig/nss-util-config
+                          > ./dist/pkgconfig/%{name}-util-config
 
-chmod 755 ./dist/pkgconfig/nss-util-config
+chmod 755 ./dist/pkgconfig/%{name}-util-config
 
 cat %{SOURCE3} | sed -e "s,%%libdir%%,%{_libdir},g" \
                           -e "s,%%prefix%%,%{_prefix},g" \
@@ -306,11 +287,11 @@ cat %{SOURCE3} | sed -e "s,%%libdir%%,%{_libdir},g" \
                           -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
                           -e "s,%%NSSUTIL_VERSION%%,%{nss_version},g" \
                           -e "s,%%SOFTOKEN_VERSION%%,%{nss_version},g" > \
-                          ./dist/pkgconfig/nss-softokn.pc
+                          ./dist/pkgconfig/%{name}-softokn.pc
 
-SOFTOKEN_VMAJOR=`cat nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMAJOR" | awk '{print $3}'`
-SOFTOKEN_VMINOR=`cat nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMINOR" | awk '{print $3}'`
-SOFTOKEN_VPATCH=`cat nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VPATCH" | awk '{print $3}'`
+SOFTOKEN_VMAJOR=`cat %{name}/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMAJOR" | awk '{print $3}'`
+SOFTOKEN_VMINOR=`cat %{name}/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMINOR" | awk '{print $3}'`
+SOFTOKEN_VPATCH=`cat %{name}/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VPATCH" | awk '{print $3}'`
 
 cat %{SOURCE4} | sed -e "s,@libdir@,%{_libdir},g" \
                           -e "s,@prefix@,%{_prefix},g" \
@@ -319,9 +300,9 @@ cat %{SOURCE4} | sed -e "s,@libdir@,%{_libdir},g" \
                           -e "s,@MOD_MAJOR_VERSION@,$SOFTOKEN_VMAJOR,g" \
                           -e "s,@MOD_MINOR_VERSION@,$SOFTOKEN_VMINOR,g" \
                           -e "s,@MOD_PATCH_VERSION@,$SOFTOKEN_VPATCH,g" \
-                          > ./dist/pkgconfig/nss-softokn-config
+                          > ./dist/pkgconfig/%{name}-softokn-config
 
-chmod 755 ./dist/pkgconfig/nss-softokn-config
+chmod 755 ./dist/pkgconfig/%{name}-softokn-config
 
 cat %{SOURCE8} | sed -e "s,%%libdir%%,%{_libdir},g" \
                           -e "s,%%prefix%%,%{_prefix},g" \
@@ -331,11 +312,11 @@ cat %{SOURCE8} | sed -e "s,%%libdir%%,%{_libdir},g" \
                           -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
                           -e "s,%%NSSUTIL_VERSION%%,%{nss_version},g" \
                           -e "s,%%SOFTOKEN_VERSION%%,%{nss_version},g" > \
-                          ./dist/pkgconfig/nss.pc
+                          ./dist/pkgconfig/%{name}.pc
 
-NSS_VMAJOR=`cat nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'`
-NSS_VMINOR=`cat nss/lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'`
-NSS_VPATCH=`cat nss/lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'`
+NSS_VMAJOR=`cat %{name}/lib/%{name}/%{name}.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'`
+NSS_VMINOR=`cat %{name}/lib/%{name}/%{name}.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'`
+NSS_VPATCH=`cat %{name}/lib/%{name}/%{name}.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'`
 
 cat %{SOURCE9} | sed -e "s,@libdir@,%{_libdir},g" \
                           -e "s,@prefix@,%{_prefix},g" \
@@ -344,14 +325,14 @@ cat %{SOURCE9} | sed -e "s,@libdir@,%{_libdir},g" \
                           -e "s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \
                           -e "s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g" \
                           -e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \
-                          > ./dist/pkgconfig/nss-config
+                          > ./dist/pkgconfig/%{name}-config
 
-chmod 755 ./dist/pkgconfig/nss-config
+chmod 755 ./dist/pkgconfig/%{name}-config
 
 cat %{SOURCE16} > ./dist/pkgconfig/setup-nsssysinit.sh
 chmod 755 ./dist/pkgconfig/setup-nsssysinit.sh
 
-cp ./nss/lib/ckfw/nssck.api ./dist/private/nss/
+cp ./%{name}/lib/ckfw/nssck.api ./dist/private/%{name}/
 
 date +"%e %B %Y" | tr -d '\n' > date.xml
 echo -n %{nss_version} > version.xml
@@ -366,18 +347,18 @@ echo -n %{nss_version} > version.xml
 for m in %{SOURCE20} %{SOURCE21} %{XMLSOURCES}; do
   cp ${m} .
 done
-%global configFiles nss-config setup-nsssysinit
+%global configFiles %{name}-config setup-nsssysinit
 for m in %{configFiles}  %{dbfiles}; do
   xmlto man ${m}.xml
 done
 
-
 %check
 %if %{with tests}
 
-export FREEBL_NO_DEPEND=1
 export BUILD_OPT=1
+export FREEBL_NO_DEPEND=1
 export NSS_DISABLE_PPC_GHASH=1
+export NSS_IGNORE_SYSTEM_POLICY=1
 
 %ifnarch noarch
 %if 0%{__isa_bits} == 64
@@ -385,9 +366,7 @@ export USE_64=1
 %endif
 %endif
 
-export NSS_IGNORE_SYSTEM_POLICY=1
-
-SPACEISBAD=`find ./nss/tests | grep -c ' '` ||:
+SPACEISBAD=`find ./%{name}/tests | grep -c ' '` ||:
 if [ $SPACEISBAD -ne 0 ]; then
   echo "error: filenames containing space are not supported (xargs)"
   exit 1
@@ -398,7 +377,7 @@ DISTBINDIR=`ls -d ./dist/*.OBJ/bin`; echo $DISTBINDIR ||:
 pushd "$DISTBINDIR"
 ln -s selfserv $RANDSERV
 popd
-find ./nss/tests -type f |\
+find ./%{name}/tests -type f |\
   grep -v "\.db$" |grep -v "\.crl$" | grep -v "\.crt$" |\
   grep -vw CVS  |xargs grep -lw selfserv |\
   xargs -l perl -pi -e "s/\bselfserv\b/$RANDSERV/g" ||:
@@ -417,101 +396,101 @@ killall $RANDSERV || :
 
 %install
 
-mkdir -p $RPM_BUILD_ROOT/%{_includedir}/nss3
-mkdir -p $RPM_BUILD_ROOT/%{_includedir}/nss3/templates
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}
-mkdir -p $RPM_BUILD_ROOT/%{unsupported_tools_directory}
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
-mkdir -p $RPM_BUILD_ROOT/%{saved_files_dir}
-mkdir -p $RPM_BUILD_ROOT/%{dracut_modules_dir}
-mkdir -p $RPM_BUILD_ROOT/%{dracut_conf_dir}
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/crypto-policies/local.d
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/nss-tools
+mkdir -p %{buildroot}/%{_includedir}/nss3
+mkdir -p %{buildroot}/%{_includedir}/nss3/templates
+mkdir -p %{buildroot}/%{_bindir}
+mkdir -p %{buildroot}/%{_libdir}
+mkdir -p %{buildroot}/%{unsupported_tools_directory}
+mkdir -p %{buildroot}/%{_libdir}/pkgconfig
+mkdir -p %{buildroot}/%{saved_files_dir}
+mkdir -p %{buildroot}/%{dracut_modules_dir}
+mkdir -p %{buildroot}/%{dracut_conf_dir}
+mkdir -p %{buildroot}/%{_sysconfdir}/crypto-policies/local.d
+mkdir -p %{buildroot}%{_datadir}/doc/%{name}-tools
 
-install -m 755 %{SOURCE6} $RPM_BUILD_ROOT/%{dracut_modules_dir}/module-setup.sh
-install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/%{dracut_conf_dir}/50-nss-softokn.conf
+install -m 755 %{SOURCE6} %{buildroot}/%{dracut_modules_dir}/module-setup.sh
+install -m 644 %{SOURCE7} %{buildroot}/%{dracut_conf_dir}/50-%{name}-softokn.conf
 
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
+mkdir -p %{buildroot}%{_mandir}/man1
+mkdir -p %{buildroot}%{_mandir}/man5
 
 for file in libnssutil3.so libsoftokn3.so %{?with_dbm:libnssdbm3.so} libfreebl3.so libfreeblpriv3.so libnss3.so libnsssysinit.so libsmime3.so libssl3.so
 do
-  install -p -m 755 dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
+  install -p -m 755 dist/*.OBJ/lib/$file %{buildroot}/%{_libdir}
 done
 
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb
+mkdir -p %{buildroot}/%{_sysconfdir}/pki/nssdb
 %if %{with dbm}
-install -p -m 644 %{SOURCE10} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/cert8.db
-install -p -m 644 %{SOURCE11} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/key3.db
-install -p -m 644 %{SOURCE12} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/secmod.db
+install -p -m 644 %{SOURCE10} %{buildroot}/%{_sysconfdir}/pki/nssdb/cert8.db
+install -p -m 644 %{SOURCE11} %{buildroot}/%{_sysconfdir}/pki/nssdb/key3.db
+install -p -m 644 %{SOURCE12} %{buildroot}/%{_sysconfdir}/pki/nssdb/secmod.db
 %endif
-install -p -m 644 %{SOURCE13} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/cert9.db
-install -p -m 644 %{SOURCE14} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/key4.db
-install -p -m 644 %{SOURCE15} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/pkcs11.txt
+install -p -m 644 %{SOURCE13} %{buildroot}/%{_sysconfdir}/pki/nssdb/cert9.db
+install -p -m 644 %{SOURCE14} %{buildroot}/%{_sysconfdir}/pki/nssdb/key4.db
+install -p -m 644 %{SOURCE15} %{buildroot}/%{_sysconfdir}/pki/nssdb/pkcs11.txt
 
 for file in libcrmf.a libnssb.a libnssckfw.a
 do
-  install -p -m 644 dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
+  install -p -m 644 dist/*.OBJ/lib/$file %{buildroot}/%{_libdir}
 done
 
-for file in certutil cmsutil crlutil modutil nss-policy-check pk12util signver ssltap
+for file in certutil cmsutil crlutil modutil %{name}-policy-check pk12util signver ssltap
 do
-  install -p -m 755 dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir}
+  install -p -m 755 dist/*.OBJ/bin/$file %{buildroot}/%{_bindir}
 done
 
 for file in bltest ecperf fbectest fipstest shlibsign atob btoa derdump listsuites ocspclnt pp selfserv signtool strsclnt symkeyutil tstclnt vfyserv vfychain
 do
-  install -p -m 755 dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
+  install -p -m 755 dist/*.OBJ/bin/$file %{buildroot}/%{unsupported_tools_directory}
 done
 
-for file in dist/public/nss/*.h
+for file in dist/public/%{name}/*.h
 do
-  install -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
+  install -p -m 644 $file %{buildroot}/%{_includedir}/nss3
 done
 
 for file in blapi.h alghmac.h cmac.h
 do
-  install -p -m 644 dist/private/nss/$file $RPM_BUILD_ROOT/%{_includedir}/nss3
+  install -p -m 644 dist/private/%{name}/$file %{buildroot}/%{_includedir}/nss3
 done
 
 for file in libfreebl.a
 do
-install -p -m 644 dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
+install -p -m 644 dist/*.OBJ/lib/$file %{buildroot}/%{_libdir}
 done
 
-for file in dist/private/nss/templates.c dist/private/nss/nssck.api
+for file in dist/private/%{name}/templates.c dist/private/%{name}/nssck.api
 do
-  install -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3/templates
+  install -p -m 644 $file %{buildroot}/%{_includedir}/nss3/templates
 done
 
-install -p -m 644 ./dist/pkgconfig/nss-util.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-util.pc
-install -p -m 755 ./dist/pkgconfig/nss-util-config $RPM_BUILD_ROOT/%{_bindir}/nss-util-config
-install -p -m 644 ./dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc
-install -p -m 755 ./dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
-install -p -m 644 ./dist/pkgconfig/nss.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc
-install -p -m 755 ./dist/pkgconfig/nss-config $RPM_BUILD_ROOT/%{_bindir}/nss-config
-install -p -m 755 ./dist/pkgconfig/setup-nsssysinit.sh $RPM_BUILD_ROOT/%{_bindir}/setup-nsssysinit.sh
-ln -r -s -f $RPM_BUILD_ROOT/%{_bindir}/setup-nsssysinit.sh $RPM_BUILD_ROOT/%{_bindir}/setup-nsssysinit
+install -p -m 644 ./dist/pkgconfig/%{name}-util.pc %{buildroot}/%{_libdir}/pkgconfig/%{name}-util.pc
+install -p -m 755 ./dist/pkgconfig/%{name}-util-config %{buildroot}/%{_bindir}/%{name}-util-config
+install -p -m 644 ./dist/pkgconfig/%{name}-softokn.pc %{buildroot}/%{_libdir}/pkgconfig/%{name}-softokn.pc
+install -p -m 755 ./dist/pkgconfig/%{name}-softokn-config %{buildroot}/%{_bindir}/%{name}-softokn-config
+install -p -m 644 ./dist/pkgconfig/%{name}.pc %{buildroot}/%{_libdir}/pkgconfig/%{name}.pc
+install -p -m 755 ./dist/pkgconfig/%{name}-config %{buildroot}/%{_bindir}/%{name}-config
+install -p -m 755 ./dist/pkgconfig/setup-nsssysinit.sh %{buildroot}/%{_bindir}/setup-nsssysinit.sh
+ln -r -s -f %{buildroot}/%{_bindir}/setup-nsssysinit.sh %{buildroot}/%{_bindir}/setup-nsssysinit
 
 for f in %{configFiles}; do
-   install -c -m 644 ${f}.1 $RPM_BUILD_ROOT%{_mandir}/man1/${f}.1
+   install -c -m 644 ${f}.1 %{buildroot}%{_mandir}/man1/${f}.1
 done
 for f in certutil cmsutil crlutil derdump modutil pk12util signtool signver ssltap vfychain vfyserv; do
-  install -c -m 644 ./dist/docs/nroff/${f}.1 $RPM_BUILD_ROOT%{_mandir}/man1/${f}.1
+  install -c -m 644 ./dist/docs/nroff/${f}.1 %{buildroot}%{_mandir}/man1/${f}.1
 done
 
-install -c -m 644 ./dist/docs/nroff/pp.1 $RPM_BUILD_ROOT%{_datadir}/doc/nss-tools/pp.1
+install -c -m 644 ./dist/docs/nroff/pp.1 %{buildroot}%{_datadir}/doc/%{name}-tools/pp.1
 
 for f in %{dbfiles}; do
-   install -c -m 644 ${f}.5 $RPM_BUILD_ROOT%{_mandir}/man5/${f}.5
+   install -c -m 644 ${f}.5 %{buildroot}%{_mandir}/man5/${f}.5
 done
 
-install -p -m 644 %{SOURCE28} $RPM_BUILD_ROOT/%{_sysconfdir}/crypto-policies/local.d
+install -p -m 644 %{SOURCE28} %{buildroot}/%{_sysconfdir}/crypto-policies/local.d
 
 %generate_compatibility_deps
 
-%triggerpostun -n nss-sysinit -- nss-sysinit < 3.12.8-3
+%triggerpostun -n %{name}-sysinit -- %{name}-sysinit < 3.12.8-3
 /usr/bin/setup-nsssysinit.sh on
 
 %post
@@ -531,7 +510,7 @@ update-crypto-policies &> /dev/null || :
 
 
 %files
-%license nss/COPYING
+%license %{name}/COPYING
 %{_libdir}/libnss3.so
 %{_libdir}/libssl3.so
 %{_libdir}/libsmime3.so
@@ -558,6 +537,74 @@ update-crypto-policies &> /dev/null || :
 %doc %{_mandir}/man5/key4.db.5*
 %doc %{_mandir}/man5/pkcs11.txt.5*
 
+%files devel
+%{_libdir}/libcrmf.a
+%{_libdir}/pkgconfig/%{name}.pc
+%{_bindir}/%{name}-config
+%doc %{_mandir}/man1/%{name}-config.1*
+
+%files pkcs11-devel
+%{_includedir}/nss3/nssbase.h
+%{_includedir}/nss3/nssbaset.h
+%{_includedir}/nss3/nssckepv.h
+%{_includedir}/nss3/nssckft.h
+%{_includedir}/nss3/nssckfw.h
+%{_includedir}/nss3/nssckfwc.h
+%{_includedir}/nss3/nssckfwt.h
+%{_includedir}/nss3/nssckg.h
+%{_includedir}/nss3/nssckmdt.h
+%{_includedir}/nss3/nssckt.h
+%{_includedir}/nss3/templates/nssck.api
+%{_libdir}/libnssb.a
+%{_libdir}/libnssckfw.a
+
+%files softokn
+%if %{with dbm}
+%{_libdir}/libnssdbm3.so
+%{abidir}/libnssdbm3.dump
+%{_libdir}/libnssdbm3.chk
+%endif
+%{_libdir}/libsoftokn3.so
+%{abidir}/libsoftokn3.dump
+%{_libdir}/libsoftokn3.chk
+%dir %{_libdir}/%{name}
+%dir %{saved_files_dir}
+%dir %{unsupported_tools_directory}
+%{unsupported_tools_directory}/bltest
+%{unsupported_tools_directory}/ecperf
+%{unsupported_tools_directory}/fbectest
+%{unsupported_tools_directory}/fipstest
+%{unsupported_tools_directory}/shlibsign
+
+%files softokn-freebl
+%license %{name}/COPYING
+%{_libdir}/libfreebl3.so
+%{_libdir}/libfreebl3.chk
+%{_libdir}/libfreeblpriv3.so
+%{_libdir}/libfreeblpriv3.chk
+%{abidir}/libfreebl3.dump
+%{abidir}/libfreeblpriv3.dump
+%dir %{dracut_modules_dir}
+%{dracut_modules_dir}/module-setup.sh
+%{dracut_conf_dir}/50-%{name}-softokn.conf
+
+%files softokn-freebl-devel
+%{_libdir}/libfreebl.a
+%{_includedir}/nss3/blapi.h
+%{_includedir}/nss3/blapit.h
+%{_includedir}/nss3/alghmac.h
+%{_includedir}/nss3/cmac.h
+%{_includedir}/nss3/lowkeyi.h
+%{_includedir}/nss3/lowkeyti.h
+
+%files softokn-devel
+%{_libdir}/pkgconfig/%{name}-softokn.pc
+%{_bindir}/%{name}-softokn-config
+%dir %{_includedir}/nss3
+%{_includedir}/nss3/ecl-exp.h
+%{_includedir}/nss3/nsslowhash.h
+%{_includedir}/nss3/shsign.h
+
 %files sysinit
 %{_libdir}/libnsssysinit.so
 %{abidir}/libnsssysinit.dump
@@ -570,7 +617,7 @@ update-crypto-policies &> /dev/null || :
 %{_bindir}/cmsutil
 %{_bindir}/crlutil
 %{_bindir}/modutil
-%{_bindir}/nss-policy-check
+%{_bindir}/%{name}-policy-check
 %{_bindir}/pk12util
 %{_bindir}/signver
 %{_bindir}/ssltap
@@ -595,18 +642,12 @@ update-crypto-policies &> /dev/null || :
 %doc %{_mandir}/man1/signver.1*
 %doc %{_mandir}/man1/derdump.1*
 %doc %{_mandir}/man1/signtool.1*
-%dir %{_datadir}/doc/nss-tools
-%doc %{_datadir}/doc/nss-tools/pp.1
+%dir %{_datadir}/doc/%{name}-tools
+%doc %{_datadir}/doc/%{name}-tools/pp.1
 %doc %{_mandir}/man1/ssltap.1*
 %doc %{_mandir}/man1/vfychain.1*
 %doc %{_mandir}/man1/vfyserv.1*
 
-%files devel
-%{_libdir}/libcrmf.a
-%{_libdir}/pkgconfig/nss.pc
-%{_bindir}/nss-config
-%doc %{_mandir}/man1/nss-config.1*
-
 %dir %{_includedir}/nss3
 %{_includedir}/nss3/cert.h
 %{_includedir}/nss3/certdb.h
@@ -628,7 +669,7 @@ update-crypto-policies &> /dev/null || :
 %{_includedir}/nss3/keyhi.h
 %{_includedir}/nss3/keyt.h
 %{_includedir}/nss3/keythi.h
-%{_includedir}/nss3/nss.h
+%{_includedir}/nss3/%{name}.h
 %{_includedir}/nss3/nssckbi.h
 %{_includedir}/nss3/ocsp.h
 %{_includedir}/nss3/ocspt.h
@@ -657,29 +698,14 @@ update-crypto-policies &> /dev/null || :
 %{_includedir}/nss3/sslproto.h
 %{_includedir}/nss3/sslt.h
 
-%files pkcs11-devel
-%{_includedir}/nss3/nssbase.h
-%{_includedir}/nss3/nssbaset.h
-%{_includedir}/nss3/nssckepv.h
-%{_includedir}/nss3/nssckft.h
-%{_includedir}/nss3/nssckfw.h
-%{_includedir}/nss3/nssckfwc.h
-%{_includedir}/nss3/nssckfwt.h
-%{_includedir}/nss3/nssckg.h
-%{_includedir}/nss3/nssckmdt.h
-%{_includedir}/nss3/nssckt.h
-%{_includedir}/nss3/templates/nssck.api
-%{_libdir}/libnssb.a
-%{_libdir}/libnssckfw.a
-
 %files util
-%license nss/COPYING
+%license %{name}/COPYING
 %{_libdir}/libnssutil3.so
 %{abidir}/libnssutil3.dump
 
 %files util-devel
-%{_libdir}/pkgconfig/nss-util.pc
-%{_bindir}/nss-util-config
+%{_libdir}/pkgconfig/%{name}-util.pc
+%{_bindir}/%{name}-util-config
 
 %dir %{_includedir}/nss3
 %{_includedir}/nss3/base64.h
@@ -721,57 +747,13 @@ update-crypto-policies &> /dev/null || :
 %{_includedir}/nss3/utilrename.h
 %{_includedir}/nss3/templates/templates.c
 
-%files softokn
-%if %{with dbm}
-%{_libdir}/libnssdbm3.so
-%{abidir}/libnssdbm3.dump
-%{_libdir}/libnssdbm3.chk
-%endif
-%{_libdir}/libsoftokn3.so
-%{abidir}/libsoftokn3.dump
-%{_libdir}/libsoftokn3.chk
-%dir %{_libdir}/nss
-%dir %{saved_files_dir}
-%dir %{unsupported_tools_directory}
-%{unsupported_tools_directory}/bltest
-%{unsupported_tools_directory}/ecperf
-%{unsupported_tools_directory}/fbectest
-%{unsupported_tools_directory}/fipstest
-%{unsupported_tools_directory}/shlibsign
-
-%files softokn-freebl
-%license nss/COPYING
-%{_libdir}/libfreebl3.so
-%{_libdir}/libfreebl3.chk
-%{_libdir}/libfreeblpriv3.so
-%{_libdir}/libfreeblpriv3.chk
-%{abidir}/libfreebl3.dump
-%{abidir}/libfreeblpriv3.dump
-%dir %{dracut_modules_dir}
-%{dracut_modules_dir}/module-setup.sh
-%{dracut_conf_dir}/50-nss-softokn.conf
-
-%files softokn-freebl-devel
-%{_libdir}/libfreebl.a
-%{_includedir}/nss3/blapi.h
-%{_includedir}/nss3/blapit.h
-%{_includedir}/nss3/alghmac.h
-%{_includedir}/nss3/cmac.h
-%{_includedir}/nss3/lowkeyi.h
-%{_includedir}/nss3/lowkeyti.h
-
-%files softokn-devel
-%{_libdir}/pkgconfig/nss-softokn.pc
-%{_bindir}/nss-softokn-config
-%dir %{_includedir}/nss3
-%{_includedir}/nss3/ecl-exp.h
-%{_includedir}/nss3/nsslowhash.h
-%{_includedir}/nss3/shsign.h
-
 %files doc
-%doc nss/readme.md nss/trademarks.txt nss/help.txt nss/doc/README
+%doc %{name}/readme.md %{name}/trademarks.txt %{name}/help.txt %{name}/doc/README
 
 %changelog
+* Fri Apr 14 2023 Jing Zhang <renyu.zj@linux.alibaba.com> - 3.89-2
+- Refact spec
+
 * Sun Mar 12 2023 Funda Wang <fundawang@yeah.net> - 3.89-1
 - New version 3.89