From eaa1f0c2f499d6b72839514bd473973da0cb7393 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 26 Feb 2010 14:01:21 +0000
Subject: main/dhcp: ship dhcrelay init script in proper package (cherry picked
 from commit 8a458ebd3d4aaace24eea9afedeee514fd3f1ac8)

---
 main/dhcp/APKBUILD | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'main')

diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index d2e70085..33f4e853 100644
--- a/main/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=dhcp
 pkgver=4.1.0_p1
 _realver=4.1.0p1
-pkgrel=7
+pkgrel=8
 pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)"
 url="https://www.isc.org/"
 license="GPL"
@@ -62,11 +62,14 @@ dhclient() {
 
 dhcrelay() {
 	pkgdesc="ISC dhcp relay server"
+	replaces="dhcp"
 	install -d "$pkgdir"/var/run/dhcp
 	install -d "$subpkgdir"/usr/sbin
 	mv "$pkgdir"/usr/sbin/dhcrelay "$subpkgdir"/usr/sbin/
-	install -m755 -D "$srcdir"/dhcrelay.initd "$pkgdir"/etc/init.d/dhcrelay
-	install -m644 -D "$srcdir"/dhcrelay.confd "$pkgdir"/etc/conf.d/dhcrelay
+	install -m755 -D "$srcdir"/dhcrelay.initd \
+		"$subpkgdir"/etc/init.d/dhcrelay
+	install -m644 -D "$srcdir"/dhcrelay.confd \
+		"$subpkgdir"/etc/conf.d/dhcrelay
 }
 
 md5sums="325ff8338c5a21f89d5304ac13ffebdf  dhcp-4.1.0p1.tar.gz
-- 
cgit v1.2.3