Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=openjava.git;a=commitdiff;h=709e66fe96e67f49559b2983e629ac69933ac7b5
commit 709e66fe96e67f49559b2983e629ac69933ac7b5
Author: James Buren <r...@frugalware.org>
Date: Wed Jun 6 07:29:07 2012 -0500
avahi-0.6.31-4-x86_64
* convert to systemd schema
diff --git a/source/network/avahi/FrugalBuild b/source/network/avahi/FrugalBuild
index d102a8d..34f87c6 100644
--- a/source/network/avahi/FrugalBuild
+++ b/source/network/avahi/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=avahi
pkgver=0.6.31
-pkgrel=3
+pkgrel=4
pkgdesc="A multicast/unicast DNS-SD framework"
archs=('i686' 'x86_64')
url="http://www.avahi.org";
@@ -19,6 +19,9 @@ up2date="lynx -dump http://avahi.org/download/ | Flasttar"
options=('scriptlet')
source=(http://avahi.org/download/$pkgname-$pkgver.tar.gz \
README.Frugalware)
+_F_systemd_scriptlet="$pkgname.install"
+_F_systemd_units=(avahi-daemon=e avahi-dnsconfd=e)
+Finclude systemd
Finclude mono
sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684' \
'3cb0c4904bc323cba78234e4c5430478636fbf44')
@@ -38,6 +41,7 @@ subrodepends=("$pkgname=$pkgver" "$pkgname=$pkgver" "
$pkgname=$pkgver" \
subgroups=('network' 'apps-extra' 'network-extra' 'network' 'gnome-extra'
'lib-extra' 'network-extra' 'gnome' 'gnome-extra' 'gnome')
subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64'
'i686 x86_64' \
'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64')
+subinstall=("" "" "" "" "" "" "$install" "" "" "")
unset MAKEFLAGS
@@ -123,6 +127,8 @@ build() {
Fsplit avahi-dnsconfd lib/systemd/system/avahi-dnsconfd.service
Fsplit avahi-dnsconfd etc/avahi/avahi-dnsconfd.action
Fsplit avahi-dnsconfd usr/share/man/man8/avahi-dnsconfd*
+
+ Fgenscriptlet
}
# optimization OK
diff --git a/source/network/avahi/avahi.install
b/source/network/avahi/avahi.install
index b4e91ec..1ffba74 100644
--- a/source/network/avahi/avahi.install
+++ b/source/network/avahi/avahi.install
@@ -1,40 +1,71 @@
+sysvinit_units=(@_F_sysvinit_units@)
+systemd_units=(@_F_systemd_units@)
+
post_install()
{
- # Add the group and user if not there
if ! grep -q 'avahi' /etc/group; then
/usr/sbin/groupadd -g 84 avahi 2>/dev/null
/usr/sbin/useradd -s /bin/false -c "Avahi daemon" -d / -u 84 -g avahi avahi
2>/dev/null
fi
- systemctl daemon-reload >/dev/null 2>&1
- systemctl enable avahi-daemon.service >/dev/null 2>&1
- systemctl start avahi-daemon.service >/dev/null 2>&1
+
+ local unit
+ local op
+
+ for i in ${sysvinit_units[@]}; do
+ chkconfig --del rc.$i >/dev/null 2>&1
+ done
+
+ for i in ${systemd_units[@]}; do
+ unit=$(echo $i | cut -f 1 -d '=')
+ op=$(echo $i | cut -f 2 -d '=')
+ if echo $op | grep -q 'e'; then
+ systemctl enable $unit.service >/dev/null 2>&1
+ fi
+ if echo $op | grep -q 's'; then
+ systemctl start $unit.service >/dev/null 2>&1
+ fi
+ done
}
post_upgrade()
{
- # Add the group and user if not there
if ! grep -q 'avahi' /etc/group; then
/usr/sbin/groupadd -g 84 avahi 2>/dev/null
/usr/sbin/useradd -s /bin/false -c "Avahi daemon" -d / -u 84 -g avahi avahi
2>/dev/null
fi
+
+ for i in ${sysvinit_units[@]}; do
+ chkconfig --del rc.$i >/dev/null 2>&1
+ done
+
systemctl daemon-reload >/dev/null 2>&1
- systemctl try-restart avahi-daemon.service >/dev/null 2>&1
- systemctl enable avahi-daemon.service >/dev/null 2>&1
}
pre_remove()
{
- systemctl daemon-reload >/dev/null 2>&1
- systemctl stop avahi-daemon.service >/dev/null 2>&1
- systemctl del avahi-daemon.service >/dev/null 2>&1
- # Maybe already removed?
if grep -q 'avahi' /etc/group; then
/usr/sbin/userdel avahi 2>/dev/null
/usr/sbin/groupdel avahi 2>/dev/null
fi
+
+ local unit
+
+ for i in ${sysvinit_units[@]}; do
+ chkconfig --del rc.$i >/dev/null 2>&1
+ done
+
+ for i in ${systemd_units[@]}; do
+ unit=$(echo $i | cut -f 1 -d '=')
+ systemctl --no-reload disable $unit.service >/dev/null 2>&1
+ systemctl stop $unit.service >/dev/null 2>&1
+ done
+}
+
+post_remove()
+{
+ systemctl daemon-reload >/dev/null 2>&1
}
op=$1
shift
-
$op $*
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
