[cadaver] Fix FTBFS with neon-0.30 (#992037, #1106029)

[Yaakov Selkowitz]

commit e26bdfaaf065da290dde44b7f032602697155952
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date:   Thu Jun 19 16:34:04 2014 -0500

    Fix FTBFS with neon-0.30 (#992037, #1106029)

 cadaver-0.23.3-neon030.patch |   53 ++++++++++++++++++++++++++++++++++++++++++
 cadaver.spec                 |   13 ++++-----
 2 files changed, 59 insertions(+), 7 deletions(-)
---
diff --git a/cadaver-0.23.3-neon030.patch b/cadaver-0.23.3-neon030.patch
new file mode 100644
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.spec b/cadaver.spec
index ec966c6..e7c54ef 100644
--- a/cadaver.spec
+++ b/cadaver.spec
@@ -1,12 +1,12 @@
 Name: cadaver
 Version: 0.23.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Command-line WebDAV client
 License: GPLv2+
 Group: Applications/Internet
 Source: http://www.webdav.org/cadaver/%{name}-%{version}.tar.gz
+Patch0: cadaver-0.23.3-neon030.patch
 URL: http://www.webdav.org/cadaver/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: neon-devel >= 0.27.0, readline-devel, ncurses-devel, gettext
 
 %description
@@ -17,6 +17,7 @@ and resource locking.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 export LDFLAGS=-pie CFLAGS="$RPM_OPT_FLAGS -fPIE"
@@ -24,21 +25,19 @@ export LDFLAGS=-pie CFLAGS="$RPM_OPT_FLAGS -fPIE"
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc NEWS FAQ THANKS TODO COPYING README ChangeLog
 %{_bindir}/*
 %{_mandir}/*/*
 
 %changelog
+* Thu Jun 19 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 0.23.3-8
+- Fix FTBFS with neon-0.30 (#992037, #1106029)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild