[Frugalware-git] frugalware-current: frugalwareutils-0.9.3-2-i686

[Miklos Vajna]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e50f70d93ba5ffd728bb8220aae9148e747303c6

commit e50f70d93ba5ffd728bb8220aae9148e747303c6
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Thu Dec 30 14:57:06 2010 +0100

frugalwareutils-0.9.3-2-i686

- git backport to add netconfig.service

diff --git a/source/base/frugalwareutils/FrugalBuild b/source/base/frugalwareutils/FrugalBuild
index 792e2ae..8a6a54f 100644
--- a/source/base/frugalwareutils/FrugalBuild
+++ b/source/base/frugalwareutils/FrugalBuild
@@ -7,7 +7,7 @@ USE_APIDOCS=${USE_APIDOCS:-"y"}
pkgname=frugalwareutils
pkgver=0.9.3
Fuse $USE_DEVEL && pkgver=0.8.7.6.g3d85830
-pkgrel=1
+pkgrel=2
pkgdesc="Frugalware configuration utilities."
url="http://ftp.frugalware.org/pub/other/frugalwareutils"
depends=('glib2>=2.16.4-2' 'ncurses>=5.6-4' 'parted>=1.8.8-3' \
@@ -20,8 +20,9 @@ replaces=('kxgenerator')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump $url|Flasttar"
if ! Fuse $USE_DEVEL; then
-	source=($url/$pkgname-$pkgver.tar.gz)
-	signatures=(${source[0]}.asc)
+	source=($url/$pkgname-$pkgver.tar.gz \
+		http://git.frugalware.org/patches/frugalwareutils/9f980d9.patch)
+	signatures=(${source[0]}.asc '')
else
_F_scm_type="git"
_F_scm_url="git://git.frugalware.org/pub/other/frugalwareutils/frugalwareutils"
@@ -41,4 +42,3 @@ build()
}

# optimization OK
-
diff --git a/source/base/frugalwareutils/frugalwareutils.install b/source/base/frugalwareutils/frugalwareutils.install
index c7a8635..a94ecad 100644
--- a/source/base/frugalwareutils/frugalwareutils.install
+++ b/source/base/frugalwareutils/frugalwareutils.install
@@ -1,11 +1,34 @@
+post_install()
+{
+	# don't use systemctl enable yet, it may not be available
+	ln -s '/lib/systemd/system/netconfig.service' '/etc/systemd/system/network.target.wants/netconfig.service'
+	ln -s '/lib/systemd/system/netconfig.service' '/etc/systemd/system/multi-user.target.wants/netconfig.service'
+	systemctl daemon-reload >/dev/null 2>&1
+}
+
post_upgrade()
{
-	# for systemd
+	systemctl daemon-reload >/dev/null 2>&1
+	systemctl try-restart netconfig.service >/dev/null 2>&1
+	# for systemd, can be removed after Frugalware-1.4 is out
if [ -f /etc/HOSTNAME -a ! -f /etc/hostname ]; then
cat /etc/HOSTNAME | cut -f1 -d . > /etc/hostname
fi
}

+pre_remove()
+{
+	systemctl stop netconfig.service >/dev/null 2>&1
+	# don't use systemctl disable yet, either
+	rm -f /etc/systemd/system/network.target.wants/netconfig.service
+	rm -f /etc/systemd/system/multi-user.target.wants/netconfig.service
+}
+
+post_remove()
+{
+	systemctl daemon-reload >/dev/null 2>&1
+}
+
op=$1
shift
$op $*