From 88e8680e79ab5f42687077d5d2f70498c0dfb467 Mon Sep 17 00:00:00 2001
From: Germano Massullo <germano.massullo@cern.ch>
Date: Wed, 28 Aug 2019 17:03:33 +0200
Subject: [PATCH] 2.5.3 release

---
 .gitignore            |  1 +
 issue_1000.patch      | 72 -------------------------------------------
 nextcloud-client.spec | 13 +++++---
 sources               |  2 +-
 4 files changed, 10 insertions(+), 78 deletions(-)
 delete mode 100644 issue_1000.patch

diff --git a/.gitignore b/.gitignore
index 1909ba4..84ed9fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /desktop-2.5.0.tar.gz
 /desktop-2.5.1.tar.gz
 /desktop-2.5.2.tar.gz
+/desktop-2.5.3.tar.gz
diff --git a/issue_1000.patch b/issue_1000.patch
deleted file mode 100644
index 31117f1..0000000
--- a/issue_1000.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -urNr desktop-2.5.2-orig/src/gui/folderwatcher.cpp desktop-2.5.2/src/gui/folderwatcher.cpp
---- desktop-2.5.2-orig/src/gui/folderwatcher.cpp	2019-03-19 02:52:24.000000000 +0100
-+++ desktop-2.5.2/src/gui/folderwatcher.cpp	2019-05-10 09:53:53.861934327 +0200
-@@ -75,9 +75,28 @@
-     return _isReliable;
- }
- 
-+
-+void FolderWatcher::appendSubPaths(QDir dir, QStringList& subPaths) {
-+    QStringList newSubPaths = dir.entryList(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files);
-+    for (int i = 0; i < newSubPaths.size(); i++) {
-+        QString path = dir.path() + "/" + newSubPaths[i];
-+        QFileInfo fileInfo(path);
-+        subPaths.append(path);
-+        if (fileInfo.isDir()) {
-+            QDir dir(path);
-+            appendSubPaths(dir, subPaths);
-+        }
-+    }
-+}
-+
- void FolderWatcher::changeDetected(const QString &path)
- {
-+    QFileInfo fileInfo(path);
-     QStringList paths(path);
-+    if (fileInfo.isDir()) {
-+        QDir dir(path);
-+        appendSubPaths(dir, paths);
-+    }
-     changeDetected(paths);
- }
- 
-diff -urNr desktop-2.5.2-orig/src/gui/folderwatcher.h desktop-2.5.2/src/gui/folderwatcher.h
---- desktop-2.5.2-orig/src/gui/folderwatcher.h	2019-03-19 02:52:24.000000000 +0100
-+++ desktop-2.5.2/src/gui/folderwatcher.h	2019-05-10 09:56:15.063411278 +0200
-@@ -26,6 +26,7 @@
- #include <QHash>
- #include <QScopedPointer>
- #include <QSet>
-+#include <QDir>
- 
- class QTimer;
- 
-@@ -120,6 +121,8 @@
-     Folder *_folder;
-     bool _isReliable = true;
- 
-+    void appendSubPaths(QDir dir, QStringList& subPaths);
-+
-     friend class FolderWatcherPrivate;
- };
- }
-diff -urNr desktop-2.5.2-orig/test/testfolderwatcher.cpp desktop-2.5.2/test/testfolderwatcher.cpp
---- desktop-2.5.2-orig/test/testfolderwatcher.cpp	2019-03-19 02:52:24.000000000 +0100
-+++ desktop-2.5.2/test/testfolderwatcher.cpp	2019-05-10 09:57:51.453556579 +0200
-@@ -140,6 +140,16 @@
-         QVERIFY(waitForPathChanged(file));
-     }
- 
-+    void testMove3LevelDirWithFile() {
-+        QString file(_rootPath + "/a0/b/c/empty.txt");
-+        mkdir(_rootPath + "/a0");
-+        mkdir(_rootPath + "/a0/b");
-+        mkdir(_rootPath + "/a0/b/c");
-+        touch(file);
-+        mv(_rootPath + "/a0 ", _rootPath + "/a");
-+        QVERIFY(waitForPathChanged(_rootPath + "/a/b/c/empty.txt"));
-+    }
-+
-     void testCreateADir() {
-         QString file(_rootPath+"/a1/b1/new_dir");
-         mkdir(file);
diff --git a/nextcloud-client.spec b/nextcloud-client.spec
index cdbee47..fa8cf45 100644
--- a/nextcloud-client.spec
+++ b/nextcloud-client.spec
@@ -1,8 +1,8 @@
 %global _hardened_build 1
 
 Name:           nextcloud-client
-Version:        2.5.2
-Release:        3%{?dist}
+Version:        2.5.3
+Release:        1%{?dist}
 Summary:        The Nextcloud Client
 
 # -libs are LGPLv2+, rest GPLv2
@@ -18,9 +18,9 @@ Source1:        nextcloud.appdata.xml
 # These fix are needed because the system wide QtSingleApplication is slightly 
 # different from the bundled one.
 #Patch0:         %%{name}-%%{version}-syslibs.patch
-## patch 1 solves https://bugzilla.redhat.com/show_bug.cgi?id=1409252
-Patch0:         issue_1000.patch
-Patch1:         %{name}-icon.patch
+
+## solves https://bugzilla.redhat.com/show_bug.cgi?id=1409252
+Patch0:         %{name}-icon.patch
 
 BuildRequires:  check
 BuildRequires:  cmake
@@ -222,6 +222,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/nextcloud.
 %endif
 
 %changelog
+* Wed Aug 28 2019 Germano Massullo <germano.massullo@gmail.com> - 2.5.3-1
+- 2.5.3 release
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 3b88830..2561ec5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (desktop-2.5.2.tar.gz) = 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae
+SHA512 (desktop-2.5.3.tar.gz) = 998e38278472e87e9606fad407ba7b1295594a777845c6fa7413ffb485b3a3b7a26ad8212a1161e1d695d9ecfa066e9090aa633b4ec4af84700c28bc1321b710