Updated to 14.0.14 (#45)v14

Attempted to improve End of Life notice
Switched PHP dependency to PHP 7.2
Added warning for upcoming end of life for PHP 7.1

Signed-off-by: B Galliart <bgallia@gmail.com>

2 files changed, 79 insertions, 23 deletions

diff --git a/centos/README.md b/centos/README.md
index 020b396..8111b70 100644
--- a/centos/README.md
+++ b/centos/README.md
@@ -2,17 +2,37 @@ Nextcloud
 =========
 
 
-End of Life Notice
-------------------
-NextCloud 14 is stated to be End of Life as of September 2019
+CRITICAL NextCloud 14 End of Life Notice CRITICAL
+-------------------------------------------------
+NextCloud 14 is End of Life as of August 2019
 
-Past the EoL date there will no longer be security or maintenance fixes
-provided.  It is important to plan accordingly.
+There will no longer be security or maintenance fixes provided.
 
-Also NextCloud does not support skipping major versions.  To keep the
+It is important to plan an upgrade schedule to NextCloud version 15
+accordingly.
+
+NextCloud does not support skipping major versions.  To keep the
 database schema current, it is important to run the upgrade (such as 
 through the OCC CLI) for each major version.
 
+More information is available here:
+https://nextcloud.com/blog/nextcloud-16.0.4-15.0.11-14.0.14-are-here/
+
+
+PHP 7.1 End of Life Notice
+--------------------------
+As of December 2019, the primary PHP project will no longer be releasing
+security updates for PHP version 7.1.
+
+It is recommended you plan accordingly to upgrade to using PHP 7.2.
+
+The RPM dependencies have also been updated accordingly.
+
+It is possible to have both PHP 7.1 and PHP 7.2 installed from the
+Software Collection at the same time.  However, the NextCloud RPM is
+configured to use the PHP FPM on localhost port 9000.  If PHP 7.1 FPM is
+still using the port, that is the version of PHP that will be used.
+
 
 About
 -----
@@ -76,8 +96,20 @@ On Red Hat Enterprise Linux run:
 The administrator can enable extra features installing following RPMs 
 (from centos-sclo-sclo repository):
 
-* sclo-php71-php-smbclient
-* rh-php71-php-imap
+* sclo-php72-php-smbclient
+* sclo-php72-php-imap
+
+
+Installing RPM
+--------------
+
+Once the RPM is built, it can be found in the following directory:
+  rpmbuild/RPMS/noarch
+
+It can be installed by running:
+  yum -y rpmbuild/RPMS/noarch/nextcloud-x.x.x-x.el7.noarch.rpm
+
+Replace the x characters with the actual version.
 
 
 SELinux
diff --git a/centos/nextcloud.spec b/centos/nextcloud.spec
index 37623ad..82fc2e3 100644
--- a/centos/nextcloud.spec
+++ b/centos/nextcloud.spec
@@ -12,7 +12,7 @@
 
 Summary: Nextcloud package
 Name: nextcloud
-Version: 14.0.13
+Version: 14.0.14
 Release: 1%{?dist}
 License: GPL
 Source: https://download.nextcloud.com/server/releases/nextcloud-%{version}.tar.bz2
@@ -29,21 +29,20 @@ BuildRequires: httpd
 
 Requires: httpd
 # Required php packages
-Requires: rh-php71
-Requires: rh-php71-php-fpm
-Requires: rh-php71-php-gd
-Requires: rh-php71-php-pdo
-Requires: rh-php71-php-mbstring
+Requires: rh-php72
+Requires: rh-php72-php-fpm
+Requires: rh-php72-php-gd
+Requires: rh-php72-php-pdo
+Requires: rh-php72-php-mbstring
 
 # Recommended php packages
-Requires: rh-php71-php-intl
-Requires: rh-php71-php-mcrypt
+Requires: rh-php72-php-intl
 
 # Required php packages for specific apps
-Requires: rh-php71-php-ldap
+Requires: rh-php72-php-ldap
 
 # Required php packages for MariaDB
-Requires: rh-php71-php-pdo_mysql
+Requires: rh-php72-php-pdo_mysql
 
 # NextCloud does not support skipping a major version number
 Conflicts: nextcloud < 13
@@ -89,20 +88,40 @@ cp %{SOURCE1} %{buildroot}/etc/httpd/conf.d
 
 %post
 cat << EOF
+
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-NextCloud End of Life Notice
+CRITICAL NextCloud v14 End of Life Notice CRITICAL
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-This NextCloud version is stated to be End of Life as of September 2019
+This NextCloud version is stated End of Life as of August 2019
+
+There will no longer be security or maintenance fixes provided.
 
-Past the EoL date there will no longer be security or maintenance fixes
-provided.  It is important to plan an upgrade schedule accordingly.
+It is important to plan an upgrade schedule to NextCloud version 15
+accordingly.
 
-Also NextCloud does not support skipping major versions.  To keep the
+NextCloud does not support skipping major versions.  To keep the
 database schema current, it is important to run the upgrade (such as 
 through the OCC CLI) for each major version.
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
 EOF
+/usr/bin/systemctl status rh-php71-php-fpm > /dev/null
+if [ $? -eq 0 ] ; then
+cat << EOF
+
+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+PHP 7.1 End of Life Notice
+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+This system is still running the rh-php71-php-fpm service.
+
+As of December 2019, the primary PHP project will no longer be releasing
+security updates for PHP version 7.1.
+
+It is recommended you plan accordingly to upgrade to using PHP 7.2.
+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
+EOF
+fi
 
 %files 
 %defattr(0640,root,%{nc_group},0750)
@@ -135,6 +154,11 @@ EOF
 
 
 %changelog
+* Fri Aug 23 2019 B Galliart <ben@steadfast.net> - 14.0.14-1
+- Update to release 14.0.14
+- Update to use PHP 7.2
+- Revised End of Life notices
+
 * Mon Jul 8 2019 B Galliart <ben@steadfast.net> - 14.0.13-1
 - Update to release 14.0.13