diff --git a/apr-1.7.4.tar.bz2 b/apr-1.7.4.tar.bz2 deleted file mode 100644 index 1dfc7f43c0c7430e5c5717fb81bd26c6fc34805e..0000000000000000000000000000000000000000 Binary files a/apr-1.7.4.tar.bz2 and /dev/null differ diff --git a/apr-1.7.5.tar.bz2 b/apr-1.7.5.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..835f6e249ca83ead9b240d640e0b396f59c45ea1 Binary files /dev/null and b/apr-1.7.5.tar.bz2 differ diff --git a/apr.spec b/apr.spec index d9ac81801e253138bd9e2f8fd961b5fbe6dc3034..cf014ff1b0ec426cee367609f777b090c7b52733 100644 --- a/apr.spec +++ b/apr.spec @@ -1,12 +1,15 @@ +# Disable .la file removal since the .la file is exported via apr-config. +%global __brp_remove_la_files %nil + %define aprver 1 Name: apr -Version: 1.7.4 -Release: 3 +Version: 1.7.5 +Release: 1 Summary: Apache Portable Runtime. -License: ASL 2.0 and BSD with advertising and ISC and BSD -URL: http://apr.apache.org -Source0: http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2 +License: Apache-2.0 AND (BSD-4-Clause-UC AND ISC AND Zlib AND Caldera-no-preamble) +URL: https://apr.apache.org +Source0: https://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2 Source1: apr-wrapper.h Patch0: apr-1.2.2-libdir.patch @@ -25,7 +28,7 @@ platform-specific deficiencies or features. %package devel Summary: Apache Portable Runtime development kit. -Requires: %{name} = %{version}-%{release} pkgconfig +Requires: %{name} = %{version}-%{release} %description devel Apache Portable Runtime development kit. @@ -38,40 +41,44 @@ Apache Portable Runtime development kit. %build ./buildconf export ac_cv_search_shm_open=no -%configure \ +%configure --disable-static \ --includedir=%{_includedir}/%{name}-%{aprver} --with-installbuilddir=%{_libdir}/%{name}-%{aprver}/build \ --with-devrandom=/dev/urandom make %install -rm -rf %{buildroot} %make_install -install -D -m 0644 build/find_apr.m4 %{buildroot}/%{_datadir}/aclocal/find_apr.m4 +mkdir -p %{buildroot}/%{_datadir}/aclocal +for f in find_apr.m4 apr_common.m4; do + install -p -m 644 build/$f %{buildroot}/%{_datadir}/aclocal +done + sed -ri '/^dependency_libs/{s,-l(uuid|crypt) ,,g}' \ %{buildroot}%{_libdir}/libapr*.la sed -ri '/^LIBS=/{s,-l(uuid|crypt) ,,g;s/ */ /g}' \ %{buildroot}%{_bindir}/%{name}-%{aprver}-config sed -ri '/^Libs/{s,-l(uuid|crypt) ,,g}' \ %{buildroot}%{_libdir}/pkgconfig/%{name}-%{aprver}.pc + %ifarch %{multilib_arches} -install -D -m 0644 %{buildroot}%{_includedir}/%{name}-%{aprver}/apr.h \ - %{buildroot}%{_includedir}/%{name}-%{aprver}/%{name}-%{_arch}.h -install -D -m 0644 %{SOURCE1} %{buildroot}%{_includedir}/%{name}-%{aprver}/apr.h +mv %{buildroot}%{_includedir}/%{name}-%{aprver}/apr.h \ + %{buildroot}%{_includedir}/%{name}-%{aprver}/apr-%{_arch}.h +install -D -m 0644 %{S:1} %{buildroot}%{_includedir}/%{name}-%{aprver}/apr.h %endif -rm -rf %{buildroot}%{_libdir}/apr.exp -rm -rf %{buildroot}%{_libdir}/libapr-*.a - -%check -make check -%ldconfig_scriptlets - -%pre -%preun +rm -rf %{buildroot}%{_libdir}/apr.exp -%post +# Additionally packaged (see https://bugzilla.redhat.com/1669589) -- +sed -i '1s,/.*,/usr/bin/python3,' build/gen-build.py +for f in build/gen-build.py build/install.sh build/config.*; do + install -c -m755 $f %{buildroot}%{_libdir}/%{name}-%{aprver}/build +done -%postun +%check +pushd test + %make_build + ./testall -v -q +popd %files %doc CHANGES NOTICE @@ -80,7 +87,7 @@ make check %files devel %{_bindir}/%{name}-%{aprver}-config -%{_libdir}/libapr-%{aprver}.*a +%{_libdir}/libapr-%{aprver}.la %{_libdir}/libapr-%{aprver}.so %{_libdir}/pkgconfig/*.pc %dir %{_libdir}/%{name}-%{aprver} @@ -95,6 +102,9 @@ make check %doc docs/incomplete_types docs/non_apr_programs %changelog +* Wed Aug 28 2024 Funda Wang - 1.7.5-1 +- update to 1.7.5 + * Tue Aug 13 2024 wangjiang - 1.7.4-3 - fix segfaults error