[arch-commits] Commit in colord/trunk (PKGBUILD)

[Jan Steffens]

    Date: Monday, March 18, 2013 @ 23:05:22
  Author: heftig
Revision: 180251

FS#34348 backup /etc/colord.conf; FS#34349 disable volume search by default; Unsplit sane as it needs UseSANE to be set anyway

Modified:
  colord/trunk/PKGBUILD

----------+
 PKGBUILD |   27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-18 21:44:06 UTC (rev 180250)
+++ PKGBUILD	2013-03-18 22:05:22 UTC (rev 180251)
@@ -2,17 +2,19 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 
-pkgbase=colord
-pkgname=(colord colord-sane)
+pkgname=colord
 pkgver=0.1.30
-pkgrel=1
+pkgrel=2
 pkgdesc="System daemon for managing color devices"
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/software/colord"
 license=(GPL2)
 depends=(lcms2 libgusb polkit shared-color-profiles sqlite udev dconf dbus)
 makedepends=(intltool gobject-introspection vala docbook2x sane)
+optdepends=('sane: UseSANE support [/etc/colord.conf]')
 options=('!libtool')
+install=colord.install
+backup=(etc/colord.conf)
 source=($url/releases/$pkgname-$pkgver.tar.xz)
 sha1sums=('54442a4736192aab65a7fa306142ae1cc30cda15')
 
@@ -26,29 +28,14 @@
     --sysconfdir=/etc --libexecdir=/usr/lib/colord \
     --localstatedir=/var --disable-static \
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --enable-vala --enable-sane
+    --enable-vala --enable-sane --disable-volume-search
   make
 }
 
-package_colord() {
-  install=colord.install
-
+package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install \
     bashcompletiondir=/usr/share/bash-completion/completions
-
-# Split colord-sane
-  cd ..
-  mkdir -p sane/usr/lib/colord{,-plugins}
-  mv {"$pkgdir","$srcdir/sane"}/usr/lib/colord/colord-sane
-  mv {"$pkgdir","$srcdir/sane"}/usr/lib/colord-plugins/libcd_plugin_sane.so
 }
 
-package_colord-sane() {
-  pkgdesc=("SANE plugin for colord")
-  depends=(colord sane)
-
-  mv sane/* "$pkgdir"
-}
-
 # vim:set ts=2 sw=2 et: