diff --git a/davfs2-1.4.7-neon-0.30.patch b/davfs2-1.4.7-neon-0.30.patch index ba86d6c..04a3836 100644 --- a/davfs2-1.4.7-neon-0.30.patch +++ b/davfs2-1.4.7-neon-0.30.patch @@ -1,16 +1,6 @@ ---- 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 +diff -up davfs2-1.4.7/configure.neon-0.30 davfs2-1.4.7/configure +--- davfs2-1.4.7/configure.neon-0.30 2013-09-19 16:45:19.211971780 -0400 ++++ davfs2-1.4.7/configure 2013-09-19 16:45:00.330561265 -0400 @@ -5952,7 +5952,7 @@ fi $as_echo "$ne_cv_lib_neon" >&6; } if test "$ne_cv_lib_neon" = "yes"; then @@ -20,3 +10,34 @@ case $ne_libver in 0.$v.*) ne_cv_lib_neonver=yes ;; esac +@@ -6135,8 +6135,8 @@ fi + neon_got_library=yes + + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: incompatible neon library version $ne_libver: wanted 0.25 26 27 28 29" >&5 +-$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.25 26 27 28 29" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: incompatible neon library version $ne_libver: wanted 0.25 26 27 28 29 30" >&5 ++$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.25 26 27 28 29 30" >&6;} + neon_got_library=no + fi + +@@ -6192,7 +6192,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 +@@ -6375,8 +6375,8 @@ fi + neon_got_library=yes + + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: incompatible neon library version $ne_libver: wanted 0.25 26 27 28 29" >&5 +-$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.25 26 27 28 29" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: incompatible neon library version $ne_libver: wanted 0.25 26 27 28 29 30" >&5 ++$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.25 26 27 28 29 30" >&6;} + neon_got_library=no + fi + diff --git a/davfs2.spec b/davfs2.spec index fee79aa..3b5c1b3 100644 --- a/davfs2.spec +++ b/davfs2.spec @@ -26,13 +26,7 @@ as a disk drive. %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 +%patch1 -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing"