From 1298f9885964ff67ded9db142a2b532f5dede49f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 26 May 2012 16:14:34 +0200 Subject: [PATCH] libcanberra: rebuild against libudev-183. --- srcpkgs/libcanberra/libcanberra-devel.template | 16 +++++++--------- srcpkgs/libcanberra/libcanberra.rshlibs | 2 +- srcpkgs/libcanberra/template | 10 ++++------ 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/srcpkgs/libcanberra/libcanberra-devel.template b/srcpkgs/libcanberra/libcanberra-devel.template index d140235ebd4..219c5f47d22 100644 --- a/srcpkgs/libcanberra/libcanberra-devel.template +++ b/srcpkgs/libcanberra/libcanberra-devel.template @@ -1,17 +1,15 @@ # Template file for 'libcanberra-devel'. # -depends="pkg-config gtk+-devel libvorbis-devel libltdl-devel gstreamer-devel libxml2-devel alsa-lib-devel libcanberra" +noarch=yes +depends="pkg-config gtk+-devel libvorbis-devel libltdl-devel gstreamer-devel libxml2-devel alsa-lib-devel libcanberra>=$version" short_desc="${sourcepkg} (development files)" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/{lib,share} - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/{gtk-doc,vala} ${DESTDIR}/usr/share +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 } diff --git a/srcpkgs/libcanberra/libcanberra.rshlibs b/srcpkgs/libcanberra/libcanberra.rshlibs index 6611a2a7f43..a10bba41514 100644 --- a/srcpkgs/libcanberra/libcanberra.rshlibs +++ b/srcpkgs/libcanberra/libcanberra.rshlibs @@ -1,4 +1,3 @@ -libudev.so.0 libpthread.so.0 libc.so.6 libgtk-3.so.0 @@ -30,3 +29,4 @@ libgdk-3.so.0 libcairo-gobject.so.2 libgtk-x11-2.0.so.0 libgdk-x11-2.0.so.0 +libudev.so.1 diff --git a/srcpkgs/libcanberra/template b/srcpkgs/libcanberra/template index fbd7a512cb1..0bae2a5c50a 100644 --- a/srcpkgs/libcanberra/template +++ b/srcpkgs/libcanberra/template @@ -1,14 +1,16 @@ # Template build file for 'libcanberra'. pkgname=libcanberra version=0.28 -revision=11 +revision=12 distfiles="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$version.tar.gz" build_style=gnu-configure configure_args="--enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso --disable-lynx --disable-schemas-install --with-gconf-schema-file-dir=/usr/share/gconf/schemas --with-systemdsystemunitdir=/lib/systemd/system" -makedepends="pkg-config gtk+-devel gtk+3-devel libvorbis-devel libltdl-devel gstreamer-devel alsa-lib-devel tdb-devel pulseaudio-devel libudev-devel vala-devel GConf-devel" +makedepends="pkg-config gtk+-devel gtk+3-devel libvorbis-devel libltdl-devel gstreamer-devel alsa-lib-devel tdb-devel pulseaudio-devel libudev-devel>=183 vala-devel GConf-devel" +gconf_schemas="libcanberra.schemas" +subpackages="$pkgname-devel" short_desc="XDG Sound Theme and Name Specification library implementation" maintainer="Juan RP " checksum=eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c @@ -23,7 +25,3 @@ long_desc=" from Gtk+ applications 3. libcanberra-gtk-module: a Gtk+ module that uses libcanberra-gtk to trigger input feedback event sounds" - -gconf_schemas="libcanberra.schemas" -subpackages="$pkgname-devel" -