clean up of spec file.

simplify the icon patch, just one patch.
increase release number of Fedora version, to have the same spec file again with Epel

nextcloud-client-icon.patch

@@ -1,5 +1,5 @@
---- a/mirall.desktop.in	2017-01-02 10:30:07.297894313 +0100
+--- a/client/mirall.desktop.in	2017-01-02 10:30:07.297894313 +0100
-+++ b/mirall.desktop.in	2017-01-02 12:26:57.519301433 +0100
++++ b/client/mirall.desktop.in	2017-01-02 12:26:57.519301433 +0100
 @@ -5,7 +5,7 @@
  Name=@APPLICATION_NAME@ desktop sync client 
  Comment=@APPLICATION_NAME@ desktop synchronization client
@@ -198,3 +198,13 @@
  Name[lb]=@APPLICATION_NAME@ Desktop Sync Client
 -Icon[lb]=@APPLICATION_EXECUTABLE@
 +Icon[lb]=@APPLICATION_ICON@
+--- a/nextcloudtheme/OEM.cmake	2017-01-02 10:32:15.456135814 +0100
++++ b/nextcloudtheme/OEM.cmake	2017-01-02 10:32:53.227617781 +0100
+@@ -1,6 +1,7 @@
+ set( APPLICATION_NAME       "Nextcloud" )
+ set( APPLICATION_SHORTNAME  "Nextcloud" )
+ set( APPLICATION_EXECUTABLE "nextcloud" )
++set( APPLICATION_ICON       "Nextcloud" )
+ set( APPLICATION_DOMAIN     "nextcloud.com" )
+ set( APPLICATION_VENDOR     "Nextcloud GmbH" )
+ set( APPLICATION_UPDATE_URL "https://updates.nextcloud.org/client/" CACHE string "URL for updater" )

nextcloud-client-icon2.patch

@@ -1,10 +0,0 @@
---- a/nextcloudtheme/OEM.cmake	2017-01-02 10:32:15.456135814 +0100
-+++ b/nextcloudtheme/OEM.cmake	2017-01-02 10:32:53.227617781 +0100
-@@ -1,6 +1,7 @@
- set( APPLICATION_NAME       "Nextcloud" )
- set( APPLICATION_SHORTNAME  "Nextcloud" )
- set( APPLICATION_EXECUTABLE "nextcloud" )
-+set( APPLICATION_ICON       "Nextcloud" )
- set( APPLICATION_DOMAIN     "nextcloud.com" )
- set( APPLICATION_VENDOR     "Nextcloud GmbH" )
- set( APPLICATION_UPDATE_URL "https://updates.nextcloud.org/client/" CACHE string "URL for updater" )

nextcloud-client.spec

@@ -2,7 +2,7 @@
 
 Name:           nextcloud-client
 Version:        2.2.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The Nextcloud Client
 
 # -libs are LGPLv2+, rest GPLv2
@@ -22,7 +22,6 @@ Patch0:         %{name}-%{version}-syslibs.patch
 Patch1:         %{name}-%{version}-appshortname.patch
 Patch2:         openssl.patch
 Patch3:         %{name}-icon.patch
-Patch4:         %{name}-icon2.patch
 
 BuildRequires:  check
 BuildRequires:  cmake
@@ -126,9 +125,8 @@ cd -
 %patch1 -p1
 cd client
 %patch2 -p1
-%patch3 -p1
 cd -
-%patch4 -p1
+%patch3 -p1
 rm -rf src/3rdparty/qtlockedfile src/3rdparty/qtsingleapplication
 
 
@@ -148,6 +146,12 @@ popd
 mkdir -p %{buildroot}%{_datadir}/appdata/
 install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
 
+%if 0%{?fedora} < 24 && 0%{?rhel} <= 7
+rm -f %{buildroot}%{_libdir}/libnextclouddolphinpluginhelper.so
+rm -f %{buildroot}%{_kf5_plugindir}/overlayicon/nextclouddolphinoverlayplugin.so
+rm -f %{buildroot}%{_qt5_plugindir}/nextclouddolphinactionplugin.so
+rm -f %{buildroot}%{_kf5_datadir}/kservices5/nextclouddolphinactionplugin.desktop
+%endif
 
 %check
 appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
@@ -209,8 +213,10 @@ fi
 %endif
 
 %changelog
-* Mon Jan 02 2017 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 2.2.4-5
+* Mon Jan 02 2017 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 2.2.4-6
 - Fix the desktop icon (#1409252)
+* Thu Dec 08 2016 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 2.2.4-5
+- Epel7: drop dolphin files since they are not included in build for Epel7
 * Wed Nov 23 2016 Nick Bebout <nb@fedoraproject.org> - 2.2.4-4
 - Update for review
 * Wed Nov 02 2016 Germano Massullo <germano.massullo@gmail.com> 2.2.4-3