[davfs2] Fix FTBFS with neon 0.30.0 in Fedora 20 (#992110)

[Paul Howarth]

commit 7aeee3aa6652a81e1bd3ed8b17d058c3cf7d734f
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Sep 13 16:53:34 2013 +0100

    Fix FTBFS with neon 0.30.0 in Fedora 20 (#992110)
    
    - Add support for building with neon 0.30 (#992110)
    - Use -fno-strict-aliasing

 davfs2-1.4.7-neon-0.30.patch |   22 ++++++++++++++++++++++
 davfs2.spec                  |   18 +++++++++++++++---
 2 files changed, 37 insertions(+), 3 deletions(-)
---
diff --git a/davfs2-1.4.7-neon-0.30.patch b/davfs2-1.4.7-neon-0.30.patch
new file mode 100644
index 0000000..ba86d6c
--- /dev/null
+++ b/davfs2-1.4.7-neon-0.30.patch
@@ -0,0 +1,22 @@
+--- configure.ac
++++ configure.ac
+@@ -36,7 +36,7 @@ AC_PROG_LN_S
+ # Checks for libraries.
+ AM_GNU_GETTEXT_VERSION(0.14.4)
+ AM_GNU_GETTEXT([external])
+-NE_REQUIRE_VERSIONS([0], [25 26 27 28 29])
++NE_REQUIRE_VERSIONS([0], [25 26 27 28 29 30])
+ DAV_CHECK_NEON
+ 
+ # Checks for header files.
+--- configure
++++ configure
+@@ -5952,7 +5952,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 25 26 27 28 29; do
++       for v in 25 26 27 28 29 30; do
+           case $ne_libver in
+           0.$v.*) ne_cv_lib_neonver=yes ;;
+           esac
diff --git a/davfs2.spec b/davfs2.spec
index f31e6a1..fee79aa 100644
--- a/davfs2.spec
+++ b/davfs2.spec
@@ -6,6 +6,7 @@ Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://savannah.nongnu.org/projects/davfs2
 Source0:        http://download.savannah.gnu.org/releases/davfs2/davfs2-1.4.7.tar.gz
+Patch1:         davfs2-1.4.7-neon-0.30.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Conflicts:      filesystem < 3
@@ -24,7 +25,17 @@ as a disk drive.
 %prep
 %setup -q
 
+# Add support for neon 0.30.0
+%patch1
+
+# Don't try to run autotools after patching
+touch aclocal.m4
+touch config.h.in
+touch Makefile.in
+touch configure
+
 %build
+export CFLAGS="%{optflags} -fno-strict-aliasing"
 %configure ssbindir=%{_sbindir}
 make
 
@@ -86,8 +97,9 @@ exit 0
 %ghost %dir %attr(01775,root,%{groupname}) %{piddir}
 
 %changelog
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+* Fri Sep 13 2013 Paul Howarth <paul at city-fan.org> - 1.4.7-2
+- Add support for building with neon 0.30.0 (#992110)
+- Use -fno-strict-aliasing
 
 * Tue Feb 26 2013 Erik Logtenberg <erik at logtenberg.eu> - 1.4.7-1
 - New upstream release
@@ -101,7 +113,7 @@ exit 0
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
 * Sat Jun 2 2012 Will Woods <wwoods at redhat.com> 1.4.6-4
-- Mark /var/cache/davfs2 and /var/run/mount.davfs %ghost (#656570)
+- Mark /var/cache/davfs2 and /var/run/mount.davfs %%ghost (#656570)
 - Fix 'cannot stat `/usr/share/davfs2/davfs2.conf'' warning (#783788)
 
 * Wed Jan 25 2012 Harald Hoyer <harald at redhat.com> 1.4.6-3