From 17290a7f99089326306b27d4713c5f4e5e7550c3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 22 Apr 2010 14:53:48 +0200 Subject: [PATCH] udev: disable introspection, move so symlink into main pkg. --HG-- extra : convert_revision : 625785e571895df2f0830c176dda2014d3e79b08 --- srcpkgs/udev/libgudev-devel.template | 5 ++--- srcpkgs/udev/libudev-devel.template | 3 ++- srcpkgs/udev/libudev.template | 4 +++- srcpkgs/udev/template | 3 +-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/srcpkgs/udev/libgudev-devel.template b/srcpkgs/udev/libgudev-devel.template index 4620d5b2daf..f60920ea6be 100644 --- a/srcpkgs/udev/libgudev-devel.template +++ b/srcpkgs/udev/libgudev-devel.template @@ -1,11 +1,12 @@ # Template file for 'udev-glib-devel'. # -short_desc="${short_desc} (development glib bindings)" +short_desc="${short_desc} - development glib bindings" long_desc="${long_desc} This package contains the libgudev development files (static libs, headers, etc), a library to interact with udev through the GLib bindings." +revision=1 replaces="udev-glib-devel>=0" Add_dependency run libudev-devel Add_dependency run glib-devel @@ -20,6 +21,4 @@ do_install() ${DESTDIR}/usr/share/gtk-doc/html mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/gudev* \ ${DESTDIR}/usr/lib/pkgconfig - mv ${SRCPKGDESTDIR}/usr/lib/girepository* ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/gir* ${DESTDIR}/usr/share } diff --git a/srcpkgs/udev/libudev-devel.template b/srcpkgs/udev/libudev-devel.template index c341a56280d..97890774b19 100644 --- a/srcpkgs/udev/libudev-devel.template +++ b/srcpkgs/udev/libudev-devel.template @@ -6,6 +6,7 @@ long_desc="${long_desc} This package contains the files needed for developing applications that use libudev." +revision=1 replaces="udev-devel>=0" Add_dependency run glibc-devel Add_dependency run libudev @@ -16,7 +17,7 @@ do_install() ${DESTDIR}/usr/include ${DESTDIR}/lib \ ${DESTDIR}/usr/share/gtk-doc/html mv ${SRCPKGDESTDIR}/usr/include/libudev* ${DESTDIR}/usr/include - mv ${SRCPKGDESTDIR}/lib/libudev* ${DESTDIR}/lib + mv ${SRCPKGDESTDIR}/lib/libudev*.a ${DESTDIR}/lib mv ${SRCPKGDESTDIR}/usr/share/gtk-doc/html/libudev \ ${DESTDIR}/usr/share/gtk-doc/html mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/libudev* \ diff --git a/srcpkgs/udev/libudev.template b/srcpkgs/udev/libudev.template index 55cc6cddae9..3080f4b045d 100644 --- a/srcpkgs/udev/libudev.template +++ b/srcpkgs/udev/libudev.template @@ -5,10 +5,12 @@ long_desc="${long_desc} This library provides access to udev device information." +revision=1 + Add_dependency run glibc do_install() { mkdir -p ${DESTDIR}/lib - mv ${SRCPKGDESTDIR}/lib/libudev*.so.* ${DESTDIR}/lib + mv ${SRCPKGDESTDIR}/lib/libudev*.so* ${DESTDIR}/lib } diff --git a/srcpkgs/udev/template b/srcpkgs/udev/template index 6bbd197ee76..4fd69c40e29 100644 --- a/srcpkgs/udev/template +++ b/srcpkgs/udev/template @@ -5,7 +5,7 @@ revision=1 distfiles="${KERNEL_SITE}/utils/kernel/hotplug/udev-${version}.tar.bz2" build_style=gnu_configure configure_args="--exec-prefix= --without-selinux --libexecdir=/lib/udev - --with-rootlibdir=/lib" + --with-rootlibdir=/lib --disable-introspection" short_desc="A userspace implementation of devfs" maintainer="Juan RP " checksum=d37a94e75b962182ce940e4a839f07b1c7024dbe7e4b870a120bf0fe9ed0d55d @@ -29,7 +29,6 @@ Add_dependency build pkg-config Add_dependency build libtool Add_dependency build gperf Add_dependency build glib-devel -Add_dependency build gobject-introspection-devel Add_dependency build acl-devel Add_dependency build glib-devel Add_dependency build libusb-compat-devel