diff --git a/srcpkgs/libsoup/libsoup-devel.template b/srcpkgs/libsoup/libsoup-devel.template index c669092bb8..a864eedb05 100644 --- a/srcpkgs/libsoup/libsoup-devel.template +++ b/srcpkgs/libsoup/libsoup-devel.template @@ -1,16 +1,14 @@ # Template file for 'libsoup-devel'. # -depends="glib-devel libxml2-devel libsoup>=2.38.1" +noarch=yes +depends="glib-devel libxml2-devel libsoup>=${version}" short_desc="${sourcepkg} -- development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - -do_install() -{ +do_install() { mkdir -p ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/{include,share} ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib } diff --git a/srcpkgs/libsoup/libsoup-gnome-devel.template b/srcpkgs/libsoup/libsoup-gnome-devel.template index c3686bae5c..9860553cd5 100644 --- a/srcpkgs/libsoup/libsoup-gnome-devel.template +++ b/srcpkgs/libsoup/libsoup-gnome-devel.template @@ -1,21 +1,19 @@ # Template file for 'libsoup-gnome-devel'. # -depends="libsoup-devel>=2.38.1 libsoup-gnome>=2.38.1" +noarch=yes +depends="libsoup-devel>=${version} libsoup-gnome>=${version}" short_desc="${sourcepkg} - GNOME development files" long_desc="${long_desc} This package contains the GNOME support files for development: headers, static libs, etc." - -do_install() -{ +do_install() { mkdir -p ${DESTDIR}/usr/lib/pkgconfig \ ${DESTDIR}/usr/include ${DESTDIR}/usr/share/gir-1.0 mv ${SRCPKGDESTDIR}/usr/include/libsoup-gnome* \ ${DESTDIR}/usr/include - mv ${SRCPKGDESTDIR}/usr/lib/libsoup-gnome*.a ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/*gnome* \ ${DESTDIR}/usr/lib/pkgconfig mv ${SRCPKGDESTDIR}/usr/share/gir-1.0/SoupGNOME* \ diff --git a/srcpkgs/libsoup/template b/srcpkgs/libsoup/template index d6683c0a12..df1685ec38 100644 --- a/srcpkgs/libsoup/template +++ b/srcpkgs/libsoup/template @@ -1,16 +1,20 @@ # Template file for 'libsoup' pkgname=libsoup -version=2.38.1 -distfiles="${GNOME_SITE}/$pkgname/2.38/$pkgname-$version.tar.xz" +version=2.40.0 +revision=1 +subpackages="$pkgname-gnome $pkgname-gnome-devel $pkgname-devel" build_style=gnu-configure -makedepends="pkg-config intltool gobject-introspection glib-devel libgcrypt-devel libgpg-error-devel libxml2-devel gnutls-devel sqlite-devel libgnome-keyring-devel" +configure_args="--disable-static" +makedepends="pkg-config intltool gobject-introspection glib-devel +libgcrypt-devel libgpg-error-devel libxml2-devel gnutls-devel +sqlite-devel libgnome-keyring-devel>=3.6.0" fulldepends="glib-networking" -revision=2 short_desc="HTTP library implementation in C" maintainer="Juan RP " homepage="http://www.gnome.org" license="LGPL-2.1" -checksum=71b8923fc7a5fef9abc5420f7f3d666fdb589f43a8c50892d584d58b3c513f9a +distfiles="${GNOME_SITE}/$pkgname/2.40/$pkgname-$version.tar.xz" +checksum=ef65eb6d48e9525ad0fb82f964d3001e86921330317b51082d3dd0afc41d2ea9 long_desc=" Libsoup is an HTTP library implementation in C. It was originally part of a SOAP (Simple Object Access Protocol) implementation called Soup, but @@ -31,7 +35,3 @@ long_desc=" * Client support for Digest, NTLM, and Basic authentication * HTTP server * Server support for Digest and Basic authentication" - -subpackages="$pkgname-gnome $pkgname-gnome-devel $pkgname-devel" - -