diff --git a/nspr.spec b/nspr.spec
index 5954bda8b0fd084c364118a09cf92c1d5221ada2..94ac49422e7dd072968b38db3115a5f338b641d3 100644
--- a/nspr.spec
+++ b/nspr.spec
@@ -1,15 +1,18 @@
-%define anolis_release 1
+%define anolis_release 2
+
+%global real_version 4.35
 
 Summary:        Netscape Portable Runtime
 Name:           nspr
-Version:        4.35
+Version:        %{real_version}.0
 Release:        %{anolis_release}%{?dist}
 License:        MPLv2.0
 URL:            https://firefox-source-docs.mozilla.org/nspr/index.html
 Conflicts:      filesystem < 3
 BuildRequires:  gcc
+BuildRequires:  perl(FileHandle)
 
-Source0:        https://ftp.mozilla.org/pub/nspr/releases/v%{version}/src/%{name}-%{version}.tar.gz
+Source0:        https://ftp.mozilla.org/pub/nspr/releases/v%{real_version}/src/%{name}-%{real_version}.tar.gz
 Source1:        nspr-config.xml
 
 #fix dependency
@@ -31,15 +34,9 @@ Conflicts:      filesystem < 3
 Header files for doing development with the Netscape Portable Runtime.
 
 %prep
-
-%setup -q -n %{name}-%{version}
-
-pushd nspr
-%patch1 -p1 -b .gcc-atomics
-popd
+%autosetup -p1 -n %{name}-%{real_version}/nspr
 
 %build
-%define _configure ./nspr/configure
 %configure \
                  --prefix=%{_prefix} \
                  --libdir=%{_libdir} \
@@ -50,10 +47,10 @@ popd
 
 # The assembly files are only for legacy atomics, to which we prefer GCC atomics
 sed -i '/^PR_MD_ASFILES/d' config/autoconf.mk
-make
+%make_build
 
 date +"%e %B %Y" | tr -d '\n' > date.xml
-echo -n %{version} > version.xml
+echo -n %{real_version} > version.xml
 
 for m in %{SOURCE1}; do
   cp ${m} .
@@ -65,7 +62,7 @@ done
 %check
 
 # Run test suite.
-perl ./nspr/pr/tests/runtests.pl 2>&1 | tee output.log
+perl ./pr/tests/runtests.pl 2>&1 | tee output.log
 
 TEST_FAILURES=`grep -c FAILED ./output.log` || :
 if [ $TEST_FAILURES -ne 0 ]; then
@@ -99,7 +96,7 @@ for f in nspr-config; do
 done
 
 %files
-%license nspr/LICENSE
+%license LICENSE
 %{_libdir}/libnspr4.so
 %{_libdir}/libplc4.so
 %{_libdir}/libplds4.so
@@ -111,6 +108,9 @@ done
 %{_mandir}/man*/*
 
 %changelog
+* Sat Feb 17 2024 Funda Wang <fundawang@yeah.net> - 4.35.0-2
+- Add version suffix for ease upgrading from anolis 8
+
 * Thu Dec 8 2022 Funda Wang <fundawang@yeah.net> - 4.35-1
 - New version 4.35