diff --git a/neon-0.27.0-multilib.patch b/neon-0.27.0-multilib.patch deleted file mode 100644 index 5f8f86d9b4979e4d2eaec958715d8a9af2a97ecd..0000000000000000000000000000000000000000 --- a/neon-0.27.0-multilib.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- neon-0.27.0/neon-config.in.multilib -+++ neon-0.27.0/neon-config.in -@@ -5,7 +5,11 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - includedir=@includedir@ --libdir=@libdir@ -+ -+libdir=`pkg-config --variable=libdir neon` -+CFLAGS=`pkg-config --cflags neon` -+LIBS=`pkg-config --libs neon` -+has_lfs=`pkg-config --variable=has_lfs neon` - - usage() - { -@@ -23,7 +27,7 @@ - --support FEATURE exit with success if feature is supported - - Known features: -- dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [@NE_FLAG_LFS@], -+ dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [${has_lfs}], - i18n [@NE_FLAG_I18N@], ts_ssl [@NE_FLAG_TS_SSL@] - - EOF -@@ -69,11 +73,10 @@ - ;; - - --cflags) -- echo -I${includedir}/neon @NEON_CFLAGS@ -+ echo ${CFLAGS} - ;; - - --libs) -- LIBS="-lneon @NEON_LIBS@" - # Don't add standard library paths - if test "$prefix" != "/usr"; then - LIBS="-L${libdir} ${LIBS}" -@@ -93,7 +96,7 @@ - zlib|ZLIB) support @NE_FLAG_ZLIB@ ;; - ipv6|IPV6) support @NE_FLAG_IPV6@ ;; - dav|DAV) support @NE_FLAG_DAV@ ;; -- lfs|LFS) support @NE_FLAG_LFS@ ;; -+ lfs|LFS) support ${has_lfs} ;; - i18n|I18N) support @NE_FLAG_I18N@ ;; - ts_ssl|TS_SSL) support @NE_FLAG_TS_SSL@ ;; - *) support no ;; ---- neon-0.27.0/neon.pc.in.multilib -+++ neon-0.27.0/neon.pc.in -@@ -2,6 +2,7 @@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ -+has_lfs=@NE_FLAG_LFS@ - - Name: neon - Description: HTTP/WebDAV client library diff --git a/neon-0.30.2-lockprintf.patch b/neon-0.30.2-lockprintf.patch deleted file mode 100644 index 389fc24068da613634a775f88b3729f899253cf3..0000000000000000000000000000000000000000 --- a/neon-0.30.2-lockprintf.patch +++ /dev/null @@ -1,22 +0,0 @@ - -Supress gcc warnings. - ---- neon-0.30.2/test/lock.c.lockprintf -+++ neon-0.30.2/test/lock.c -@@ -73,11 +73,11 @@ - const char *token_href) - { - static char buf[BUFSIZ]; -- sprintf(buf, -- "\n" -- "" -- "%s\n", -- activelock(scope, depth, owner, timeout, token_href)); -+ ne_snprintf(buf, sizeof buf, -+ "\n" -+ "" -+ "%s\n", -+ activelock(scope, depth, owner, timeout, token_href)); - return buf; - } - diff --git a/neon-0.30.2-sysuioh.patch b/neon-0.30.2-sysuioh.patch deleted file mode 100644 index 3501da9404c06945c5581c94c1935ea1504f5a4c..0000000000000000000000000000000000000000 --- a/neon-0.30.2-sysuioh.patch +++ /dev/null @@ -1,14 +0,0 @@ - -https://bugzilla.redhat.com/show_bug.cgi?id=1572180 - ---- neon-0.30.2/src/ne_socket.c.sysuioh -+++ neon-0.30.2/src/ne_socket.c -@@ -27,7 +27,7 @@ - #include "config.h" - - #include --#ifdef HAVE_SYS_UIO_h -+#ifdef HAVE_SYS_UIO_H - #include /* writev(2) */ - #endif - #ifdef HAVE_SYS_TIME_H diff --git a/neon.spec b/neon.spec index 87a38038571d6ad301279a6fec14efa1646df2ea..4b079f07a67738d0d7834e449909a9181def177e 100644 --- a/neon.spec +++ b/neon.spec @@ -1,16 +1,11 @@ Name: neon Version: 0.30.2 -Release: 9 +Release: 10 Summary: An HTTP and WebDAV client library License: LGPLv2+ URL: http://www.webdav.org/neon/ Source0: http://www.webdav.org/neon/neon-%{version}.tar.gz -# These patches are from fedora: https://src.fedoraproject.org/rpms/neon/tree/f29 -Patch0: neon-0.27.0-multilib.patch -Patch1: neon-0.30.2-sysuioh.patch -Patch2: neon-0.30.2-lockprintf.patch - BuildRequires: git openssl-devel expat-devel gdb-headless Requires: ca-certificates @@ -83,5 +78,8 @@ sed -ri "/^dependency_libs/{s,-l[^ ']*,,g}" \ %{_mandir}/man3/* %changelog +* Tue Jan 21 2020 Lei Zhang - 0.30.2-10 +- remove useless patchs + * Wed Nov 13 2019 openEuler Buildteam - 0.30.2-9 - Package init