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

commit 53d9919bb96c0a037412f882a93196486564ee21
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Sun May 8 13:48:03 2011 +0200

netkit-base-0.17-8-i686

- /etc/hostname was not owned by this package, fix it

diff --git a/source/base/netkit-base/FrugalBuild 
b/source/base/netkit-base/FrugalBuild
index b43f456..6567cd4 100644
--- a/source/base/netkit-base/FrugalBuild
+++ b/source/base/netkit-base/FrugalBuild
@@ -4,13 +4,14 @@

pkgname=netkit-base
pkgver=0.17
-pkgrel=7
+pkgrel=8
pkgdesc="This is netkit-base for Linux"
url="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit";
groups=('base')
+removes=('etc/hostname')
archs=('i686' 'x86_64' 'ppc' 'arm')
depends=('glibc>=2.8-3')
-backup=(etc/{HOSTNAME,hosts,networks,nntpserver,protocols,resolv.conf,services}
 etc/hosts.{conf,allow,deny,equiv})
+backup=(etc/{HOSTNAME,hostname,hosts,networks,nntpserver,protocols,resolv.conf,services}
 etc/hosts.{conf,allow,deny,equiv})
up2date="wget --passive-ftp -O - -q 
ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/|grep 
netkit-base.*tar.gz|sed -n -e 's/.*>netkit-base-\(.*\)\.tar\.gz.*/\1/' -e '1 p'"
source=(ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-$pkgver.tar.gz
 \
protocols services netdate.tar.gz netdate.diff)
@@ -29,8 +30,10 @@ build()
install -m644 
etc.sample/{host.conf,hosts,hosts.allow,hosts.deny,hosts.equiv,networks,nntpserver}
 \
$Fdestdir/etc || Fdie
install -m644 $Fsrcdir/{protocols,services} $Fdestdir/etc || Fdie
-       grep -v domain etc.sample/resolv.conf > $startdir/pkg/etc/resolv.conf 
|| Fdie
-       echo "frugalware.local" > $startdir/pkg/etc/HOSTNAME || Fdie
+       grep -v domain etc.sample/resolv.conf > $Fdestdir/etc/resolv.conf || 
Fdie
+       # this will go away after Frugalware-1.5
+       echo "frugalware.local" > $Fdestdir/etc/HOSTNAME || Fdie
+       echo "frugalware" > $Fdestdir/etc/hostname || Fdie

cd ../netdate || Fdie
Fbuild
diff --git a/source/base/netkit-base/netkit-base.install 
b/source/base/netkit-base/netkit-base.install
new file mode 100644
index 0000000..ab77065
--- /dev/null
+++ b/source/base/netkit-base/netkit-base.install
@@ -0,0 +1,16 @@
+post_install()
+{
+       # can be removed after Frugalware-1.5 is out
+       if [ -f /etc/HOSTNAME  ]; then
+               cat /etc/HOSTNAME | cut -f1 -d . > /etc/hostname
+       fi
+}
+
+post_upgrade()
+{
+       post_install
+}
+
+op=$1
+shift
+$op $*
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to