From da1730039d45788860b434429fa39ab590f0685d1d952ad6b48c6dcc94c61dfb Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Sun, 8 Oct 2023 12:23:49 +0000 Subject: [PATCH] Accepting request 1116307 from home:ecsos:server - Update to 27.1.2 OBS-URL: https://build.opensuse.org/request/show/1116307 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/nextcloud?expand=0&rev=215 --- nextcloud-temp-fix-ocm.patch | 12 ------------ nextcloud.changes | 1 - nextcloud.spec | 3 --- 3 files changed, 16 deletions(-) delete mode 100644 nextcloud-temp-fix-ocm.patch diff --git a/nextcloud-temp-fix-ocm.patch b/nextcloud-temp-fix-ocm.patch deleted file mode 100644 index 492e6d3..0000000 --- a/nextcloud-temp-fix-ocm.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Pdpru nextcloud.orig/.htaccess nextcloud/.htaccess ---- nextcloud.orig/.htaccess 2023-10-05 12:47:41.000000000 +0200 -+++ nextcloud/.htaccess 2023-10-07 11:06:13.080370013 +0200 -@@ -90,7 +90,7 @@ - RewriteRule ^remote/(.*) remote.php [QSA,L] - RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L] - RewriteRule ^\.well-known/(?!acme-challenge|pki-validation) /index.php [QSA,L] -- RewriteRule ^ocm-provider/?$ /index.php [QSA,L] -+ RewriteRule ^ocm-provider/?$ /nextcloud/index.php [QSA,L] - RewriteRule ^(?:\.(?!well-known)|autotest|occ|issue|indie|db_|console).* - [R=404,L] - - diff --git a/nextcloud.changes b/nextcloud.changes index 2c8a3f1..84dbff2 100644 --- a/nextcloud.changes +++ b/nextcloud.changes @@ -22,7 +22,6 @@ Thu Oct 5 14:13:03 UTC 2023 - ecsos - Fix(deps): update nextcloud abandoned (text#4756) - Bugfix/duplicated load of yjs (text#4807) - Feat: hide workspace if no readme.md (text#4811) -- Add nextcloud-temp-fix-ocm.patch to fix temporarily the ocm-provider failure message. (server#40803) ------------------------------------------------------------------- Sun Sep 24 09:00:49 UTC 2023 - ecsos diff --git a/nextcloud.spec b/nextcloud.spec index b18862f..1ebc741 100644 --- a/nextcloud.spec +++ b/nextcloud.spec @@ -63,8 +63,6 @@ Source10: %{name}-cron Source11: %{name}-cron.service Source12: %{name}-cron.timer Source99: %{name}-rpmlintrc -# PATCH-FIX-OPENSUSE - Temporarily fix ocm-provider message - https://github.com/nextcloud/server/issues/40803 -Patch1: %{name}-temp-fix-ocm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: apache-rpm-macros @@ -151,7 +149,6 @@ This subpackage contains the Apache configuration files %prep %setup -q -n %{name} -%patch1 -p1 cp %{SOURCE2} . cp %{SOURCE3} . cp %{SOURCE4} .