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

[Gaetan Bisson]

    Date: Thursday, August 19, 2010 @ 15:44:20
  Author: bisson
Revision: 88141

removed unneeded libglade optdepends+makedepends
removed patching of the pkg-config file (I cannot reproduce the bug of FS#18451 which introduced this patch)
cleaner install script

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

---------------+
 PKGBUILD      |    4 +---
 avahi.install |   45 ++++++++++++---------------------------------
 2 files changed, 13 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-19 19:25:26 UTC (rev 88140)
+++ PKGBUILD	2010-08-19 19:44:20 UTC (rev 88141)
@@ -10,7 +10,6 @@
 license=('LGPL')
 depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
 optdepends=('gtk2: avahi-discover-standalone'
-            'libglade: avahi-discover, avahi-discover-standalone'
             'qt3: qt3 bindings'
             'qt: qt bindings'
             'pygtk: avahi-bookmarks, avahi-discover'
@@ -18,7 +17,7 @@
             'mono: mono bindings'
             'dbus-python: avahi-discover'
             'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'qt3' 'pygtk' 'mono' 'libglade' 'intltool' 'dbus-python' 'gtk-sharp-2')
+makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' 'gtk-sharp-2')
 backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
 install=avahi.install
 conflicts=('howl' 'mdnsresponder')
@@ -35,7 +34,6 @@
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  sed -i 's/Requires.private/Requires/' avahi-qt4.pc.in
   sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
   patch -p0 < ../avahi-daemon-dbus.patch
 

Modified: avahi.install
===================================================================
--- avahi.install	2010-08-19 19:25:26 UTC (rev 88140)
+++ avahi.install	2010-08-19 19:44:20 UTC (rev 88141)
@@ -1,42 +1,21 @@
 post_install() {
-  echo -n "adding avahi system group... "
-  groupadd -g 84 avahi && echo "done."
-  echo -n "adding avahi system user... "
-  useradd -c "Avahi daemon" -u 84 -d / -g avahi -s /bin/false avahi \
-    && echo "done."
-  passwd -l 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
 
-  post_upgrade
-  cat << 'EOM'
+  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.
- -> avahi-dnsconfd - daemon used for peer-to-peer automatic dns
-                     configuration on dhcp-less networks.
+==> avahi-daemon: the mdns responder, you probably want this.
+==>               dbus needs to be running when you start it.
+==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns
+==>                 configuration on dhcp-less networks.
 
 ==> To use some of the client applications you will have to install python.
- -> In addition, pygtk is required for the graphical ones and
-    twisted-web for avahi-bookmarks.
-
-EOM
+==> In addition, pygtk is required for the graphical ones and
+==> twisted for avahi-bookmarks.
+EOF
 }
 
-post_upgrade() {
-  true
-}
-
-pre_remove() {
-  # pre_remove gets called whenever post_remove is defined.
-  true
-}
-
 post_remove() {
-  # post_remove doesn't start at a newline like the other post_* functions,
-  # so we'll have to make one for ourselves.
-  echo -n -e "\nremoving avahi system user... "
-  userdel avahi && echo "done."
+  getent passwd avahi &>/dev/null && userdel avahi >/dev/null
+  getent group avahi &>/dev/null && groupdel avahi >/dev/null
 }
-
-op=$1
-shift
-$op $*