[litmus] Fix for https://bugzilla.redhat.com/show_bug.cgi?id=992143

Alejandro Alvarez aalvarez at fedoraproject.org
Fri Aug 30 08:04:10 UTC 2013


commit ab831d0846b1493300041a5667c5b84d01db74ab
Author: aalvarez <alejandro.alvarez.ayllon at cern.ch>
Date:   Fri Aug 30 10:03:33 2013 +0200

    Fix for https://bugzilla.redhat.com/show_bug.cgi?id=992143

 litmus-neon30.patch |   12 ++++++++++++
 litmus.spec         |   15 +++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
---
diff --git a/litmus-neon30.patch b/litmus-neon30.patch
new file mode 100644
index 0000000..1c23fd5
--- /dev/null
+++ b/litmus-neon30.patch
@@ -0,0 +1,12 @@
+diff -ru litmus-0.13/configure.ac litmus-0.13-patched/configure.ac
+--- litmus-0.13/configure.ac	2011-12-09 11:33:14.000000000 +0100
++++ litmus-0.13-patched/configure.ac	2013-08-30 09:27:41.099267463 +0200
+@@ -20,7 +20,7 @@
+ dnl List of tests
+ AC_SUBST([TESTS], ["basic copymove props locks http"])
+ 
+-NE_REQUIRE_VERSIONS([0], [25 26 27 28 29])
++NE_REQUIRE_VERSIONS([0], [25 26 27 28 29 30])
+ NEON_WITHOUT_ZLIB
+ NEON_WITHOUT_ACL
+ NEON_TEST
diff --git a/litmus.spec b/litmus.spec
index 016befd..be0a7c4 100644
--- a/litmus.spec
+++ b/litmus.spec
@@ -1,6 +1,6 @@
 Name:		litmus
 Version:	0.13
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	WebDAV server compliance test suite
 Group:		Applications/Internet
 License:	GPLv2+
@@ -10,8 +10,12 @@ Source0:	http://www.webdav.org/neon/litmus/%{name}-%{version}.tar.gz
 # Upstream has applied this in neon svn repo (bundled in litmus build).
 # http://lists.manyfish.co.uk/pipermail/neon-commits/2011-December/000947.html
 Patch0:		litmus-i18n.patch
+# Fix build with neon 0.30
+Patch1:		litmus-neon30.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- 
+
+
+BuildRequires:	automake
 BuildRequires:	neon-devel
 
 %description
@@ -21,11 +25,13 @@ compliant with the WebDAV protocol as specified in RFC2518.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 # Making sure we use system libs, not bundled ones
 find ./lib -name '*.c' -o -name '*.h' | xargs rm -rf
 
 %build
+./autogen.sh
 %configure --with-neon=%{_prefix}
 
 make %{?_smp_mflags}
@@ -47,6 +53,11 @@ rm -rf %{buildroot}
 %doc COPYING FAQ README THANKS TODO
 
 %changelog
+* Fri Aug 30 2013 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 0.13-9
+- Patched litmus to build with Neon 0.30
+- Run autogen.sh to re-generate the configure scripts
+- Fixes https://bugzilla.redhat.com/show_bug.cgi?id=992143
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list