From 18f48ca6afc625c7307b26e075c4140e807a5ff4 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Feb 02 2020 13:16:44 +0000 Subject: fix building for f32 drop non working rhel7 macros for f32 branch --- diff --git a/caja-actions.spec b/caja-actions.spec index 39e4083..f58cb38 100644 --- a/caja-actions.spec +++ b/caja-actions.spec @@ -1,17 +1,12 @@ Summary: Caja extension for customizing the context menu Name: caja-actions Version: 1.8.3 -Release: 11%{?dist} +Release: 12%{?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 7 -%if 0%{?rhel} <= 7 -Patch1: caja-actions_0001-Revert-No-version-in-documentation-install-path.patch -%endif - BuildRequires: caja-devel BuildRequires: libuuid-devel BuildRequires: libSM-devel @@ -47,25 +42,12 @@ with caja-actions. %prep %autosetup -p1 -# move doc dir for rhel 7 -%if 0%{?rhel} <= 7 -NOCONFIGURE=1 ./autogen.sh -%endif - %build -%if (0%{?fedora} && 0%{?fedora} >= 27) || 0%{?rhel} > 7 %configure \ --disable-gtk-doc \ --enable-html-manuals \ --enable-pdf-manuals \ --enable-deprecated -%else -%configure \ - --enable-gtk-doc \ - --enable-html-manuals \ - --enable-pdf-manuals \ - --enable-deprecated -%endif make %{?_smp_mflags} V=1 @@ -76,15 +58,6 @@ 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} <= 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 -rm -f $RPM_BUILD_ROOT%{_docdir}/%{%{name}-%{version}}/ChangeLog-2010 -rm -f $RPM_BUILD_ROOT%{_docdir}/%{%{name}-%{version}}/ChangeLog-2011 -rm -f $RPM_BUILD_ROOT%{_docdir}/%{%{name}-%{version}}/ChangeLog-2012 -rm -f $RPM_BUILD_ROOT%{_docdir}/%{%{name}-%{version}}/MAINTAINERS -%else rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/INSTALL rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/ChangeLog-2008 rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/ChangeLog-2009 @@ -92,7 +65,6 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/ChangeLog-2010 rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/ChangeLog-2011 rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/ChangeLog-2012 rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/MAINTAINERS -%endif %find_lang %{name} --with-gnome --all-name @@ -119,15 +91,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/cact.desktop %{_datadir}/applications/cact.desktop %files doc -f %{name}.lang -%if 0%{?fedora} > 19 || 0%{?rhel} > 7 %{_docdir}/caja-actions/html/ %{_docdir}/caja-actions/pdf/ %{_docdir}/caja-actions/objects-hierarchy.odg -%else -%{_docdir}/caja-actions-%{version}/html/ -%{_docdir}/caja-actions-%{version}/pdf/ -%{_docdir}/caja-actions-%{version}/objects-hierarchy.odg -%endif %files devel %{_includedir}/caja-actions/ @@ -135,6 +101,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/cact.desktop %changelog +* Sun Feb 02 2020 Wolfgang Ulbrich - 1.8.3-12 +- clean up spec file, drop non working rhel7 macros for f32 branch +- fix building for f32 + * Tue Jan 28 2020 Fedora Release Engineering - 1.8.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild