diff --git a/nextcloud-14.0.4.tar.bz2 b/nextcloud-14.0.4.tar.bz2 deleted file mode 100644 index 489c228..0000000 --- a/nextcloud-14.0.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f5dd15a71694bd2f15fba0d2f942e5a5b1f5aba13511c507a23324d746b40e8 -size 49827498 diff --git a/nextcloud-15.0.0.tar.bz2 b/nextcloud-15.0.0.tar.bz2 new file mode 100644 index 0000000..cca4e50 --- /dev/null +++ b/nextcloud-15.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5bb0c58171353da844019b64080c21078002a59ab956ab72adb958844a98eb78 +size 36181234 diff --git a/nextcloud.changes b/nextcloud.changes index f1b9839..dee4655 100644 --- a/nextcloud.changes +++ b/nextcloud.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Dec 20 07:06:43 UTC 2018 - ecsos@opensuse.org + +- fix require php versions. + +------------------------------------------------------------------- +Mon Dec 10 17:15:24 UTC 2018 - ecsos@opensuse.org + +- Update to 15.0.0 + Nextcloud 15 introduces social networking, next-gen 2-factor + authentication and innovative collaborative document editing + abilities. + This release also adds a new design and grid view, workflow + features and 2-3x faster loading performance. + + As this is a major release, the changelog is very long. + Find an overview of what has been improved in this series of blog + posts or see: https://nextcloud.com/changelog/ + +- Use php7 in apache under suse_version >= 1500 now. + ------------------------------------------------------------------- Tue Nov 27 22:51:28 UTC 2018 - ecsos@opensuse.org diff --git a/nextcloud.spec b/nextcloud.spec index 3e1325d..37de6f5 100644 --- a/nextcloud.spec +++ b/nextcloud.spec @@ -49,7 +49,7 @@ %endif Name: nextcloud -Version: 14.0.4 +Version: 15.0.0 Release: 0 Summary: File hosting service License: AGPL-3.0-only @@ -82,8 +82,8 @@ Requires: php-posix Requires: php-zip # %if 0%{?fedora_version} || 0%{?rhel} || 0%{?rhel_version} || 0%{?centos_version} -Requires: php < 7.3.0 -Requires: php >= 5.6.0 +Requires: php <= 7.3.0 +Requires: php >= 7.0.0 Requires: php-process Requires: php-xml # @@ -92,8 +92,8 @@ Recommends: sqlite # %if 0%{?suse_version} Requires: apache2 -Requires: mod_php_any < 7.3.0 -Requires: mod_php_any >= 5.6.0 +Requires: mod_php_any <= 7.3.0 +Requires: mod_php_any >= 7.0.0 Requires: php-ctype Requires: php-curl # SUSE does not include the fileinfo module in php-common. @@ -213,11 +213,18 @@ else fi %if 0%{?suse_version} +%if 0%{?suse_version} >= 1500 +# make sure php7 is not in APACHE_MODULES, so that we don't create dups. +perl -pani -e 's@^(APACHE_MODULES=".*)\bphp7\b@$1@' /etc/sysconfig/apache2 +# add php7 to APACHE_MODULES +perl -pani -e 's@^(APACHE_MODULES=")@${1}php7 @' /etc/sysconfig/apache2 +%else # make sure php5 is not in APACHE_MODULES, so that we don't create dups. perl -pani -e 's@^(APACHE_MODULES=".*)\bphp5\b@$1@' /etc/sysconfig/apache2 # add php5 to APACHE_MODULES perl -pani -e 's@^(APACHE_MODULES=")@${1}php5 @' /etc/sysconfig/apache2 %endif +%endif if [ -s %{statedir}/apache_stopped_during_nextcloud_install ]; then echo "%{name} post-install: Restarting Apache"