From 666000f9aa7d98e15697b2161524d2bd67db385c Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 1 Oct 2020 21:45:08 -0400 Subject: WIP: fix el6 and el7 builds usr-merge came after el6, and I guess _pkgdocdir gets weird on el < 8 --- myautomount.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'myautomount.spec') diff --git a/myautomount.spec b/myautomount.spec index 97d9f89..01849d6 100644 --- a/myautomount.spec +++ b/myautomount.spec @@ -15,7 +15,7 @@ %global use_local 1 %global use_commit 1 -%define date %(/usr/bin/date +%%Y%%m%%d) +%define date %(date +%%Y%%m%%d) %if 0%{?use_commit} %global git_commit 0d5f8b7657527eab8380f5aa81ecd072714cf13c %{?git_commit:%global git_commit_hash %(c=%{git_commit}; echo ${c:0:7})} @@ -96,7 +96,9 @@ update-desktop-database 1>/dev/null 2>&1 || : %{_datadir}/applications/* %{_libexecdir}/%{name}/* %doc %{_mandir}/man1/* +%if 0%{?fedora} || 0%{?rhel} >= 8 %doc %{_pkgdocdir}/* +%endif %changelog * Tue Sep 29 2020 B Stack - 0.0.1-1 -- cgit