From c7032d376536d854e9e56aa3dafed4e566220b48 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Tue, 25 Jan 2022 20:26:57 +0100 Subject: [PATCH] Stop using %doc with relative paths Stop using %doc with relative paths and absolute paths: Only use %doc with absolute paths (%{_pkgdocdir}). Why? It's in the Fedora Packaging Guidelines, and epel7 builds complain about doc files being listed twice. --- beep.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/beep.spec b/beep.spec index 32a03fa..1b4f73d 100644 --- a/beep.spec +++ b/beep.spec @@ -79,7 +79,6 @@ interesting, but it is really good at the notifying part. %setup -q %{?el7:sed -i 's|^pkgdocdir=.*|pkgdocdir=$(docdir)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)|' GNUmakefile} grep ^pkgdocdir= GNUmakefile -install -m 0644 -p %{SOURCE1} README.fedora sed -i 's|^\.\\" \(\.BR .*\)README.Distro\(.*\)|\1README.fedora\2|' beep.1.in && : #" @@ -91,6 +90,8 @@ make %{?_smp_mflags} COMPILERS=gcc COMPILER_gcc=gcc COMPILER_clang=false CPPFLAG rm -rf "%{buildroot}" make install DESTDIR="%{buildroot}" COMPILER_gcc=false COMPILER_clang=false CPPFLAGS_gcc="" CFLAGS_gcc="-std=gnu99 -pedantic -Wall -Wextra -Werror %{build_cflags}" LDFLAGS_gcc="%{build_ldflags}" prefix=%{_prefix} bindir=%{_bindir} pkgdocdir=%{_pkgdocdir} +install -p -m 0644 "%{SOURCE1}" "%{buildroot}%{_pkgdocdir}/README.fedora" + install -d -m 0755 "%{buildroot}%{_sysconfdir}/modprobe.d/" install -p -m 0644 "%{SOURCE4}" "%{buildroot}%{_sysconfdir}/modprobe.d/beep.conf" @@ -105,11 +106,11 @@ exit 0 %files -%doc README.fedora %license %{_pkgdocdir}/COPYING %doc %{_pkgdocdir}/CREDITS.md %doc %{_pkgdocdir}/NEWS.md %doc %{_pkgdocdir}/PERMISSIONS.md +%doc %{_pkgdocdir}/README.fedora %doc %{_pkgdocdir}/README.md %doc %{_pkgdocdir}/contrib/failure-beeps %doc %{_pkgdocdir}/contrib/morse2beep.pl