- dbm build fix from Fedora

diff --git a/apr-util-configure-c99.patch b/apr-util-configure-c99.patch
new file mode 100644 (file)
index 0000000..4e387be
--- /dev/null
+++ b/apr-util-configure-c99.patch
@@ -0,0 +1,18 @@
+Add a missing implied int in the Berkeley DB configure probe.  This
+avoids build failures with future Fedora toolchain defaults.
+ 
+Submitted upstream: <https://bz.apache.org/bugzilla/show_bug.cgi?id=66396>
+
+diff --git a/build/dbm.m4 b/build/dbm.m4
+index 57bd131fc3b74099..ffdbdbc0f43e04da 100644
+--- a/build/dbm.m4
++++ b/build/dbm.m4
+@@ -235,7 +235,7 @@ AC_DEFUN([APU_TRY_BERKELEY_DB],
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <$apu_try_berkeley_db_header>
+-main ()
++int main ()
+ {
+   int major, minor, patch;
+ 

diff --git a/apr-util.spec b/apr-util.spec
index 641e713302d72f50d07a029c407026855592ca8e..9910eb6ae3a01f99a05b9b719f72dfc9d8eefe45 100644 (file)
--- a/apr-util.spec
+++ b/apr-util.spec
@@ -19,7 +19,7 @@ Summary:      A companion library to Apache Portable Runtime
 Summary(pl.UTF-8):     Biblioteka towarzysząca Apache Portable Runtime
 Name:          apr-util
 Version:       1.6.3
 Summary(pl.UTF-8):     Biblioteka towarzysząca Apache Portable Runtime
 Name:          apr-util
 Version:       1.6.3

-Release:       2
+Release:       3

 Epoch:         1
 License:       Apache v2.0
 Group:         Libraries
 Epoch:         1
 License:       Apache v2.0
 Group:         Libraries


@@ -29,6 +29,7 @@ Patch0:               %{name}-link.patch
 Patch1:                %{name}-config-noldap.patch
 Patch3:                %{name}-flags.patch
 Patch4:                mysql8.patch
 Patch1:                %{name}-config-noldap.patch
 Patch3:                %{name}-flags.patch
 Patch4:                mysql8.patch

+Patch5:                %{name}-configure-c99.patch

 URL:           http://apr.apache.org/
 BuildRequires: apr-devel >= 1:1.6.0
 BuildRequires: autoconf >= 2.59
 URL:           http://apr.apache.org/
 BuildRequires: apr-devel >= 1:1.6.0
 BuildRequires: autoconf >= 2.59


@@ -221,10 +222,11 @@ Statyczna biblioteka apr-util.
 
 %prep
 %setup -q
 
 %prep
 %setup -q

-%patch0 -p1
-%patch1 -p1
-%patch3 -p1
-%patch4 -p0
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P3 -p1
+%patch -P4 -p0
+%patch -P5 -p1

 
 echo '
 <Layout TLD>
 
 echo '
 <Layout TLD>