]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
distro/rpm: use upstream packaging files
authorTomas Krizek <tomas.krizek@nic.cz>
Fri, 10 Aug 2018 11:50:28 +0000 (13:50 +0200)
committerTomas Krizek <tomas.krizek@nic.cz>
Fri, 10 Aug 2018 11:50:28 +0000 (13:50 +0200)
distro/rpm/knot-resolver.spec
distro/rpm/kresd.conf [deleted symlink]
distro/rpm/root.keys [deleted symlink]

index 693090613e4a1f8a34567ec683a1afa6d56ba798..97ef32421821bda5b5236a03fdf3d241dff06a72 100644 (file)
@@ -21,9 +21,6 @@ ExclusiveArch:        %{ix86} x86_64
 ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
 %endif
 
-Source2:        kresd.conf
-Source3:        root.keys
-
 %if 0%{GPG_CHECK}
 Source1:        knot-resolver-%{version}.tar.xz.asc
 # PGP keys used to sign upstream releases
@@ -135,8 +132,8 @@ chmod 0644 %{buildroot}%{_pkgdocdir}/config.*
 # install configuration files
 mkdir -p %{buildroot}%{_sysconfdir}
 install -m 0755 -d %{buildroot}%{_sysconfdir}/knot-resolver
-install -m 0644 -p %SOURCE2 %{buildroot}%{_sysconfdir}/knot-resolver/kresd.conf
-install -m 0664 -p %SOURCE3 %{buildroot}%{_sysconfdir}/knot-resolver/root.keys
+install -m 0644 -p %{repodir}/distro/common/kresd.conf %{buildroot}%{_sysconfdir}/knot-resolver/kresd.conf
+install -m 0664 -p %{repodir}/distro/common/root.keys %{buildroot}%{_sysconfdir}/knot-resolver/root.keys
 
 # install systemd units and doc
 mkdir -p %{buildroot}%{_unitdir}
diff --git a/distro/rpm/kresd.conf b/distro/rpm/kresd.conf
deleted file mode 120000 (symlink)
index 2fc64a4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../common/kresd.conf
\ No newline at end of file
diff --git a/distro/rpm/root.keys b/distro/rpm/root.keys
deleted file mode 120000 (symlink)
index 2d4a6bd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../common/root.keys
\ No newline at end of file