- rel 4; neon patch from FC

diff --git a/cadaver-0.23.3-neon030.patch b/cadaver-0.23.3-neon030.patch
new file mode 100644 (file)
index 0000000..aa83795
--- /dev/null
+++ b/cadaver-0.23.3-neon030.patch
@@ -0,0 +1,53 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,7 @@ AC_ARG_ENABLE(netrc,
+ AC_HELP_STRING([--disable-netrc], [enable .netrc support]),,
+ enable_netrc=yes)
+ 
+-NE_REQUIRE_VERSIONS([0], [27 28 29])
++NE_REQUIRE_VERSIONS([0], [27 28 29 30])
+ 
+ dnl Don't enable zlib or ACL support in neon
+ NEON_WITHOUT_ZLIB
+--- a/configure
++++ b/configure
+@@ -9595,7 +9595,7 @@ fi
+ $as_echo "$ne_cv_lib_neon" >&6; }
+     if test "$ne_cv_lib_neon" = "yes"; then
+        ne_cv_lib_neonver=no
+-       for v in 27 28 29; do
++       for v in 27 28 29 30; do
+           case $ne_libver in
+           0.$v.*) ne_cv_lib_neonver=yes ;;
+           esac
+@@ -10242,8 +10242,8 @@ _ACEOF
+     fi
+ 
+ else
+-    { $as_echo "$as_me:$LINENO: incompatible neon library version $ne_libver: wanted 0.27 28 29" >&5
+-$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29" >&6;}
++    { $as_echo "$as_me:$LINENO: incompatible neon library version $ne_libver: wanted 0.27 28 29 30" >&5
++$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29 30" >&6;}
+     neon_got_library=no
+ fi
+ 
+@@ -10328,7 +10328,7 @@ fi
+ $as_echo "$ne_cv_lib_neon" >&6; }
+     if test "$ne_cv_lib_neon" = "yes"; then
+        ne_cv_lib_neonver=no
+-       for v in 27 28 29; do
++       for v in 27 28 29 30; do
+           case $ne_libver in
+           0.$v.*) ne_cv_lib_neonver=yes ;;
+           esac
+@@ -10975,8 +10975,8 @@ _ACEOF
+     fi
+ 
+ else
+-    { $as_echo "$as_me:$LINENO: incompatible neon library version $ne_libver: wanted 0.27 28 29" >&5
+-$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29" >&6;}
++    { $as_echo "$as_me:$LINENO: incompatible neon library version $ne_libver: wanted 0.27 28 29 30" >&5
++$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29 30" >&6;}
+     neon_got_library=no
+ fi
+ 

diff --git a/cadaver-configure.patch b/cadaver-configure.patch
new file mode 100644 (file)
index 0000000..2f296f1
--- /dev/null
+++ b/cadaver-configure.patch
@@ -0,0 +1,11 @@
+--- cadaver-0.23.3/configure.ac~       2015-12-12 13:11:43.281099457 +0100
++++ cadaver-0.23.3/configure.ac        2015-12-12 13:18:33.468457957 +0100
+@@ -27,6 +27,8 @@ if test "$enable_debug" = "yes"; then
+    AC_DEFINE(NE_DEBUGGING, 1, [Define to enable debugging])
+ fi
+ 
++AM_PROG_MKDIR_P
++
+ CHECK_READLINE()
+ 
+ AC_ARG_ENABLE(netrc,

diff --git a/cadaver.spec b/cadaver.spec
index f8dc6bc1503bc1a3051f6c73de76d5621541e2d9..4da2b014b61e6bfcf9aba5520526eb1fa44f15af 100644 (file)
--- a/cadaver.spec
+++ b/cadaver.spec
@@ -2,11 +2,13 @@ Summary:      A command-line WebDAV client
 Summary(pl.UTF-8):     Klient WebDav (działający z linii poleceń)
 Name:          cadaver
 Version:       0.23.3
-Release:       3
+Release:       4
 License:       GPL
 Group:         Applications/Networking
 Source0:       http://www.webdav.org/cadaver/%{name}-%{version}.tar.gz
 # Source0-md5: 502ecd601e467f8b16056d2acca39a6f
+Patch0:                cadaver-0.23.3-neon030.patch
+Patch1:                %{name}-configure.patch
 URL:           http://www.webdav.org/cadaver/
 BuildRequires: automake
 BuildRequires: neon-devel >= 0.28.0
@@ -28,6 +30,8 @@ tworzenie i usuwanie kolekcji oraz operacje blokowania.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__gettextize}