From a09f9fc71575761cd4f68bff65c1013b49ed13b4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 20 Apr 2012 09:21:39 +0200 Subject: [PATCH] lightdm: disable static, fix -devel rundeps. --- srcpkgs/lightdm/depends | 2 +- srcpkgs/lightdm/liblightdm-gobject.template | 5 +++-- srcpkgs/lightdm/liblightdm-qt.template | 4 ++-- srcpkgs/lightdm/lightdm-devel.template | 17 ++++++++++------- srcpkgs/lightdm/template | 3 ++- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/srcpkgs/lightdm/depends b/srcpkgs/lightdm/depends index 44887df2334..c3ff5923bcd 100644 --- a/srcpkgs/lightdm/depends +++ b/srcpkgs/lightdm/depends @@ -1,2 +1,2 @@ -abi_depends=">=1.0.6" +abi_depends=">=1.2.2_1" api_depends="${abi_depends}" diff --git a/srcpkgs/lightdm/liblightdm-gobject.template b/srcpkgs/lightdm/liblightdm-gobject.template index f4ce68a64ca..ebf6a212ee6 100644 --- a/srcpkgs/lightdm/liblightdm-gobject.template +++ b/srcpkgs/lightdm/liblightdm-gobject.template @@ -5,8 +5,9 @@ long_desc="${long_desc} This package contains the GObject support library for LightDM." -do_install() -{ +revision=1 + +do_install() { vmove "usr/lib/liblightdm-gobject*.so*" usr/lib vmove usr/lib/girepository-1.0 usr/lib } diff --git a/srcpkgs/lightdm/liblightdm-qt.template b/srcpkgs/lightdm/liblightdm-qt.template index 4ccda2adee6..76d27e63dd5 100644 --- a/srcpkgs/lightdm/liblightdm-qt.template +++ b/srcpkgs/lightdm/liblightdm-qt.template @@ -5,8 +5,8 @@ long_desc="${long_desc} This package contains the QT support library for LightDM." +revision=1 -do_install() -{ +do_install() { vmove "usr/lib/liblightdm-qt*.so*" usr/lib } diff --git a/srcpkgs/lightdm/lightdm-devel.template b/srcpkgs/lightdm/lightdm-devel.template index d5ff7679420..0e855ca1967 100644 --- a/srcpkgs/lightdm/lightdm-devel.template +++ b/srcpkgs/lightdm/lightdm-devel.template @@ -6,12 +6,15 @@ long_desc="${long_desc} This package contains headers, static libs, etc for LightDM." Add_dependency run glib-devel +Add_dependency run liblightdm-gobject ">=${version}" +Add_dependency run liblightdm-qt ">=${version}" -do_install() -{ - mkdir -p ${DESTDIR}/usr/{lib,share} - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/{vala*,gir*,gtk-doc} ${DESTDIR}/usr/share +revision=1 + +do_install() { + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove usr/share/gtk-doc usr/share + vmove usr/share/vala usr/share + vmove usr/share/gir-1.0 usr/share } diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template index 3925dc88718..27888e59296 100644 --- a/srcpkgs/lightdm/template +++ b/srcpkgs/lightdm/template @@ -1,10 +1,11 @@ # Template file for 'lightdm' pkgname=lightdm version=1.2.2 +revision=1 homepage="https://launchpad.net/lightdm" distfiles="https://launchpad.net/lightdm/1.2/$version/+download/$pkgname-$version.tar.gz" build_style=gnu-configure -configure_args="--with-greeter-user=lightdm" +configure_args="--with-greeter-user=lightdm --disable-static" short_desc="Light Display Manager" maintainer="Juan RP " license="GPL-3, LGPL-3"