From 1b27bb8ce711a094db6a80358dd2d8d950efeb69 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sat, 17 Jul 2021 15:41:41 -0700 Subject: [PATCH] Don't ship Nemo subpackage on EPEL Clean up to remove check for Fedora >= 24 Remove _hardened_build declaration, no longer needed since F23 https://fedoraproject.org/wiki/Changes/Harden_All_Packages Signed-off-by: Michel Alexandre Salim --- nextcloud-client.spec | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/nextcloud-client.spec b/nextcloud-client.spec index 43d5972..b728dc6 100644 --- a/nextcloud-client.spec +++ b/nextcloud-client.spec @@ -1,10 +1,9 @@ %undefine __cmake_in_source_build %undefine _cmake_skip_rpath -%global _hardened_build 1 Name: nextcloud-client Version: 3.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Nextcloud Client # -libs are LGPLv2+, rest GPLv2 @@ -112,10 +111,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Provides: mirall-nautilus = %{version}-%{release} Obsoletes: mirall-nautilus < 1.8.0 - %description nautilus The nextcloud desktop client nautilus extension. +%if 0%{?fedora} +# Only Fedora has Cinnamon, so there is no need for Nemo extension on EPEL %package nemo Summary: Nemo overlay icons Requires: nemo @@ -127,7 +127,6 @@ This package provides overlay icons to visualize the sync state in the nemo file manager. # Only Fedora has Mate, so there is no need for Caja extension on EPEL -%if 0%{?fedora} %package caja Summary: Caja overlay icons Requires: caja @@ -139,7 +138,7 @@ This package provides overlay icons to visualize the sync state in the caja file manager. %endif -%if 0%{?fedora} >= 24 || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 %package dolphin Summary: Dolphin overlay icons Requires: dolphin @@ -181,8 +180,10 @@ rm -f %{buildroot}%{_kf5_datadir}/kservices5/nextclouddolphinactionplugin.deskto %endif -# Only Fedora has Mate, so there is no need for Caja extension on EPEL %if 0%{?rhel} +# Only Fedora has Cinnamon, so there is no need for Nemo extension on EPEL +rm -rf %{buildroot}%{_datadir}/nemo-python/ +# Only Fedora has Mate, so there is no need for Caja extension on EPEL rm -rf %{buildroot}%{_datadir}/caja-python/ %endif @@ -221,16 +222,17 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/nextcloud. %files nautilus %{_datadir}/nautilus-python/extensions/* +%if 0%{?fedora} +# Only Fedora has Cinnamon, so there is no need for Nemo extension on EPEL %files nemo %{_datadir}/nemo-python/extensions/* # Only Fedora has Mate, so there is no need for Caja extension on EPEL -%if 0%{?fedora} %files caja %{_datadir}/caja-python/extensions/* %endif -%if 0%{?fedora} >= 24 || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} > 7 %files dolphin %{_libdir}/libnextclouddolphinpluginhelper.so %{_kf5_plugindir}/overlayicon/nextclouddolphinoverlayplugin.so @@ -239,6 +241,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/nextcloud. %endif %changelog +* Sat Jul 17 2021 Michel Alexandre Salim - 3.2.4-2 +- Don't ship Nemo subpackage on EPEL +- Clean up to remove check for Fedora >= 24 +- Remove _hardened_build declaration, no longer needed since F23 + https://fedoraproject.org/wiki/Changes/Harden_All_Packages + * Wed Jul 07 2021 Mukundan Ragavan - 3.2.4-1 - Update to 3.2.4