diff options
| author | Remi Collet <remi@remirepo.net> | 2017-11-23 12:55:38 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-11-23 12:55:38 +0100 |
| commit | 87e0ac33ad13cf8c1a35f2b81087f4726c7840bd (patch) | |
| tree | 3aa598104cf88e8a0052e2bfd504d0b7a70a7efb | |
| parent | 20d1e8add5ed1b459b83eb0836ea884eead29dd3 (diff) | |
| -rw-r--r-- | owncloud-9.1.7-dont_warn_about_php_versions.patch (renamed from owncloud-9.1.4-dont_warn_about_php_versions.patch) | 10 | ||||
| -rw-r--r-- | owncloud.spec | 21 |
2 files changed, 20 insertions, 11 deletions
diff --git a/owncloud-9.1.4-dont_warn_about_php_versions.patch b/owncloud-9.1.7-dont_warn_about_php_versions.patch index bef22bb..abfdb55 100644 --- a/owncloud-9.1.4-dont_warn_about_php_versions.patch +++ b/owncloud-9.1.7-dont_warn_about_php_versions.patch @@ -62,17 +62,17 @@ diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/ index 52ef34d..bdb2a3a 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php -@@ -349,11 +349,8 @@ Raw output +@@ -348,12 +348,7 @@ Raw output protected function isEndOfLive() { $eol = false; -- //PHP 5.4 is EOL on 14 Sep 2015 -- if (version_compare(PHP_VERSION, '5.5.0') === -1) { +- // PHP 5.4 is EOL on 14 Sep 2015 +- // PHP 5.5 is EOL on 21 Jul 2016 +- if (version_compare(PHP_VERSION, '5.6.0') === -1) { - $eol = true; - return $eol; - } -+ // Red Hat support PHP so don't EOL -+ ++ // Red Hat support PHP so don't EOL return $eol; } } diff --git a/owncloud.spec b/owncloud.spec index 002c5a5..01ed060 100644 --- a/owncloud.spec +++ b/owncloud.spec @@ -15,7 +15,7 @@ %endif Name: owncloud -Version: 9.1.5 +Version: 9.1.7 Release: 1%{?dist} Summary: Private file sync and share server Group: Applications/Internet @@ -73,7 +73,7 @@ Patch6: %{name}-9.1.4-correct-cli-upgrade.patch Patch7: %{name}-9.1.0-default_integrity_check_disabled.patch # No need to check PHP versions, Fedora maintainers are on the job -Patch8: %{name}-9.1.4-dont_warn_about_php_versions.patch +Patch8: %{name}-9.1.7-dont_warn_about_php_versions.patch #Backport of php7.1 fixes Patch9: %{name}-b129d5d-php71-backport.patch @@ -100,7 +100,7 @@ BuildRequires: php-pear # For sanity %%check BuildRequires: php-cli -BuildRequires: php-composer(sabre/dav) >= 3.0.8 +BuildRequires: php-composer(sabre/dav) >= 3.0.9 BuildRequires: php-composer(sabre/dav) < 4.0 BuildRequires: php-composer(doctrine/dbal) >= 2.5.4 BuildRequires: php-composer(doctrine/dbal) < 2.6 @@ -150,7 +150,7 @@ BuildRequires: php-composer(owncloud/tarstreamer) >= 0.1 BuildRequires: php-composer(owncloud/tarstreamer) < 1.0 BuildRequires: php-composer(patchwork/jsqueeze) >= 2.0 BuildRequires: php-composer(patchwork/jsqueeze) < 3.0 -BuildRequires: php-composer(kriswallsmith/assetic) >= 1.3.2-3 +BuildRequires: php-composer(kriswallsmith/assetic) >= 1.3.2 BuildRequires: php-composer(kriswallsmith/assetic) < 2.0 BuildRequires: php-composer(icewind/smb) >= 1.1.0 BuildRequires: php-composer(icewind/smb) < 2.0 @@ -310,12 +310,12 @@ Requires: php-composer(patchwork/jsqueeze) < 3.0 # "kriswallsmith/assetic": "1.3.2" # Need release 3 for the autoloader fix to avoid it spamming the logs -Requires: php-composer(kriswallsmith/assetic) >= 1.3.2-3 +Requires: php-composer(kriswallsmith/assetic) >= 1.3.2 Requires: php-composer(kriswallsmith/assetic) < 2.0 # "sabre/dav" : "3.0.8" # pulls in sabre event, http and vobject, xml, uri as strict requires -Requires: php-composer(sabre/dav) >= 3.0.8 +Requires: php-composer(sabre/dav) >= 3.0.9 Requires: php-composer(sabre/dav) < 4.0 # symfony/polyfill-mbstring is not in composer.json but is in the 3rdparty folder @@ -830,6 +830,15 @@ rm -rf %{buildroot} %changelog +* Thu Nov 23 2017 Remi Collet <remi@remirepo.net> - 9.1.7-1 +- update to 9.1.7 + +* Thu May 18 2017 James Hogarth <james.hogarth@gmail.com> - 9.1.5-1 +- Update to 9.1.5 + +* Fri May 5 2017 Remi Collet <remi@remirepo.net> - 9.1.6-1 +- update to 9.1.6 + * Fri May 5 2017 Remi Collet <remi@remirepo.net> - 9.1.5-1 - update to 9.1.5 |