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

[Gaetan Bisson]

    Date: Tuesday, February 19, 2013 @ 02:56:07
  Author: bisson
Revision: 178284

ready for qt4; waiting on FS#33921

Modified:
  avahi/trunk/PKGBUILD
  avahi/trunk/install

----------+
 PKGBUILD |   12 ++++++++----
 install  |   11 ++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-19 01:54:39 UTC (rev 178283)
+++ PKGBUILD	2013-02-19 01:56:07 UTC (rev 178284)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=5
+pkgrel=6
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
@@ -15,13 +15,13 @@
             'gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
             'gtk2: gtk2 bindings'
             'qt3: qt3 bindings'
-            'qt: qt bindings'
+            'qt4: qt4 bindings'
             'pygtk: avahi-bookmarks, avahi-discover'
             'twisted: avahi-bookmarks'
             'mono: mono bindings'
             'python2-dbus: avahi-discover'
             'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'python2-dbus'
+makedepends=('qt3' 'qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus'
              'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman')
 backup=('etc/avahi/hosts'
         'etc/avahi/avahi-daemon.conf'
@@ -43,9 +43,13 @@
 	sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
 	patch -p1 -i ../rc.d.patch
 
+	export MOC_QT3=/opt/qt/bin/moc
+	export MOC_QT4=/usr/lib/qt4/bin/moc
+	source /etc/profile.d/qt3.sh
+	source /etc/profile.d/qt4.sh
+
 	# pygtk requires python2; make it explicit in case other python are installed: FS#21865
 	PYTHON=python2 \
-	PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \

Modified: install
===================================================================
--- install	2013-02-19 01:54:39 UTC (rev 178283)
+++ install	2013-02-19 01:56:07 UTC (rev 178284)
@@ -1,8 +1,8 @@
 post_install() {
-  getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
-  getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null
+	getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
+	getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null
 
-  cat <<EOF
+	cat <<EOF
 ==> The following daemons may be added to DAEMONS in /etc/rc.conf:
 ==> avahi-daemon: the mdns responder, you probably want this.
 ==>               dbus needs to be running when you start it.
@@ -16,6 +16,7 @@
 }
 
 post_remove() {
-  getent passwd avahi &>/dev/null && userdel avahi >/dev/null
-  getent group avahi &>/dev/null && groupdel avahi >/dev/null
+	getent passwd avahi &>/dev/null && userdel avahi >/dev/null
+	getent group avahi &>/dev/null && groupdel avahi >/dev/null
+	true
 }