diff --git a/apr-util.spec b/apr-util.spec
index 687d2fca48767199fa38fbf05869d7e7ecda6b92..7d37ff27603cc5df51074bb97c52d3303a355c25 100644
--- a/apr-util.spec
+++ b/apr-util.spec
@@ -1,8 +1,11 @@
+# Disable .la file removal since the .la file is exported via apu-config.
+%global __brp_remove_la_files %nil
+
 %define apuver 1
 
 Name: apr-util
 Version: 1.6.3
-Release: 1
+Release: 2
 Summary: apr-util provides a number of helpful abstractions on top of APR.
 License: ASL 2.0
 URL: http://apr.apache.org
@@ -61,35 +64,41 @@ The ODBC DBD driver of apr-util.
 %build
 autoheader && autoconf
 export ac_cv_ldap_set_rebind_proc_style=three
-%configure --with-apr=%{_prefix} --includedir=%{_includedir}/apr-%{apuver} \
+%configure --disable-static --with-apr=%{_prefix} --includedir=%{_includedir}/apr-%{apuver} \
         --with-ldap=ldap_r --with-gdbm --with-sqlite3 --with-pgsql --with-mysql --with-odbc \
         --with-dbm=gdbm --without-berkeley-db --without-sqlite2 --with-crypto --with-openssl
 %make_build
 
 %install
-rm -rf %{buildroot}
 %make_install
-install -D -m 0644 build/find_apu.m4 %{buildroot}/%{_datadir}/aclocal/find_apu.m4
-rm -f %{buildroot}%{_libdir}/aprutil.exp
-rm -f %{buildroot}%{_libdir}/libapr*.a
-sed -i '/^old_library/s,libapr.*\.a,,' %{buildroot}%{_libdir}/libapr*.la
-sed -ri '/^dependency_libs/{s,-l(pq|sqlite[0-9]|rt|dl|uuid) ,,g}' \
-      %{buildroot}%{_libdir}/libapr*.la
-rm -f %{buildroot}%{_libdir}/%{name}-%{apuver}/*.*a
 
-%check
-export MALLOC_CHECK_=2 MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
-export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}/%{name}-%{apuver}
-make test
-%ldconfig_scriptlets
+mkdir -p %{buildroot}/%{_datadir}/aclocal
+install -m 644 build/find_apu.m4 %{buildroot}/%{_datadir}/aclocal
+
+# Unpackaged files; remove the static libaprutil
+rm -f %{buildroot}%{_libdir}/aprutil.exp \
+      %{buildroot}%{_libdir}/libapr*.a
 
-%pre
+# And remove the reference to the static libaprutil from the .la
+# file.
+sed -i '/^old_library/s,libapr.*\.a,,' \
+      %{buildroot}%{_libdir}/libapr*.la
 
-%preun
+# Remove unnecessary exports from dependency_libs
+sed -ri '/^dependency_libs/{s,-l(pq|sqlite[0-9]|rt|dl|uuid) ,,g}' \
+      %{buildroot}%{_libdir}/libapr*.la
 
-%post
+# Trim libtool DSO cruft
+rm -f %{buildroot}%{_libdir}/apr-util-%{apuver}/*.*a
 
-%postun
+%check
+# Run the less verbose test suites
+export MALLOC_CHECK_=2 MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
+cd test
+%{make_build} testall
+# testall breaks with DBD DSO; ignore
+export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}/apr-util-%{apuver}
+./testall -v -q
 
 %files
 %doc CHANGES NOTICE
@@ -104,7 +113,7 @@ make test
 
 %files devel
 %{_bindir}/apu-%{apuver}-config
-%{_libdir}/libaprutil-%{apuver}.*a
+%{_libdir}/libaprutil-%{apuver}.la
 %{_libdir}/libaprutil-%{apuver}.so
 %{_includedir}/apr-%{apuver}/*.h
 %{_libdir}/pkgconfig/*.pc
@@ -117,7 +126,11 @@ make test
 %{_libdir}/%{name}-%{apuver}/apr_dbd_odbc*
 
 %changelog
-* Sat Feb 3 2024 caixiaomeng <caixiaomeng2@huawei.com> - 1.6.3
+* Thu Aug 29 2024 Funda Wang <fundawang@yeah.net> - 1.6.3-2
+- Disable automatic .la file removal
+- cleanup spec
+
+* Sat Feb 3 2024 caixiaomeng <caixiaomeng2@huawei.com> - 1.6.3-1
 - update to 1.6.3
 
 * Tue Feb 14 2023 fuanan <fuanan3@h-partners.com> - 1.6.1-14