- disable neon/webdav as we always did

diff --git a/rpm-5.4.10-fix-neon-saving-error-pages-as-target-file.patch b/rpm-5.4.10-fix-neon-saving-error-pages-as-target-file.patch
index b2adfcdf23b9e358416249d9701dfd34e601043b..2f4602d4e705bb7292692eaa4c48b825298dee25 100644 (file)
--- a/rpm-5.4.10-fix-neon-saving-error-pages-as-target-file.patch
+++ b/rpm-5.4.10-fix-neon-saving-error-pages-as-target-file.patch
@@ -49,7 +49,7 @@
 -          fd = fdLink(fd, "error ctrl (ufdOpen HTTP)");
 -          fd = fdLink(fd, "error data (ufdOpen HTTP)");
 +          fd = u->ctrl = fdLink(fd, "error ctrl (ufdOpen HTTP)");
-+          fd = u->data fdLink(fd, "error data (ufdOpen HTTP)");
++          fd = u->data = fdLink(fd, "error data (ufdOpen HTTP)");
 +#endif
        } else {
            fd->bytesRemain = ((!strcmp(cmd, "GET"))

diff --git a/rpm.spec b/rpm.spec
index ed8948475ea373fa0752c18062300529c65a9963..dda8a547a7ffff22a68c82283c5c49afe887d218 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -12,7 +12,7 @@
 %bcond_without python          # don't build python bindings
 %bcond_without selinux         # build without selinux support
 %bcond_without suggest_tags    # build without Suggest tag (bootstrapping)
-%bcond_without neon            # build with HTTP/WebDAV support (neon library)
+%bcond_with    neon            # build with HTTP/WebDAV support (neon library)
 %bcond_without db              # BerkeleyDB
 %bcond_without sqlite          # build with SQLite support
 %bcond_with    sqlite_dbapi    # default database backend is sqlite