diff --git a/multimedia/converter/soundconverter/pspec.xml b/multimedia/converter/soundconverter/pspec.xml index 42bb0122a6..018fda9643 100644 --- a/multimedia/converter/soundconverter/pspec.xml +++ b/multimedia/converter/soundconverter/pspec.xml @@ -42,7 +42,6 @@ /usr/lib /usr/share /usr/share/locale - /usr/share/man /usr/share/doc diff --git a/network/misc/neon/actions.py b/network/misc/neon/actions.py index 862674661c..fbcba6d44b 100644 --- a/network/misc/neon/actions.py +++ b/network/misc/neon/actions.py @@ -2,27 +2,28 @@ # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import get +from pisi.actionsapi import autotools, pisitools, get + +i = ''.join([ + ' --prefix=/usr', + ' --with-expat', + ' --without-{gssapi,libproxy}', + ' --with-ssl=openssl', + ' --with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt', + ' --enable-threadsafe-ssl=posix', + ' --enable-shared', + ' --enable-static=no ' + ]) def setup(): - autotools.configure("--with-libxml2 \ - --with-expat \ - --without-gssapi \ - --without-libproxy \ - --with-ssl=openssl \ - --with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt \ - --enable-threadsafe-ssl=posix \ - --enable-shared \ - --disable-static") + autotools.configure(i) def build(): autotools.make() def install(): - autotools.install() + autotools.rawInstall("DESTDIR=%s docdir=/usr/share/doc/neon" % get.installDIR()) - pisitools.dodoc("THANKS", "TODO", "ChangeLog", "AUTHORS", "BUGS", "NEWS", "README.md", "doc/*.txt") + pisitools.dodoc("AUTHORS", "THANKS") diff --git a/network/misc/neon/files/fixdocdir.patch b/network/misc/neon/files/fixdocdir.patch deleted file mode 100644 index 16a81d125d..0000000000 --- a/network/misc/neon/files/fixdocdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2009-01-29 03:13:36.000000000 +0200 -+++ Makefile.in 2009-05-02 03:14:18.000000000 +0300 -@@ -22,7 +22,7 @@ - man3dir = $(mandir)/man3 - datarootdir = @datarootdir@ - datadir = @datadir@ --docdir = $(datadir)/doc/neon-@NEON_VERSION@ -+docdir = $(datadir)/doc/neon - includedir = @includedir@ - neonincludes = $(includedir)/neon - pkgconfigdir = $(libdir)/pkgconfig diff --git a/network/misc/neon/files/multilib.patch b/network/misc/neon/files/multilib.patch deleted file mode 100644 index 9514ec6809..0000000000 --- a/network/misc/neon/files/multilib.patch +++ /dev/null @@ -1,57 +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/network/misc/neon/pspec.xml b/network/misc/neon/pspec.xml index c88f8c7ff6..231c336b53 100644 --- a/network/misc/neon/pspec.xml +++ b/network/misc/neon/pspec.xml @@ -1,27 +1,25 @@ - + neon - http://www.webdav.org/neon/ + https://notroj.github.io/neon/ PisiLinux Community admins@pisilinux.org GPLv2 library - HTTP and WebDAV client library - neon is an HTTP and WebDAV client library with a C interface; providing a high-level interface to HTTP and WebDAV methods along with a low-level interface for HTTP request handling. - https://notroj.github.io/neon/neon-0.31.2.tar.gz + HTTP and WebDAV client library. + neon is an HTTP/1.1 and WebDAV client library, with a C interface. + https://notroj.github.io/neon/neon-0.34.0.tar.gz - openssl-devel - expat-devel zlib-devel - mit-kerberos + expat-devel + openssl-devel - fixdocdir.patch - multilib.patch + @@ -33,11 +31,8 @@ openssl - /usr/bin /usr/lib - /usr/share/locale - /usr/share/doc - /usr/share/man + /usr/share @@ -45,15 +40,27 @@ neon-devel Development files for neon + zlib-devel + expat-devel + openssl-devel neon + /usr/bin/neon-config /usr/include /usr/lib/pkgconfig + /usr/share/man/man1 + + 2025-02-10 + 0.34.0 + Version bump. + İdris Kalp + idriskalp@gmail.com + 2024-12-18 0.31.2