From eddc46fd8959ebaaa87bbac7defeeb1c7ed38c2f Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 8 Nov 2016 14:05:29 +0100
Subject: owncloud: 9.1.2

---
 owncloud-9.1.1-dont_warn_php54_eol.patch | 14 --------------
 owncloud-9.1.2-dont_warn_php54_eol.patch | 18 ++++++++++++++++++
 owncloud.spec                            |  7 +++++--
 3 files changed, 23 insertions(+), 16 deletions(-)
 delete mode 100644 owncloud-9.1.1-dont_warn_php54_eol.patch
 create mode 100644 owncloud-9.1.2-dont_warn_php54_eol.patch

diff --git a/owncloud-9.1.1-dont_warn_php54_eol.patch b/owncloud-9.1.1-dont_warn_php54_eol.patch
deleted file mode 100644
index 6772ec5..0000000
--- a/owncloud-9.1.1-dont_warn_php54_eol.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./settings/Controller/CheckSetupController.php.old	2016-10-07 13:04:26.349194620 +0200
-+++ ./settings/Controller/CheckSetupController.php	2016-10-07 13:04:56.642349253 +0200
-@@ -214,10 +214,7 @@
- 	private function isPhpSupported() {
- 		$eol = false;
- 
--		//PHP 5.4 is EOL on 14 Sep 2015
--		if (version_compare(PHP_VERSION, '5.5.0') === -1) {
--			$eol = true;
--		}
-+		// Red Hat provide support for the system PHP so never eol
- 
- 		return ['eol' => $eol, 'version' => PHP_VERSION];
- 	}
diff --git a/owncloud-9.1.2-dont_warn_php54_eol.patch b/owncloud-9.1.2-dont_warn_php54_eol.patch
new file mode 100644
index 0000000..efb3c80
--- /dev/null
+++ b/owncloud-9.1.2-dont_warn_php54_eol.patch
@@ -0,0 +1,18 @@
+--- ./settings/Controller/CheckSetupController.php.old	2016-11-08 13:57:55.244970190 +0100
++++ ./settings/Controller/CheckSetupController.php	2016-11-08 13:57:59.087987805 +0100
+@@ -347,13 +347,8 @@
+ 	 * @return bool
+ 	 */
+ 	protected function isEndOfLive() {
+-		$eol = false;
+ 
+-		//PHP 5.4 is EOL on 14 Sep 2015
+-		if (version_compare(PHP_VERSION, '5.5.0') === -1) {
+-			$eol = true;
+-			return $eol;
+-		}
+-		return $eol;
++		// Red Hat provide support for the system PHP so never eol
++		return false;
+ 	}
+ }
diff --git a/owncloud.spec b/owncloud.spec
index b86a7d9..5f63133 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -8,7 +8,7 @@
 # Please preserve changelog entries
 #
 Name:           owncloud
-Version:        9.1.1
+Version:        9.1.2
 Release:        1%{?dist}
 Summary:        Private file sync and share server
 Group:          Applications/Internet
@@ -65,7 +65,7 @@ Patch8:         %{name}-9.1.0-default_integrity_check_disabled.patch
 Patch9:         %{name}-9.1.1-work-arround-nss-issue.patch
 
 # RH provide support for php54 so don't tell users it's EOL
-Patch10:         %{name}-9.1.1-dont_warn_php54_eol.patch
+Patch10:         %{name}-9.1.2-dont_warn_php54_eol.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -738,6 +738,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Nov  8 2016 Remi Collet <remi@fedoraproject.org> - 9.1.2-1
+- Update to 9.1.2
+
 * Thu Oct 06 2016 James Hogarth <james.hogarth@gmail.com> - 9.1.1-1
 - Update to 9.1.1
 
-- 
cgit