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 <salimma@fedoraproject.org>
f40
Michel Alexandre Salim 3 years ago
parent 1473978a30
commit 1b27bb8ce7

@ -1,10 +1,9 @@
%undefine __cmake_in_source_build %undefine __cmake_in_source_build
%undefine _cmake_skip_rpath %undefine _cmake_skip_rpath
%global _hardened_build 1
Name: nextcloud-client Name: nextcloud-client
Version: 3.2.4 Version: 3.2.4
Release: 1%{?dist} Release: 2%{?dist}
Summary: The Nextcloud Client Summary: The Nextcloud Client
# -libs are LGPLv2+, rest GPLv2 # -libs are LGPLv2+, rest GPLv2
@ -112,10 +111,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Provides: mirall-nautilus = %{version}-%{release} Provides: mirall-nautilus = %{version}-%{release}
Obsoletes: mirall-nautilus < 1.8.0 Obsoletes: mirall-nautilus < 1.8.0
%description nautilus %description nautilus
The nextcloud desktop client nautilus extension. 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 %package nemo
Summary: Nemo overlay icons Summary: Nemo overlay icons
Requires: nemo Requires: nemo
@ -127,7 +127,6 @@ This package provides overlay icons to visualize the sync state
in the nemo file manager. in the nemo file manager.
# Only Fedora has Mate, so there is no need for Caja extension on EPEL # Only Fedora has Mate, so there is no need for Caja extension on EPEL
%if 0%{?fedora}
%package caja %package caja
Summary: Caja overlay icons Summary: Caja overlay icons
Requires: caja Requires: caja
@ -139,7 +138,7 @@ This package provides overlay icons to visualize the sync state
in the caja file manager. in the caja file manager.
%endif %endif
%if 0%{?fedora} >= 24 || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 7
%package dolphin %package dolphin
Summary: Dolphin overlay icons Summary: Dolphin overlay icons
Requires: dolphin Requires: dolphin
@ -181,8 +180,10 @@ rm -f %{buildroot}%{_kf5_datadir}/kservices5/nextclouddolphinactionplugin.deskto
%endif %endif
# Only Fedora has Mate, so there is no need for Caja extension on EPEL
%if 0%{?rhel} %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/ rm -rf %{buildroot}%{_datadir}/caja-python/
%endif %endif
@ -221,16 +222,17 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/nextcloud.
%files nautilus %files nautilus
%{_datadir}/nautilus-python/extensions/* %{_datadir}/nautilus-python/extensions/*
%if 0%{?fedora}
# Only Fedora has Cinnamon, so there is no need for Nemo extension on EPEL
%files nemo %files nemo
%{_datadir}/nemo-python/extensions/* %{_datadir}/nemo-python/extensions/*
# Only Fedora has Mate, so there is no need for Caja extension on EPEL # Only Fedora has Mate, so there is no need for Caja extension on EPEL
%if 0%{?fedora}
%files caja %files caja
%{_datadir}/caja-python/extensions/* %{_datadir}/caja-python/extensions/*
%endif %endif
%if 0%{?fedora} >= 24 || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 7
%files dolphin %files dolphin
%{_libdir}/libnextclouddolphinpluginhelper.so %{_libdir}/libnextclouddolphinpluginhelper.so
%{_kf5_plugindir}/overlayicon/nextclouddolphinoverlayplugin.so %{_kf5_plugindir}/overlayicon/nextclouddolphinoverlayplugin.so
@ -239,6 +241,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/nextcloud.
%endif %endif
%changelog %changelog
* Sat Jul 17 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 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 <nonamedotc@fedoraproject.org> - 3.2.4-1 * Wed Jul 07 2021 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 3.2.4-1
- Update to 3.2.4 - Update to 3.2.4

Loading…
Cancel
Save