diff --git a/apr-1.6.3-r1834495.patch b/Merge-r1834494-from-trunk.patch similarity index 92% rename from apr-1.6.3-r1834495.patch rename to Merge-r1834494-from-trunk.patch index 015f15b..f13e679 100644 --- a/apr-1.6.3-r1834495.patch +++ b/Merge-r1834494-from-trunk.patch @@ -1,8 +1,7 @@ -# ./pullrev.sh 1834495 -http://svn.apache.org/viewvc?view=revision&revision=1834495 +This is an upstream patch from: http://svn.apache.org/viewvc?view=revision&revision=1834495 ---- apr-1.6.3/buildconf -+++ apr-1.6.3/buildconf +--- 1.7.x/buildconf 2018/06/27 11:41:30 1834494 ++++ 1.7.x/buildconf 2018/06/27 11:49:33 1834495 @@ -112,8 +112,10 @@ # Remove autoconf 2.5x's cache directory rm -rf autom4te*.cache @@ -15,8 +14,8 @@ http://svn.apache.org/viewvc?view=revision&revision=1834495 # Create RPM Spec file if [ -f `which cut` ]; then ---- apr-1.6.3/build/gen-build.py -+++ apr-1.6.3/build/gen-build.py +--- 1.7.x/build/gen-build.py 2018/06/27 11:41:30 1834494 ++++ 1.7.x/build/gen-build.py 2018/06/27 11:49:33 1834495 @@ -10,7 +10,10 @@ @@ -149,9 +148,9 @@ http://svn.apache.org/viewvc?view=revision&revision=1834495 files.extend(map(clean_path, glob.glob(pat))) files.sort() return files ---- apr-1.6.3/build/buildcheck.sh -+++ apr-1.6.3/build/buildcheck.sh -@@ -4,7 +4,7 @@ +--- 1.7.x/build/buildcheck.sh 2018/06/27 11:41:30 1834494 ++++ 1.7.x/build/buildcheck.sh 2018/06/27 11:49:33 1834495 +@@ -4,14 +4,14 @@ res=0 # any python @@ -160,7 +159,6 @@ http://svn.apache.org/viewvc?view=revision&revision=1834495 if test -z "$python"; then echo "buildconf: python not found." echo " You need python installed" -@@ -11,7 +11,7 @@ echo " to build APR from SVN." res=1 else @@ -169,3 +167,4 @@ http://svn.apache.org/viewvc?view=revision&revision=1834495 echo "buildconf: python version $py_version (ok)" fi + diff --git a/apr-1.2.2-locktimeout.patch b/apr-1.2.2-locktimeout.patch deleted file mode 100644 index 73f3994..0000000 --- a/apr-1.2.2-locktimeout.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- apr-1.2.2/test/testlock.c.locktimeout -+++ apr-1.2.2/test/testlock.c -@@ -295,7 +295,7 @@ - continue; - } - ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(s)); -- ABTS_ASSERT(tc, "Timer returned too late", end - begin - timeout < 100000); -+ ABTS_ASSERT(tc, "Timer returned too late", end - begin - timeout < 500000); - break; - } - ABTS_ASSERT(tc, "Too many retries", i < MAX_RETRY); diff --git a/apr.spec b/apr.spec index 53cd675..7d0f1e1 100644 --- a/apr.spec +++ b/apr.spec @@ -2,20 +2,18 @@ Name: apr Version: 1.6.5 -Release: 2 +Release: 3 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/apr/%{name}-%{version}.tar.bz2 +Source0: http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2 Source1: apr-wrapper.h -#Patch0: -# *build/buildcheck.sh, buildconf: Detect and run under Python 3 or 2,and respect $PYTHON. -# *build/gen-build.py: Fix various Python 3 compatibility issues. -# http://svn.apache.org/viewvc?view=revision&revision=1834495 -Patch0: apr-1.6.3-r1834495.patch -Patch1: apr-1.2.2-locktimeout.patch -Patch2: apr-1.2.2-libdir.patch -Patch3: apr-1.2.7-pkgconf.patch + +Patch0: apr-1.2.2-libdir.patch +Patch1: apr-1.2.7-pkgconf.patch + +Patch6000: Merge-r1834494-from-trunk.patch +Patch6001: test-testlock.c-test_timeoutcond-Increase-fudge-fact.patch BuildRequires: gcc autoconf libtool libuuid-devel python3 lksctp-tools-devel @@ -28,11 +26,11 @@ relieving them of the need to code special-case conditions to work around or tak platform-specific deficiencies or features. %package devel -Summary: Apache Portable Runtime development kit -Requires: apr = %{version}-%{release}, pkgconfig +Summary: Apache Portable Runtime development kit. +Requires: %{name} = %{version}-%{release} pkgconfig %description devel -Apache Portable Runtime development kit +Apache Portable Runtime development kit. %package_help @@ -42,7 +40,6 @@ Apache Portable Runtime development kit %build ./buildconf export ac_cv_search_shm_open=no - %configure \ --includedir=%{_includedir}/%{name}-%{aprver} --with-installbuilddir=%{_libdir}/%{name}-%{aprver}/build \ --with-devrandom=/dev/urandom @@ -68,9 +65,16 @@ rm -rf %{buildroot}%{_libdir}/libapr-*.a %check make check - %ldconfig_scriptlets +%pre + +%preun + +%post + +%postun + %files %doc CHANGES NOTICE %license LICENSE @@ -93,8 +97,11 @@ make check %doc docs/incomplete_types docs/non_apr_programs %changelog +* Tue Oct 22 2019 openEuler Buildteam - 1.6.5-3 +- optimize spec file. + * Sat Sep 28 2019 openEuler Buildteam - 1.6.5-2 - Package rebuild. -* Wed Sep 4 2019 openEuler Buildteam - 1.6.5-1 +* Wed Sep 04 2019 openEuler Buildteam - 1.6.5-1 - Package init. diff --git a/test-testlock.c-test_timeoutcond-Increase-fudge-fact.patch b/test-testlock.c-test_timeoutcond-Increase-fudge-fact.patch new file mode 100644 index 0000000..bddb2f7 --- /dev/null +++ b/test-testlock.c-test_timeoutcond-Increase-fudge-fact.patch @@ -0,0 +1,28 @@ +From d6d48ddd4c3a5ef04749475ed75d26330a3e0dc6 Mon Sep 17 00:00:00 2001 +From: Joe Orton +Date: Tue, 19 Sep 2017 16:38:40 +0000 +Subject: [PATCH] * test/testlock.c (test_timeoutcond): Increase fudge factor + in checking timeout precision; 100ms failed regularly in Fedora builds, + 500ms has Never Failed(TM). + +git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1808910 13f79535-47bb-0310-9956-ffa450edef68 +--- + test/testlock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/testlock.c b/test/testlock.c +index 40da791b7..cd48768ca 100644 +--- a/test/testlock.c ++++ b/test/testlock.c +@@ -334,7 +334,7 @@ static void test_timeoutcond(abts_case *tc, void *data) + continue; + } + ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(s)); +- ABTS_ASSERT(tc, "Timer returned too late", end - begin - timeout < 100000); ++ ABTS_ASSERT(tc, "Timer returned too late", end - begin - timeout < 500000); + break; + } + ABTS_ASSERT(tc, "Too many retries", i < MAX_RETRY); +-- +2.19.1 +