From cd212e53825676db34675f6c51538ac0f18a01fb32836c5837508e46129921de Mon Sep 17 00:00:00 2001
From: Eric Schirra <ecsos@schirra.net>
Date: Sat, 3 Oct 2020 15:01:30 +0000
Subject: [PATCH] Accepting request 839316 from home:ecsos:server

- Update to 20.0.0
  - No changelog from upstream at this time.
- Upgrade apps during update process.

OBS-URL: https://build.opensuse.org/request/show/839316
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/nextcloud?expand=0&rev=122
---
 nextcloud-19.0.3.tar.bz2 |  3 ---
 nextcloud-20.0.0.tar.bz2 |  3 +++
 nextcloud.changes        | 31 ++++++++++++++++++++++++++++++-
 nextcloud.spec           | 17 ++++++++++-------
 4 files changed, 43 insertions(+), 11 deletions(-)
 delete mode 100644 nextcloud-19.0.3.tar.bz2
 create mode 100644 nextcloud-20.0.0.tar.bz2

diff --git a/nextcloud-19.0.3.tar.bz2 b/nextcloud-19.0.3.tar.bz2
deleted file mode 100644
index 4ac6643..0000000
--- a/nextcloud-19.0.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fc503985e8aa4ed795d882e35679e0e1b7670181768e7820307222d8b4658969
-size 100074272
diff --git a/nextcloud-20.0.0.tar.bz2 b/nextcloud-20.0.0.tar.bz2
new file mode 100644
index 0000000..8ecad32
--- /dev/null
+++ b/nextcloud-20.0.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a273e0151f68567f729d9a82a7e3f124ff0f0471aa17bae6bfd83c5362d84cd8
+size 121470470
diff --git a/nextcloud.changes b/nextcloud.changes
index 271cbb7..92976ef 100644
--- a/nextcloud.changes
+++ b/nextcloud.changes
@@ -1,8 +1,37 @@
+-------------------------------------------------------------------
+Sat Oct  3 10:31:15 UTC 2020 - ecsos <ecsos@opensuse.org>
+
+- Update to 20.0.0
+  - No changelog from upstream at this time.
+- Upgrade apps during update process.
+
 -------------------------------------------------------------------
 Thu Sep 10 15:20:27 UTC 2020 - ecsos <ecsos@opensuse.org>
 
 - Update to 19.0.3
-  - No changelog from upstream at this time.
+  - Fix possible leaking scope in Flow (server#22410)
+  - Combine body-login rules in theming and fix twofactor and guest styling on bright colors (server#22427)
+  - Show better quota warning for group folders and external storage (server#22442)
+  - Add php docs build script (server#22448)
+  - Fix clicks on actions menu of non opaque file rows in acceptance tests (server#22503)
+  - Fix writing BLOBs to postgres with recent contacts interaction (server#22515)
+  - Set the mount id before calling storage wrapper (server#22519)
+  - Fix S3 error handling (server#22521)
+  - Only disable zip64 if the size is known (server#22537)
+  - Change free space calculation (server#22553)
+  - Do not keep the part file if the forbidden exception has no retry set (server#22560)
+  - Fix app password updating out of bounds (server#22569)
+  - Use the correct root to determinate the webroot for the resource (server#22579)
+  - Upgrade icewind/smb to 3.2.7 (server#22581)
+  - Bump elliptic from 6.4.1 to 6.5.3 (notifications#732)
+  - Fixes regression that prevented you from toggling the encryption flag (privacy#489)
+  - Match any non-whitespace character in filesystem pattern (serverinfo#229)
+  - Catch StorageNotAvailable exceptions (text#1001)
+  - Harden read only check on public endpoints (text#1017)
+  - Harden check when using token from memcache (text#1020)
+  - Sessionid is an int (text#1029)
+  - Only overwrite Ctrl-f when text is focussed (text#990)
+  - Set the X-Requested-With header on dav requests (viewer#582)
 
 -------------------------------------------------------------------
 Fri Aug 28 11:22:36 UTC 2020 - ecsos <ecsos@opensuse.org>
diff --git a/nextcloud.spec b/nextcloud.spec
index 698de02..3da88c4 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -49,7 +49,7 @@
 %endif
 
 Name:           nextcloud
-Version:        19.0.3
+Version:        20.0.0
 Release:        0
 Summary:        File hosting service
 License:        AGPL-3.0-only
@@ -233,7 +233,7 @@ fi
 if [ $1 -eq 1 ]; then
     echo "%{name}-server: First install starting"
 else
-    echo "%{name}-server: installing upgrade ..."
+    echo "%{name}-server: Upgrade starting ..."
 fi
 # https://github.com/nextcloud
 if [ -x %{ocphp_bin}/php -a -f %{oc_dir}/occ ]; then
@@ -244,11 +244,6 @@ fi
 
 %post
 %service_add_post %{name}-cron.timer %{name}-cron.service
-if [ $1 -eq 1 ]; then
-    echo "%{name} First install complete"
-else
-    echo "%{name} Upgrade complete"
-fi
 
 if [ $1 -eq 1 ]; then
 %if 0%{?suse_version}
@@ -279,6 +274,8 @@ fi
 if [ -s %{statedir}/occ_maintenance_mode_during_nextcloud_install ]; then
 echo "%{name}: occ maintenance:repair (fix possible errors)"
 su %{oc_user} -s /bin/sh -c "cd %{oc_dir}; PATH=%{ocphp_bin}:$PATH php ./occ maintenance:repair" || true
+echo "%{name}: occ update apps"
+su %{oc_user} -s /bin/sh -c "cd %{oc_dir}; PATH=%{ocphp_bin}:$PATH php ./occ app:update --all" || true
 echo "%{name}: occ upgrade"
 su %{oc_user} -s /bin/sh -c "cd %{oc_dir}; PATH=%{ocphp_bin}:$PATH php ./occ upgrade" || true
 echo "%{name}: occ maintenance:mode --off"
@@ -288,6 +285,12 @@ fi
 rm -f %{statedir}/apache_stopped_during_nextcloud_install
 rm -f %{statedir}/occ_maintenance_mode_during_nextcloud_install
 
+if [ $1 -eq 1 ]; then
+    echo "%{name}-server: First install complete"
+else
+    echo "%{name}-server: Upgrade complete"
+fi
+
 %preun
 %service_del_preun %{name}-cron.timer %{name}-cron.service