[Frugalware-git] systemd: avahi-0.6.28-1-i686 *version bump *enable systemd support *disable gtk3 support for now

bouleetbil bouleetbil at frogdev.info
Sun Nov 28 16:54:25 CET 2010


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=2a3bd64c0d69df2a3ff42d0296b18547af412350

commit 2a3bd64c0d69df2a3ff42d0296b18547af412350
Author: bouleetbil <bouleetbil at frogdev.info>
Date:   Sun Nov 28 16:58:07 2010 +0000

avahi-0.6.28-1-i686
*version bump
*enable systemd support
*disable gtk3 support for now

diff --git a/source/network/avahi/FrugalBuild b/source/network/avahi/FrugalBuild
index f76b404..d24faea 100644
--- a/source/network/avahi/FrugalBuild
+++ b/source/network/avahi/FrugalBuild
@@ -3,14 +3,14 @@
# Contributor: AlexExtreme <alex at alex-smith.me.uk>

pkgname=avahi
-pkgver=0.6.25
-pkgrel=4
+pkgver=0.6.28
+pkgrel=1
pkgdesc="A multicast/unicast DNS-SD framework"
archs=('i686' 'x86_64' 'ppc')
url="http://www.avahi.org"
groups=('network')
depends=('dbus-python>=0.80.2' 'libcap>=2.19' 'nss-mdns' 'gdbm' 'libdaemon>=0.12' 'shadow>=4.0.18.1-4' 'libssp')
-makedepends=('mono>=2.0.1' 'pygtk' 'qt>=3.3.8-11' 'libqtcore' 'gtk2-sharp>=2.12.10-2' 'intltool')
+makedepends=('intltool')
backup=(etc/avahi/avahi-daemon.conf)
conflicts=('mdnsresponder')
replaces=('mdnsresponder')
@@ -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=('7ce8ed5a494d72401dd81f64594fda59d2ec91fd' \
-          '926faad00a60b3208e4036c73e71f78dbc6dace9' \
-          '5f6b99e4917458b24736519bdd1e510763310589' \
-          '723e2e691d35063bd8aefeaf1063fdba812a9249' \
-          'b31a9b9bf972739d2976ef510690968851e8b588' \
+sha1sums=('5da3f7da2cff8ddf74f8746e4dcb2524e5047f67' \
'3cb0c4904bc323cba78234e4c5430478636fbf44')

subpkgs=('avahi-glib' 'avahi-sharp' 'avahi-qt3' 'avahi-python' 'avahi-compat' 'avahi-gtk2' 'avahi-qt4' 'avahi-dnsconfd' 'libavahi-ui' 'libavahi-ui-sharp')
@@ -33,9 +28,12 @@ subdescs=('Glib bindings for Avahi' 'Mono C# bindings for Avahi' 'QT3 bindings f
'Python bindings for Avahi' 'mDNSresponder and Howl compatibility libraries/headers for Avahi' \
'GUI GTK based tools for Avahi' 'QT4 bindings for Avahi' 'Discovers DNS servers broadcast with Avahi on a local network' \
'User interface library for Avahi' 'Mono bindings for Avahi-UI')
-subdepends=("glib2 $pkgname=$pkgver" "mono>=2.0.1 $pkgname=$pkgver" "qt $pkgname=$pkgver" "python>=2.7 $pkgname=$pkgver" "$pkgname=$pkgver" \
-	    "avahi-python=$pkgver libglade pygtk libavahi-ui=$pkgver avahi-glib=$pkgver" "libqtcore $pkgname=$pkgver" "$pkgname=$pkgver" \
-	    "gtk+2 $pkgname=$pkgver" "gtk2-sharp>=2.12.6 libavahi-ui=$pkgver")
+subdepends=("glib2" "mono>=2.8" "qt" "python>=2.7" "" \
+	    "libglade pygtk" "libqtcore" "" \
+	    "gtk+2" "gtk2-sharp>=2.12.6")
+subrodepends=("$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" " $pkgname=$pkgver" \
+	"$pkgname=$pkgver" "avahi-python=$pkgver libavahi-ui=$pkgver avahi-glib=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \
+	"$pkgname=$pkgver" "libavahi-ui=$pkgver")
subgroups=('network' 'apps-extra' 'xlib' 'network-extra' 'network' 'gnome-extra' 'lib-extra' 'network-extra' 'gnome' 'gnome-extra')
subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' \
'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc')
@@ -55,7 +53,9 @@ build() {
--enable-compat-howl \
--with-distro=none \
--with-avahi-priv-access-group=netdev \
-		--enable-autoipd
+		--enable-autoipd \
+		--with-systemdsystemunitdir=/lib/systemd/system \
+		--disable-gtk3
Fmakeinstall

rm -rf $MONO_SHARED_DIR
@@ -64,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
@@ -124,10 +120,10 @@ 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..49276c9 100644
--- a/source/network/avahi/avahi.install
+++ b/source/network/avahi/avahi.install
@@ -5,9 +5,7 @@ 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 enable avahi-daemon.service
}

post_upgrade()
@@ -21,14 +19,13 @@ post_upgrade()

pre_remove()
{
-	if [ -e /usr/sbin/chkconfig ] && [ -x /usr/sbin/chkconfig ]; then
-		/usr/sbin/chkconfig --del rc.avahi-daemon
-	fi
+
# 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
+	systemctl delete avahi-daemon.service
}

op=$1
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.extreme2 at 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.extreme2 at 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 <janny at frugalware.org>\n"
-"Language-Team: Frugalware Linux <frugalware-devel at 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.extreme2 at 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.extreme2 at 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 <janny at frugalware.org>\n"
-"Language-Team: Frugalware Linux <frugalware-devel at 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"


More information about the Frugalware-git mailing list