From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Fri, 10 Aug 2018 11:48:15 +0000 (+0200)
Subject: distro/arch: use upstream packaging files
X-Git-Tag: v3.0.0~8^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1d4cdb6ab53bfa87e1f6e02ed12ffb4a17fabbf;p=thirdparty%2Fknot-resolver.git

distro/arch: use upstream packaging files
---

diff --git a/distro/arch/PKGBUILD b/distro/arch/PKGBUILD
index 5ecdb6816..3279abb0c 100644
--- a/distro/arch/PKGBUILD
+++ b/distro/arch/PKGBUILD
@@ -12,24 +12,20 @@ backup=('etc/knot-resolver/kresd.conf')
 options=(debug strip)
 install=install
 depends=('cmocka'
-	 'gnutls'
+         'gnutls'
          'knot>=2.6.7'
-	 'libedit'
-	 'libsystemd'
+         'libedit'
+         'libsystemd'
          'libuv'
-	 'lmdb'
-	 'lua51-sec'
-	 'lua51-socket'
-	 'luajit')
-source=("knot-resolver_${pkgver}.orig.tar.xz"
-        "kresd.conf"
-	"root.keys")
+         'lmdb'
+         'lua51-sec'
+         'lua51-socket'
+         'luajit')
+source=("knot-resolver_${pkgver}.orig.tar.xz")
 
 _makevars="PREFIX=/usr SBINDIR=/usr/bin LIBDIR=/usr/lib INCLUDEDIR=/usr/include ETCDIR=/etc/knot-resolver V=1"
 
-sha256sums=('SKIP'
-	    'SKIP'
-	    '06c74ef5ef53344c78c9af2b29dc458a2abe93f1bff429705955c033e7a0686f')
+sha256sums=('SKIP')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
@@ -55,6 +51,6 @@ package() {
 	install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/systemd/kresd.systemd.7" "${pkgdir}/usr/share/man/man7/kresd.systemd.7"
 	install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/tmpfiles/knot-resolver.conf" "${pkgdir}/usr/lib/tmpfiles.d/knot-resolver.conf"
 	install -dm 0775 "${pkgdir}/etc/knot-resolver"
-	install -Dm 0644 "${srcdir}/kresd.conf" "${pkgdir}/etc/knot-resolver/kresd.conf"
-	install -Dm 0664 "${srcdir}/root.keys" "${pkgdir}/etc/knot-resolver/root.keys"
+	install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/kresd.conf" "${pkgdir}/etc/knot-resolver/kresd.conf"
+	install -Dm 0664 "${srcdir}/${pkgname}-${pkgver}/distro/common/root.keys" "${pkgdir}/etc/knot-resolver/root.keys"
 }
diff --git a/distro/arch/kresd.conf b/distro/arch/kresd.conf
deleted file mode 120000
index 2fc64a42a..000000000
--- a/distro/arch/kresd.conf
+++ /dev/null
@@ -1 +0,0 @@
-../common/kresd.conf
\ No newline at end of file
diff --git a/distro/arch/root.keys b/distro/arch/root.keys
deleted file mode 120000
index 2d4a6bdad..000000000
--- a/distro/arch/root.keys
+++ /dev/null
@@ -1 +0,0 @@
-../common/root.keys
\ No newline at end of file