Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=b65ed576a22200bbf1315cd1b1b773e237d576c0
commit b65ed576a22200bbf1315cd1b1b773e237d576c0
Author: bouleetbil <bouleet...@frogdev.info>
Date: Fri Feb 25 18:22:56 2011 +0100
avahi-0.6.28-6-x86_64
*switch to systemd
diff --git a/source/network/avahi/FrugalBuild b/source/network/avahi/FrugalBuild
index e505808..544be7f 100644
--- a/source/network/avahi/FrugalBuild
+++ b/source/network/avahi/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=avahi
pkgver=0.6.28
-pkgrel=5
+pkgrel=6
pkgdesc="A multicast/unicast DNS-SD framework"
archs=('i686' 'x86_64' 'ppc')
url="http://www.avahi.org";
@@ -18,14 +18,9 @@ provides=('mdnsresponder')
up2date="lynx -dump http://avahi.org/download/ | Flasttar"
options=('scriptlet')
source=(http://avahi.org/download/$pkgname-$pkgver.tar.gz \
- rc.avahi-daemon{,-hu.po} rc.avahi-dnsconfd{,-hu.po} \
README.Frugalware)
Finclude mono
sha1sums=('5da3f7da2cff8ddf74f8746e4dcb2524e5047f67' \
- '926faad00a60b3208e4036c73e71f78dbc6dace9' \
- '5f6b99e4917458b24736519bdd1e510763310589' \
- '723e2e691d35063bd8aefeaf1063fdba812a9249' \
- 'b31a9b9bf972739d2976ef510690968851e8b588' \
'3cb0c4904bc323cba78234e4c5430478636fbf44')
subpkgs=('avahi-glib' 'avahi-sharp' 'avahi-qt3' 'avahi-python' 'avahi-compat'
'avahi-gtk2' 'avahi-qt4' 'avahi-dnsconfd' 'libavahi-ui' 'libavahi-ui-sharp'
'avahi-gtk3')
@@ -59,7 +54,8 @@ build() {
--enable-compat-howl \
--with-distro=none \
--with-avahi-priv-access-group=netdev \
- --enable-autoipd
+ --enable-autoipd \
+ --with-systemdsystemunitdir=/lib/systemd/system
Fmakeinstall
rm -rf $MONO_SHARED_DIR
@@ -68,10 +64,6 @@ build() {
Frm usr/bin/avahi-bookmarks
Frm usr/man/man1/avahi-bookmarks.*
- # Install the init scripts
- Frcd2 avahi-daemon
- Frcd2 avahi-dnsconfd
-
# Compatibility stuff
Fln avahi-compat-libdns_sd/dns_sd.h usr/include
Fln avahi-compat-howl usr/include/howl
@@ -132,10 +124,9 @@ build() {
# avahi-dnsconfd
Fsplit avahi-dnsconfd usr/sbin/avahi-dnsconfd
- Fsplit avahi-dnsconfd etc/rc.d/rc.avahi-dnsconfd
+ 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*
- Fsplit avahi-dnsconfd
lib/initscripts/messages/hu_HU/LC_MESSAGES/avahi-dnsconfd.mo
}
# optimization OK
diff --git a/source/network/avahi/avahi.install
b/source/network/avahi/avahi.install
index f0ec4f7..dae8cfe 100644
--- a/source/network/avahi/avahi.install
+++ b/source/network/avahi/avahi.install
@@ -5,9 +5,9 @@ post_install()
/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
- if [ -e /usr/sbin/chkconfig ] && [ -x /usr/sbin/chkconfig ]; then
- /usr/sbin/chkconfig --add rc.avahi-daemon
- 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
}
post_upgrade()
@@ -17,13 +17,15 @@ post_upgrade()
/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 try-restart avahi-daemon.service >/dev/null 2>&1
}
pre_remove()
{
- if [ -e /usr/sbin/chkconfig ] && [ -x /usr/sbin/chkconfig ]; then
- /usr/sbin/chkconfig --del rc.avahi-daemon
- fi
+ 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
diff --git a/source/network/avahi/rc.avahi-daemon
b/source/network/avahi/rc.avahi-daemon
deleted file mode 100644
index 4e76fbb..0000000
--- a/source/network/avahi/rc.avahi-daemon
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-# (c) 2006 Alex Smith <alex.extre...@gmail.com>
-# rc.avahi-daemon for Frugalware
-# distributed under GPL License
-
-# chkconfig: 2345 99 01
-# description: Avahi mDNS/DNS-SD Daemon
-
-source /lib/initscripts/functions
-TEXTDOMAIN=avahi-daemon
-TEXTDOMAINDIR=/lib/initscripts/messages
-
-actions=(restart start stop reload status)
-daemon=$"Avahi mDNS/DNS-SD Daemon"
-pid="pidof avahi-daemon 2> /dev/null"
-
-rc_start()
-{
- start_msg
- if [ -z "$(eval $pid)" ]; then
- /usr/sbin/avahi-daemon -D >> /dev/null 2>&1
- ok $?
- else
- ok 999
- fi
-}
-
-rc_stop()
-{
- stop_msg
- if [ -n "$(eval $pid)" ]; then
- /usr/sbin/avahi-daemon -k >> /dev/null 2>&1
- ok $?
- else
- ok 999
- fi
-}
-
-rc_reload()
-{
- msg $"Reloading services for $daemon"
- /usr/sbin/avahi-daemon -r >> /dev/null 2>&1
- ok $?
-}
-
-rc_exec $1
diff --git a/source/network/avahi/rc.avahi-daemon-hu.po
b/source/network/avahi/rc.avahi-daemon-hu.po
deleted file mode 100644
index b4a4398..0000000
--- a/source/network/avahi/rc.avahi-daemon-hu.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (C) 2006 Frugalware Linux
-# This file is distributed under the same license as the rc.avahi-daemon
package.
-# Alex Smith <alex.extre...@gmail.com>, 2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-04 18:50+0100\n"
-"PO-Revision-Date: 2006-06-04 18:50+0100\n"
-"Last-Translator: Janos Kovacs <ja...@frugalware.org>\n"
-"Language-Team: Frugalware Linux <frugalware-de...@frugalware.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: rc.avahi-daemon:15
-msgid "Avahi mDNS/DNS-SD Daemon"
-msgstr "Avahi mDNS/DNS-SD démon"
-
-#: rc.avahi-daemon:33
-#, sh-format
-msgid "Reloading services for $daemon"
-msgstr "$daemon szolgáltatások újratöltése"
-
diff --git a/source/network/avahi/rc.avahi-dnsconfd
b/source/network/avahi/rc.avahi-dnsconfd
deleted file mode 100644
index 88a210a..0000000
--- a/source/network/avahi/rc.avahi-dnsconfd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# (c) 2006 Alex Smith <alex.extre...@gmail.com>
-# rc.avahi-dnsconfd for Frugalware
-# distributed under GPL License
-
-# chkconfig: 2345 99 01
-# description: Avahi mDNS/DNS-SD Daemon
-
-source /lib/initscripts/functions
-TEXTDOMAIN=avahi-dnsconfd
-TEXTDOMAINDIR=/lib/initscripts/messages
-
-actions=(restart start stop reload)
-daemon=$"Avahi mDNS/DNS-SD DNS Server Configuration Daemon"
-
-rc_start()
-{
- start_msg
- /usr/sbin/avahi-dnsconfd -D >> /dev/null 2>&1
- ok $?
-}
-
-rc_stop()
-{
- stop_msg
- /usr/sbin/avahi-dnsconfd -k >> /dev/null 2>&1
- ok $?
-}
-
-rc_reload()
-{
- msg $"Reloading services for $daemon"
- /usr/sbin/avahi-dnsconfd -r >> /dev/null 2>&1
- ok $?
-}
-
-rc_exec $1
diff --git a/source/network/avahi/rc.avahi-dnsconfd-hu.po
b/source/network/avahi/rc.avahi-dnsconfd-hu.po
deleted file mode 100644
index 1dfc0c3..0000000
--- a/source/network/avahi/rc.avahi-dnsconfd-hu.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2006 Frugalware Linux
-# This file is distributed under the same license as the rc.avahi-daemon
package.
-# Alex Smith <alex.extre...@gmail.com>, 2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-04 18:50+0100\n"
-"PO-Revision-Date: 2006-06-04 18:50+0100\n"
-"Last-Translator: Janos Kovacs <ja...@frugalware.org>\n"
-"Language-Team: Frugalware Linux <frugalware-de...@frugalware.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: rc.avahi-dnsconfd:15
-msgid "Avahi mDNS/DNS-SD DNS Server Configuration Daemon"
-msgstr "Avahi mDNS/DNS-SD DNS Szerver Configurácios Démon"
-
-#: rc.avahi-dnsconfd:33
-#, sh-format
-msgid "Reloading services for $daemon"
-msgstr "$daemon szolgáltatások újratöltése"
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
