meson: distro - fix OBS build

diff --git a/distro/deb/control b/distro/deb/control
index 3437ab35de6e88b9b9b0276893d07b47c3b4d9db..42453b485944250495aabfd698d2b799457af941 100644 (file)
--- a/distro/deb/control
+++ b/distro/deb/control
@@ -16,7 +16,7 @@ Build-Depends:
  libuv1-dev,
  luajit,
  pkg-config,
- meson,
+ meson (>= 0.46),
  doxygen,
  python3-breathe,
  python3-sphinx,

diff --git a/distro/deb/knot-resolver-doc.docs b/distro/deb/knot-resolver-doc.docs
index ac44141da260d7130f8b188907401877a8b0103b..baa81f7c68c49826ed5a8f86dde1278775b4e529 100644 (file)
--- a/distro/deb/knot-resolver-doc.docs
+++ b/distro/deb/knot-resolver-doc.docs
@@ -1 +1 @@
-usr/share/doc/knot-resolver/html/*
+debian/tmp/usr/share/doc/knot-resolver/html/*

diff --git a/distro/deb/knot-resolver.docs b/distro/deb/knot-resolver.docs
index b6d7d68baaf202bd816bc6372031e479e9b17d48..12da4a5790f96d053a02ed35a710d5053e4542f2 100644 (file)
--- a/distro/deb/knot-resolver.docs
+++ b/distro/deb/knot-resolver.docs
@@ -1 +1,4 @@
-usr/share/doc/knot-resolver/*
+debian/tmp/usr/share/doc/knot-resolver/AUTHORS
+debian/tmp/usr/share/doc/knot-resolver/COPYING
+debian/tmp/usr/share/doc/knot-resolver/NEWS
+debian/tmp/usr/share/doc/knot-resolver/examples/*

diff --git a/distro/deb/knot-resolver.manpages b/distro/deb/knot-resolver.manpages
index 58ed33d0de1ae840eb7f4cfce685f4b746197c61..101a4acf6cf18c61d0fc1b75854f57a3f3379ac7 100644 (file)
--- a/distro/deb/knot-resolver.manpages
+++ b/distro/deb/knot-resolver.manpages
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/man/man8/kresd.8
-debian/tmp/usr/share/man/man7/kresd.systemd.7
+debian/tmp/usr/share/man/man8/kresd.8*
+debian/tmp/usr/share/man/man7/kresd.systemd.7*

diff --git a/distro/deb/not-installed b/distro/deb/not-installed
index 9e66fbb6687a87dbdbe3178cee05563356e18496..141cce6c58b7b5759085d21280bfac81f92a133c 100644 (file)
--- a/distro/deb/not-installed
+++ b/distro/deb/not-installed
@@ -1 +1,2 @@
 usr/lib/knot-resolver/kres_modules/http/LICENSE
+debian/tmp/usr/share/doc/knot-resolver/html/.buildinfo

diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index 45dda33e5fa1aa64cb61cccc7b432564852bdc1a..12482113e8219de2b6db78a1d9a9cc9b151aee8b 100644 (file)
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -119,7 +119,7 @@ gpg2 --verify %{SOURCE1} %{SOURCE0}
 %setup -q -n %{name}-%{version}
 
 %build
-meson build_rpm \
+CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" meson build_rpm \
 %if "x%{?rhel}" == "x"
     -Ddoc=enabled \
     -Dsystemd_unit_files=enabled \
@@ -136,8 +136,6 @@ meson build_rpm \
     --libdir="%{_libdir}" \
     --includedir="%{_includedir}" \
     --sysconfdir="%{_sysconfdir}" \
-    -Dc_args="%{optflags}"\
-    -Dc_link_args="%{?__global_ldflags}"
 
 %{NINJA} -v -C build_rpm
 %if "x%{?rhel}" == "x"
@@ -155,20 +153,19 @@ install -m 0755 -d %{buildroot}%{_unitdir}/multi-user.target.wants
 ln -s ../kresd.target %{buildroot}%{_unitdir}/multi-user.target.wants/kresd.target
 
 # install .tmpfiles.d dirs
-#mkdir -p %{buildroot}%{_localstatedir}/cache
 install -m 0750 -d %{buildroot}%{_localstatedir}/cache/%{name}
 install -m 0750 -d %{buildroot}/run/%{name}
 
-
 # remove http module (missing dependencies)
 rm -r %{buildroot}%{_libdir}/knot-resolver/kres_modules/http
 rm -r %{buildroot}%{_libdir}/knot-resolver/kres_modules/http.lua
 rm -r %{buildroot}%{_libdir}/knot-resolver/kres_modules/http_trace.lua
 rm -r %{buildroot}%{_libdir}/knot-resolver/kres_modules/prometheus.lua
 
-# rename doc directory for centos 7
-%if 0%{?rhel}
-mv %{buildroot}/%{_docdir}/%{name} %{buildroot}/%{_pkgdocdir}
+# rename doc directory for centos, opensuse
+%if "x%{?fedora}" == "x"
+install -m 755 -d %{buildroot}/%{_pkgdocdir}
+mv %{buildroot}/%{_datadir}/doc/%{name}/* %{buildroot}/%{_pkgdocdir}/
 %endif
 
 %pre
@@ -196,6 +193,7 @@ getent passwd knot-resolver >/dev/null || useradd -r -g knot-resolver -d %{_sysc
 %endif
 
 %files
+%dir %{_pkgdocdir}
 %license %{_pkgdocdir}/COPYING
 %doc %{_pkgdocdir}/AUTHORS
 %doc %{_pkgdocdir}/NEWS
@@ -207,6 +205,7 @@ getent passwd knot-resolver >/dev/null || useradd -r -g knot-resolver -d %{_sysc
 %attr(644,root,knot-resolver) %config(noreplace) %{_sysconfdir}/knot-resolver/icann-ca.pem
 %{_unitdir}/kresd*.service
 %{_unitdir}/kresd.target
+%dir %{_unitdir}/multi-user.target.wants
 %{_unitdir}/multi-user.target.wants/kresd.target
 %if "x%{?rhel}" == "x"
 %{_unitdir}/kresd*.socket
@@ -215,7 +214,7 @@ getent passwd knot-resolver >/dev/null || useradd -r -g knot-resolver -d %{_sysc
 %{_mandir}/man7/kresd.systemd.nosocket.7.gz
 %endif
 %{_tmpfilesdir}/knot-resolver.conf
-%dir /run/%{name}/
+%ghost /run/%{name}/
 %attr(750,knot-resolver,knot-resolver) %dir %{_localstatedir}/cache/%{name}
 %{_sbindir}/kresd
 %{_sbindir}/kresc
@@ -230,6 +229,7 @@ getent passwd knot-resolver >/dev/null || useradd -r -g knot-resolver -d %{_sysc
 
 %if "x%{?rhel}" == "x"
 %files doc
+%dir %{_pkgdocdir}
 %doc %{_pkgdocdir}/html
 %endif