diff --git a/caja-actions.spec b/caja-actions.spec index e7a4a65..593f699 100644 --- a/caja-actions.spec +++ b/caja-actions.spec @@ -1,14 +1,14 @@ Summary: Caja extension for customizing the context menu Name: caja-actions Version: 1.8.3 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/raveit65/%{name} Source0: https://github.com/raveit65/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz -# move doc dir for rhel -%if 0%{?rhel} +# move doc dir for rhel 7 +%if 0%{?rhel} <= 7 Patch1: caja-actions_0001-Revert-No-version-in-documentation-install-path.patch %endif @@ -47,13 +47,13 @@ with caja-actions. %prep %autosetup -p1 -# move doc dir for rhel -%if 0%{?rhel} +# move doc dir for rhel 7 +%if 0%{?rhel} <= 7 NOCONFIGURE=1 ./autogen.sh %endif %build -%if 0%{?fedora} && 0%{?fedora} >= 27 +%if (0%{?fedora} && 0%{?fedora} >= 27) || 0%{?rhel} > 7 %configure \ --disable-gtk-doc \ --enable-html-manuals \ @@ -76,7 +76,7 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';' # clean docs dirs -%if 0%{?rhel} +%if 0%{?rhel} <= 7 rm -f $RPM_BUILD_ROOT%{_docdir}/%{%{name}-%{version}}/INSTALL rm -f $RPM_BUILD_ROOT%{_docdir}/%{%{name}-%{version}}/ChangeLog-2008 rm -f $RPM_BUILD_ROOT%{_docdir}/%{%{name}-%{version}}/ChangeLog-2009 @@ -135,6 +135,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/cact.desktop %changelog +* Sun Sep 29 2019 Thomas Batten - 1.8.3-10 +- Disable doc path patch for el > 7 + * Wed Jul 24 2019 Fedora Release Engineering - 1.8.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild