Hello community, here is the log from the commit of package apr for openSUSE:Factory checked in at 2019-02-11 21:16:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apr (Old) and /work/SRC/openSUSE:Factory/.apr.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apr" Mon Feb 11 21:16:13 2019 rev:10 rq:672770 version:1.6.5 Changes: -------- --- /work/SRC/openSUSE:Factory/apr/apr.changes 2019-02-04 21:21:09.799657606 +0100 +++ /work/SRC/openSUSE:Factory/.apr.new.28833/apr.changes 2019-02-11 21:16:15.187373326 +0100 @@ -1,0 +2,14 @@ +Fri Feb 8 07:58:34 UTC 2019 - Petr Gajdos <[email protected]> + +- increase timeout to fix random failure of testsuite + + apr-test-sendfile-timeout.patch +- fix build for SLE11 again + +------------------------------------------------------------------- +Thu Feb 7 11:31:27 UTC 2019 - Petr Gajdos <[email protected]> + +- linux version is now checked correctly, drop + - apr-1.4.5-linux3.patch + (see change log from Sun Aug 7 01:21:44 UTC 2011) + +------------------------------------------------------------------- Old: ---- apr-1.4.5-linux3.patch New: ---- apr-test-sendfile-timeout.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apr.spec ++++++ --- /var/tmp/diff_new_pack.SqOlbR/_old 2019-02-11 21:16:16.023372883 +0100 +++ /var/tmp/diff_new_pack.SqOlbR/_new 2019-02-11 21:16:16.031372878 +0100 @@ -30,10 +30,11 @@ Source0: https://www.apache.org/dist/apr/apr-%{version}.tar.bz2 Source1: https://www.apache.org/dist/apr/apr-%{version}.tar.bz2.asc Source2: %{name}.keyring -Patch4: apr-1.4.5-linux3.patch Patch5: apr-visibility.patch Patch6: apr-use-getrandom.patch Patch9: apr-proc-mutex-map-anon.patch +# prevent random failures of the testsuite (sendfile test) +Patch10: apr-test-sendfile-timeout.patch BuildRequires: doxygen BuildRequires: fdupes BuildRequires: libtool @@ -42,6 +43,7 @@ # for the testsuite BuildRequires: netcfg BuildRequires: pkgconfig +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description APR is Apache's Portable Runtime Library, designed to be a support @@ -82,10 +84,10 @@ %prep %setup -q -%patch4 %patch5 -p1 %patch6 -p1 %patch9 -p1 +%patch10 -p1 # Do not put date to doxy content sed -i \ @@ -94,7 +96,6 @@ %build autoreconf -fiv -export apr_lock_method=USE_PROC_PTHREAD_SERIALIZE %configure \ --enable-other-child \ --with-installbuilddir=%{installbuilddir} \ @@ -110,7 +111,7 @@ make dox %{?_smp_mflags} %install -%make_install +make DESTDIR=$RPM_BUILD_ROOT install %{?_smp_mflags} # Move docs to more convenient location mv docs/dox/html html # Unpackaged files: @@ -138,14 +139,20 @@ %postun -n %{libname} -p /sbin/ldconfig %files -n %{libname} +%defattr(-,root,root,-) %doc CHANGES +%if 0%{?suse_version} > 1315 %license LICENSE +%else +%doc LICENSE +%endif %doc NOTICE %{_libdir}/libapr-%{aprver}.so.* # Do NOT move to devel as this is utilized by Tomcat %{_libdir}/libapr-%{aprver}.so %files devel +%defattr(-,root,root,-) %doc docs/APRDesign.html %doc docs/canonical_filenames.html %doc docs/incomplete_types ++++++ apr-test-sendfile-timeout.patch ++++++ Index: apr-1.6.5/test/sendfile.c =================================================================== --- apr-1.6.5.orig/test/sendfile.c 2013-10-14 15:45:05.000000000 +0200 +++ apr-1.6.5/test/sendfile.c 2019-02-08 10:58:50.731588817 +0100 @@ -463,7 +463,7 @@ static int client(apr_pool_t *p, client_ /* in case this is the non-blocking test, set socket timeout; * we're just waiting for EOF */ - rv = apr_socket_timeout_set(sock, apr_time_from_sec(3)); + rv = apr_socket_timeout_set(sock, apr_time_from_sec(10)); if (rv != APR_SUCCESS) { aprerr("apr_socket_timeout_set()", rv); }
