Compare commits
10 Commits
dfdd999a18
...
e47ae11333
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e47ae11333 | ||
|
|
c26002b3ac | ||
|
|
00ed89590c | ||
|
|
5aedbee59a | ||
|
|
eb5dbee756 | ||
|
|
0dd338afa1 | ||
|
|
1a62252c37 | ||
|
|
699ff561ff | ||
|
|
d762ce6789 | ||
|
|
1a03a11d77 |
@ -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,
|
||||
- "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
|
||||
- "<D:prop xmlns:D=\"DAV:\">"
|
||||
- "<D:lockdiscovery>%s</D:lockdiscovery></D:prop>\n",
|
||||
- activelock(scope, depth, owner, timeout, token_href));
|
||||
+ ne_snprintf(buf, sizeof buf,
|
||||
+ "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
|
||||
+ "<D:prop xmlns:D=\"DAV:\">"
|
||||
+ "<D:lockdiscovery>%s</D:lockdiscovery></D:prop>\n",
|
||||
+ activelock(scope, depth, owner, timeout, token_href));
|
||||
return buf;
|
||||
}
|
||||
|
||||
@ -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 <sys/types.h>
|
||||
-#ifdef HAVE_SYS_UIO_h
|
||||
+#ifdef HAVE_SYS_UIO_H
|
||||
#include <sys/uio.h> /* writev(2) */
|
||||
#endif
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
--- neon-0.27.0/neon-config.in.multilib
|
||||
+++ neon-0.27.0/neon-config.in
|
||||
--- neon-0.32.2/neon-config.in.multilib
|
||||
+++ neon-0.32.2/neon-config.in
|
||||
@@ -5,7 +5,11 @@
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
@ -22,7 +22,7 @@
|
||||
i18n [@NE_FLAG_I18N@], ts_ssl [@NE_FLAG_TS_SSL@]
|
||||
|
||||
EOF
|
||||
@@ -69,11 +73,10 @@
|
||||
@@ -69,16 +73,11 @@
|
||||
;;
|
||||
|
||||
--cflags)
|
||||
@ -32,10 +32,16 @@
|
||||
|
||||
--libs)
|
||||
- LIBS="-lneon @NEON_LIBS@"
|
||||
# Don't add standard library paths
|
||||
if test "$prefix" != "/usr"; then
|
||||
LIBS="-L${libdir} ${LIBS}"
|
||||
@@ -93,7 +96,7 @@
|
||||
- # Don't add standard library paths
|
||||
- if test "$prefix" != "/usr"; then
|
||||
- LIBS="-L${libdir} ${LIBS}"
|
||||
- fi
|
||||
- echo @user_LDFLAGS@ ${LIBS}
|
||||
+ echo ${LIBS}
|
||||
;;
|
||||
|
||||
--la-file)
|
||||
@@ -93,7 +92,7 @@
|
||||
zlib|ZLIB) support @NE_FLAG_ZLIB@ ;;
|
||||
ipv6|IPV6) support @NE_FLAG_IPV6@ ;;
|
||||
dav|DAV) support @NE_FLAG_DAV@ ;;
|
||||
@ -44,8 +50,8 @@
|
||||
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
|
||||
--- neon-0.32.2/neon.pc.in.multilib
|
||||
+++ neon-0.32.2/neon.pc.in
|
||||
@@ -2,6 +2,7 @@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
BIN
neon-0.32.5.tar.gz
Normal file
BIN
neon-0.32.5.tar.gz
Normal file
Binary file not shown.
43
neon.spec
43
neon.spec
@ -1,18 +1,17 @@
|
||||
# Disable automatic .la file removal
|
||||
%global __brp_remove_la_files %nil
|
||||
|
||||
Name: neon
|
||||
Version: 0.30.2
|
||||
Release: 12
|
||||
Version: 0.32.5
|
||||
Release: 1
|
||||
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
|
||||
URL: https://notroj.github.io/neon/
|
||||
Source0: https://notroj.github.io/neon/%{name}-%{version}.tar.gz
|
||||
Patch0: neon-0.32.2-multilib.patch
|
||||
|
||||
# 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: gcc openssl-devel expat-devel gdb-headless
|
||||
Requires: ca-certificates
|
||||
BuildRequires: gcc openssl-devel expat-devel gdb-headless zlib-devel krb5-devel
|
||||
BuildRequires: pkgconfig make xmlto pakchois-devel libproxy-devel
|
||||
|
||||
%description
|
||||
neon is an HTTP and WebDAV client library, with a C interface. Features:\
|
||||
@ -47,7 +46,7 @@ The %{name}-help package conatins man manual etc
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
sed -ibak '/^install-docs/s/install-html//' Makefile.in
|
||||
sed -i '/^install-docs/s/install-html//' Makefile.in
|
||||
|
||||
%build
|
||||
export CC="%{__cc} -pthread"
|
||||
@ -59,15 +58,17 @@ export CC="%{__cc} -pthread"
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
%make_install INSTALL="install -p"
|
||||
%make_install
|
||||
|
||||
sed -ri "/^dependency_libs/{s,-l[^ ']*,,g}" \
|
||||
$RPM_BUILD_ROOT%{_libdir}/libneon.la
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files -f %{name}.lang
|
||||
%doc BUGS TODO NEWS README THANKS
|
||||
%doc BUGS TODO NEWS README* THANKS
|
||||
%license AUTHORS src/COPYING.LIB
|
||||
%{_libdir}/*.so.*
|
||||
|
||||
@ -83,7 +84,19 @@ sed -ri "/^dependency_libs/{s,-l[^ ']*,,g}" \
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%changelog
|
||||
* Sat Dec 24 2022 Wei Chen <chenwei@xfuson.com> - 0.30.2-12
|
||||
* Thu May 18 2023 liyanan <thistleslyn@163.com> - 0.32.5-1
|
||||
- update to 0.32.5
|
||||
|
||||
* Fri Dec 30 2022 Guangzhong Yao <yaoguangzhong@xfusion.com> - 0.30.2-15
|
||||
- DESC: backport neon.mak: Silence deprecation/POSIX warnings
|
||||
|
||||
* Thu Dec 29 2022 Guangzhong Yao <yaoguangzhong@xfusion.com> - 0.30.2-14
|
||||
- DESC: backport neon.mak Replace GX with EHsc
|
||||
|
||||
* Thu Dec 29 2022 Guangzhong Yao <yaoguangzhong@xfusion.com> - 0.30.2-13
|
||||
- DESC: backport Switch to destroy_and_wait() in various places
|
||||
|
||||
* Sat Dec 24 2022 Wei Chen <chenwei@xfusion.com> - 0.30.2-12
|
||||
- DESC: fix invalid changelog information
|
||||
|
||||
* Mon Aug 02 2021 chenyanpanHW <chenyanpan@huawei.com> - 0.30.2-11
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user