From 4303b00902905eabab90d326b91ca7b668dcce0c Mon Sep 17 00:00:00 2001 From: Juan RP <xtraeme@gmail.com> Date: Sat, 6 Oct 2012 11:36:18 +0200 Subject: [PATCH] colord: split shared lib to libcolord subpkg. --- common/shlibs | 2 +- srcpkgs/colord/colord-devel.template | 2 +- srcpkgs/colord/colord.rshlibs | 1 + srcpkgs/colord/libcolord.rshlibs | 9 +++++++++ srcpkgs/colord/libcolord.template | 12 ++++++++++++ srcpkgs/colord/template | 6 +++--- srcpkgs/libcolord | 1 + 7 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/colord/libcolord.rshlibs create mode 100644 srcpkgs/colord/libcolord.template create mode 120000 srcpkgs/libcolord diff --git a/common/shlibs b/common/shlibs index ceaae5406c..3b8e53f199 100644 --- a/common/shlibs +++ b/common/shlibs @@ -778,7 +778,7 @@ libsocialweb-keyfob.so.0 libsocialweb-0.25.19_1 libsocialweb-keystore.so.0 libsocialweb-0.25.19_1 libsocialweb-client.so.2 libsocialweb-0.25.19_1 liblcms2.so.2 lcms2-2.2_1 -libcolord.so.1 colord-0.1.12_1 +libcolord.so.1 libcolord-0.1.23_3 libnm-gtk.so.0 libnm-gtk-0.9.1.95_1 libcaribou.so.0 caribou-0.4.0_1 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1 diff --git a/srcpkgs/colord/colord-devel.template b/srcpkgs/colord/colord-devel.template index 9816ae830e..4b48e560f0 100644 --- a/srcpkgs/colord/colord-devel.template +++ b/srcpkgs/colord/colord-devel.template @@ -1,7 +1,7 @@ # Template file for 'colord-devel'. # noarch=yes -depends="dbus-devel glib-devel lcms2-devel colord>=$version" +depends="dbus-devel glib-devel lcms2-devel libcolord>=${version}_${revision}" short_desc="${sourcepkg} - development files" long_desc="${long_desc} diff --git a/srcpkgs/colord/colord.rshlibs b/srcpkgs/colord/colord.rshlibs index aa12222a6e..a0db20e835 100644 --- a/srcpkgs/colord/colord.rshlibs +++ b/srcpkgs/colord/colord.rshlibs @@ -1,3 +1,4 @@ +libcolord.so.1 libgobject-2.0.so.0 libglib-2.0.so.0 libpthread.so.0 diff --git a/srcpkgs/colord/libcolord.rshlibs b/srcpkgs/colord/libcolord.rshlibs new file mode 100644 index 0000000000..18f84d6743 --- /dev/null +++ b/srcpkgs/colord/libcolord.rshlibs @@ -0,0 +1,9 @@ +liblcms2.so.2 +libgthread-2.0.so.0 +libgio-2.0.so.0 +libgobject-2.0.so.0 +libgmodule-2.0.so.0 +librt.so.1 +libglib-2.0.so.0 +libpthread.so.0 +libc.so.6 diff --git a/srcpkgs/colord/libcolord.template b/srcpkgs/colord/libcolord.template new file mode 100644 index 0000000000..49e91136ae --- /dev/null +++ b/srcpkgs/colord/libcolord.template @@ -0,0 +1,12 @@ +# Template file for 'colord-devel'. +# +short_desc="${sourcepkg} - runtime library" +long_desc="${long_desc} + + This package contains the runtime library." + +replaces="colord<0.1.23_3" + +do_install() { + vmove "usr/lib/*.so*" usr/lib +} diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template index 4f69d33cae..914fa398fa 100644 --- a/srcpkgs/colord/template +++ b/srcpkgs/colord/template @@ -1,7 +1,7 @@ # Template file for 'colord' pkgname=colord version=0.1.23 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-volume-search" @@ -9,9 +9,9 @@ depends="dbus sane" makedepends="pkg-config intltool gobject-introspection docbook2x sqlite-devel vala-devel libgudev-devel polkit-devel lcms2-devel libusb-devel dbus-devel libgusb-devel sane-devel" -fulldepends="shared-color-profiles udev" +fulldepends="shared-color-profiles systemd" conf_files="/etc/colord.conf" -subpackages="$pkgname-devel" +subpackages="libcolord colord-devel" short_desc="Color daemon" maintainer="Juan RP <xtraeme@gmail.com>" homepage="http://www.freedesktop.org/software/colord" diff --git a/srcpkgs/libcolord b/srcpkgs/libcolord new file mode 120000 index 0000000000..402828e7ef --- /dev/null +++ b/srcpkgs/libcolord @@ -0,0 +1 @@ +colord \ No newline at end of file