demus/nextcloud-rpm
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/nextcloud.git synced 2025-01-25 09:45:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to Nextcloud 18.0.0

Browse Source 
- Refactor spec file
- Update to Nextcoud 18.0.0
This commit is contained in:
Ivan Chavero 2020-02-08 12:49:12 -06:00
parent c90d633e65
commit 65e2599eb2
12 changed files with 165 additions and 888 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/nextcloud-10.0.3.tar.bz2
/nextcloud-10.0.4.tar.bz2
/nextcloud-18.0.0.tar.bz2

94
nextcloud-10.0.3-dont-check-php-version.patch
View File

@ -1,94 +0,0 @@
diff --git a/console.php b/console.php
index b2724db..149c265 100644
--- a/console.php
+++ b/console.php
@@ -31,22 +31,6 @@ use Symfony\Component\Console\Output\ConsoleOutput;
define('OC_CONSOLE', 1);
-// Show warning if a PHP version below 5.4.0 is used, this has to happen here
-// because base.php will already use 5.4 syntax.
-if (version_compare(PHP_VERSION, '5.4.0') === -1) {
- echo 'This version of Nextcloud requires at least PHP 5.4.0'.PHP_EOL;
- echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'.PHP_EOL;
- return;
-}
-
-// Show warning if PHP 7.1 is used as Nextcloud is not compatible with PHP 7.1 for now
-// @see https://github.com/nextcloud/docker-ci/issues/10
-if (version_compare(PHP_VERSION, '7.1.0') !== -1) {
- echo 'This version of Nextcloud is not compatible with PHP 7.1.<br/>';
- echo 'You are currently running ' . PHP_VERSION . '.';
- return;
-}
-
function exceptionHandler($exception) {
echo "An unhandled exception has been thrown:" . PHP_EOL;
echo $exception;
diff --git a/cron.php b/cron.php
index 4473dba..7a4e1a6 100644
--- a/cron.php
+++ b/cron.php
@@ -30,20 +30,6 @@
*
*/
-// Show warning if a PHP version below 5.4.0 is used
-if (version_compare(PHP_VERSION, '5.4.0') === -1) {
- echo 'This version of Nextcloud requires at least PHP 5.4.0<br/>';
- echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
- return;
-}
-
-// Show warning if PHP 7.1 is used as Nextcloud is not compatible with PHP 7.1 for now
-// @see https://github.com/nextcloud/docker-ci/issues/10
-if (version_compare(PHP_VERSION, '7.1.0') !== -1) {
- echo 'This version of Nextcloud is not compatible with PHP 7.1.<br/>';
- echo 'You are currently running ' . PHP_VERSION . '.';
- return;
-}
try {
diff --git a/index.php b/index.php
index e72d38c..29920d7 100644
--- a/index.php
+++ b/index.php
@@ -25,22 +25,6 @@
*
*/
-// Show warning if a PHP version below 5.4.0 is used, this has to happen here
-// because base.php will already use 5.4 syntax.
-if (version_compare(PHP_VERSION, '5.4.0') === -1) {
- echo 'This version of Nextcloud requires at least PHP 5.4.0<br/>';
- echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
- return;
-}
-
-// Show warning if PHP 7.1 is used as Nextcloud is not compatible with PHP 7.1 for now
-// @see https://github.com/nextcloud/docker-ci/issues/10
-if (version_compare(PHP_VERSION, '7.1.0') !== -1) {
- echo 'This version of Nextcloud is not compatible with PHP 7.1.<br/>';
- echo 'You are currently running ' . PHP_VERSION . '.';
- return;
-}
-
try {
require_once __DIR__ . '/lib/base.php';
diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
index 86b9b76..ac42177 100644
--- a/settings/Controller/CheckSetupController.php
+++ b/settings/Controller/CheckSetupController.php
@@ -212,9 +212,7 @@ class CheckSetupController extends Controller {
* @return bool
*/
protected function isPhpOutdated() {
- if (version_compare(PHP_VERSION, '5.5.0') === -1) {
- return true;
- }
+ // PHP supported in distribution
return false;
}

43
nextcloud-10.0.4-correct-cli-upgrade.patch
View File

@ -1,43 +0,0 @@
diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php
index 87f9396..368a533 100644
--- a/core/templates/update.admin.php
+++ b/core/templates/update.admin.php
@@ -37,7 +37,7 @@
<input class="updateButton" type="button" value="<?php p($l->t('Start update')) ?>">
<div class="infogroup">
<?php p($l->t('To avoid timeouts with larger installations, you can instead run the following command from your installation directory:')) ?>
- <pre>./occ upgrade</pre>
+ <pre>sudo -u apache php /usr/share/nextcloud/occ upgrade</pre>
</div>
</div>
diff --git a/core/templates/update.use-cli.php b/core/templates/update.use-cli.php
index 52d40cd..945d4d9 100644
--- a/core/templates/update.use-cli.php
+++ b/core/templates/update.use-cli.php
@@ -7,8 +7,10 @@
} else {
p($l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
} ?><br><br>
- <?php
- print_unescaped($l->t('For help, see the <a target="_blank" rel="noreferrer" href="%s">documentation</a>.', [link_to_docs('admin-cli-upgrade')])); ?><br><br>
+ <code>
+sudo -u apache php /usr/share/nextcloud/occ upgrade
+</code>
+ <br><br>
</div>
</div>
</div>
diff --git a/updater/index.php b/updater/index.php
index 017ca70..085c250 100644
--- a/updater/index.php
+++ b/updater/index.php
@@ -1830,7 +1830,7 @@ if(strpos($updaterUrl, 'index.php') === false) {
var el = document.getElementById('step-maintenance-mode')
.getElementsByClassName('output')[0];
if (keepActive) {
- el.innerHTML = 'Maintenance mode will kept active.<br>Now trigger the migration via command line: <code>./occ upgrade</code><br>';
+ el.innerHTML = 'Maintenance mode will kept active.<br>Now trigger the migration via command line: <code>sudo -u apache php /usr/share/nextcloud/occ upgrade</code><br>';
successStep('step-maintenance-mode');
currentStep('step-done');
performStep(11, performStepCallbacks[11]);

22
nextcloud-463e2ea-php71-backport.patch
View File

@ -1,22 +0,0 @@
From 463e2ea15d6fb71b96363d60c7e4bdc2c020eddf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 4 Jul 2016 13:47:03 +0200
Subject: [PATCH] Initialize array elements properly
---
lib/private/App/InfoParser.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/private/App/InfoParser.php b/lib/private/App/InfoParser.php
index c158e5c..843ed02 100644
--- a/lib/private/App/InfoParser.php
+++ b/lib/private/App/InfoParser.php
@@ -141,7 +141,7 @@ function xmlToArray($xml) {
$totalElement = count($xml->{$element});
if (!isset($array[$element])) {
- $array[$element] = "";
+ $array[$element] = $totalElement > 1 ? [] : "";
}
/** @var \SimpleXMLElement $node */
// Has attributes

15
nextcloud-9.1.0-amazon-autoloader.patch
View File

@ -1,15 +0,0 @@
diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php
index 4bb4312..85e04a3 100644
--- a/apps/files_external/lib/Lib/Storage/AmazonS3.php
+++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php
@@ -35,10 +35,6 @@
namespace OCA\Files_External\Lib\Storage;
-set_include_path(get_include_path() . PATH_SEPARATOR .
- \OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
-require 'aws-autoloader.php';
-
use Aws\S3\S3Client;
use Aws\S3\Exception\S3Exception;
use Icewind\Streams\IteratorDirectory;

13
nextcloud-9.1.0-default_integrity_check_disabled.patch
View File

@ -1,13 +0,0 @@
diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php
index d4038f8..7901a2c 100644
--- a/lib/private/IntegrityCheck/Checker.php
+++ b/lib/private/IntegrityCheck/Checker.php
@@ -109,7 +109,7 @@ class Checker {
* too prominent. So please do not add it to config.sample.php.
*/
if ($this->config !== null) {
- $isIntegrityCheckDisabled = $this->config->getSystemValue('integrity.check.disabled', false);
+ $isIntegrityCheckDisabled = $this->config->getSystemValue('integrity.check.disabled', true);
} else {
$isIntegrityCheckDisabled = false;
}

106
nextcloud-9.1.0-dont_update_htacess.patch
View File

@ -1,106 +0,0 @@
diff --git a/core/Command/Maintenance/UpdateHtaccess.php b/core/Command/Maintenance/UpdateHtaccess.php
deleted file mode 100644
index 2185078..0000000
--- a/core/Command/Maintenance/UpdateHtaccess.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Lukas Reschke <lukas@statuscode.ch>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-namespace OC\Core\Command\Maintenance;
-
-use InvalidArgumentException;
-use OC\Setup;
-use OCP\IConfig;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class UpdateHtaccess extends Command {
-
- protected function configure() {
- $this
- ->setName('maintenance:update:htaccess')
- ->setDescription('Updates the .htaccess file');
- }
-
- protected function execute(InputInterface $input, OutputInterface $output) {
- \OC\Setup::updateHtaccess();
- $output->writeln('.htaccess has been updated');
- return 0;
- }
-}
diff --git a/core/register_command.php b/core/register_command.php
index 6f20769..09535fe 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -60,7 +60,7 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
$application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager()));
$application->add(new OC\Core\Command\App\GetPath());
$application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
-
+
$application->add(new OC\Core\Command\TwoFactorAuth\Enable(
\OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
));
@@ -126,7 +126,6 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
new \OC\Repair(\OC\Repair::getRepairSteps(), \OC::$server->getEventDispatcher()), \OC::$server->getConfig(),
\OC::$server->getEventDispatcher()));
$application->add(new OC\Core\Command\Maintenance\SingleUser(\OC::$server->getConfig()));
- $application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger()));
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 3b3a57c..cd56795 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -379,10 +379,6 @@ class Setup {
// out that this is indeed an ownCloud data directory
file_put_contents($config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/.ocdata', '');
- // Update .htaccess files
- Setup::updateHtaccess();
- Setup::protectDataDirectory();
-
//try to write logtimezone
if (date_default_timezone_get()) {
$config->setSystemValue('logtimezone', date_default_timezone_get());
diff --git a/lib/private/Updater.php b/lib/private/Updater.php
index 609e965..85d4869 100644
--- a/lib/private/Updater.php
+++ b/lib/private/Updater.php
@@ -237,14 +237,6 @@ class Updater extends BasicEmitter {
throw new \Exception('Updates between multiple major versions and downgrades are unsupported.');
}
- // Update .htaccess files
- try {
- Setup::updateHtaccess();
- Setup::protectDataDirectory();
- } catch (\Exception $e) {
- throw new \Exception($e->getMessage());
- }
-
// create empty file in data dir, so we can later find
// out that this is indeed an ownCloud data directory
// (in case it didn't exist before)

25
nextcloud-9.1.0-dropbox-autoloader.patch
View File

@ -1,25 +0,0 @@
diff --git a/apps/files_external/ajax/oauth1.php b/apps/files_external/ajax/oauth1.php
index e363e6c..d2aefbc 100644
--- a/apps/files_external/ajax/oauth1.php
+++ b/apps/files_external/ajax/oauth1.php
@@ -23,7 +23,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
-require_once __DIR__ . '/../3rdparty/Dropbox/autoload.php';
OCP\JSON::checkAppEnabled('files_external');
OCP\JSON::checkLoggedIn();
diff --git a/apps/files_external/lib/Lib/Storage/Dropbox.php b/apps/files_external/lib/Lib/Storage/Dropbox.php
index f0f62f9..1b20a62 100644
--- a/apps/files_external/lib/Lib/Storage/Dropbox.php
+++ b/apps/files_external/lib/Lib/Storage/Dropbox.php
@@ -34,8 +34,6 @@ use Icewind\Streams\IteratorDirectory;
use Icewind\Streams\RetryWrapper;
use OCP\Files\StorageNotAvailableException;
-require_once __DIR__ . '/../../../3rdparty/Dropbox/autoload.php';
-
class Dropbox extends \OC\Files\Storage\Common {
private $dropbox;

37
nextcloud-9.1.0-google-autoloader.patch
View File

@ -1,37 +0,0 @@
diff --git a/apps/files_external/ajax/oauth2.php b/apps/files_external/ajax/oauth2.php
index 2d1fae2..d8dac91 100644
--- a/apps/files_external/ajax/oauth2.php
+++ b/apps/files_external/ajax/oauth2.php
@@ -26,9 +26,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
-set_include_path(get_include_path().PATH_SEPARATOR.
- \OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src');
-require_once 'Google/autoload.php';
OCP\JSON::checkAppEnabled('files_external');
OCP\JSON::checkLoggedIn();
diff --git a/apps/files_external/lib/Lib/Storage/Google.php b/apps/files_external/lib/Lib/Storage/Google.php
index 0b617aa..d40ac36 100644
--- a/apps/files_external/lib/Lib/Storage/Google.php
+++ b/apps/files_external/lib/Lib/Storage/Google.php
@@ -38,10 +38,6 @@ use GuzzleHttp\Exception\RequestException;
use Icewind\Streams\IteratorDirectory;
use Icewind\Streams\RetryWrapper;
-set_include_path(get_include_path().PATH_SEPARATOR.
- \OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src');
-require_once 'Google/autoload.php';
-
class Google extends \OC\Files\Storage\Common {
private $client;
@@ -462,7 +458,6 @@ class Google extends \OC\Files\Storage\Common {
$response = $client->get($downloadUrl, [
'headers' => $httpRequest->getRequestHeaders(),
'stream' => true,
- 'verify' => realpath(__DIR__ . '/../../../3rdparty/google-api-php-client/src/Google/IO/cacerts.pem'),
]);
} catch (RequestException $e) {
if(!is_null($e->getResponse())) {

13
nextcloud-b129d5d-php71-backport.patch
View File

@ -1,13 +0,0 @@
diff --git a/settings/Controller/SecuritySettingsController.php b/settings/Controller/SecuritySettingsController.php
index 88b2803..5c6f174 100644
--- a/settings/Controller/SecuritySettingsController.php
+++ b/settings/Controller/SecuritySettingsController.php
@@ -60,7 +60,7 @@ protected function returnSuccess() {
* @return array
*/
public function trustedDomains($newTrustedDomain) {
- $trustedDomains = $this->config->getSystemValue('trusted_domains');
+ $trustedDomains = $this->config->getSystemValue('trusted_domains', []);
$trustedDomains[] = $newTrustedDomain;
$this->config->setSystemValue('trusted_domains', $trustedDomains);

682
nextcloud.spec
View File

@ -1,6 +1,6 @@
Name: nextcloud
Version: 10.0.4
Release: 8%{?dist}
Version: 18.0.0
Release: 1%{?dist}
Summary: Private file sync and share server
License: AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe
@ -37,30 +37,6 @@ Source8: %{name}-fedora-autoloader.php
Source10: %{name}-systemd-timer.service
Source11: %{name}-systemd-timer.timer
# Stop OC from trying to do stuff to .htaccess files. Just calm down, OC.
# Distributors are on the case.
Patch1: %{name}-9.1.0-dont_update_htacess.patch
# Remove explicit load of dropbox
Patch2: %{name}-9.1.0-dropbox-autoloader.patch
# Remove explicit load of google
Patch3: %{name}-9.1.0-google-autoloader.patch
# Remove explicit load of aws
Patch4: %{name}-9.1.0-amazon-autoloader.patch
# Disable the integrity checking whilst a better way to deal with it is found
Patch5: %{name}-9.1.0-default_integrity_check_disabled.patch
# Apply the backport patches to support PHP7.1 and don't complain
Patch6: %{name}-463e2ea-php71-backport.patch
Patch7: %{name}-b129d5d-php71-backport.patch
Patch8: %{name}-10.0.3-dont-check-php-version.patch
# Direct the admin to the correct cli command for upgrades
Patch9: %{name}-10.0.4-correct-cli-upgrade.patch
BuildArch: noarch
# For the systemd macros
@ -72,92 +48,7 @@ BuildRequires: php-pear
# For sanity %%check
BuildRequires: php-cli
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) < 3
BuildRequires: php-composer(mcnetic/zipstreamer) >= 1.0
BuildRequires: php-composer(mcnetic/zipstreamer) < 2.0
BuildRequires: php-composer(phpseclib/phpseclib) >= 2.0
BuildRequires: php-composer(phpseclib/phpseclib) < 3.0
BuildRequires: php-composer(rackspace/php-opencloud) >= 1.9.2
BuildRequires: php-composer(rackspace/php-opencloud) < 2.0
BuildRequires: php-composer(jeremeamia/superclosure) >= 2.1.0
BuildRequires: php-composer(jeremeamia/superclosure) < 3.0
BuildRequires: php-composer(bantu/ini-get-wrapper) >= 1.0.1
BuildRequires: php-composer(bantu/ini-get-wrapper) < 2.0
BuildRequires: php-composer(natxet/CssMin) >= 3.0.4
BuildRequires: php-composer(natxet/CssMin) < 4.0
BuildRequires: php-composer(punic/punic) >= 1.6.3
BuildRequires: php-composer(punic/punic) < 2.0
%if 0%{?el7}
BuildRequires: php-pear(Archive_Tar) >= 1.3
BuildRequires: php-pear(Archive_Tar) < 2.0
%else
BuildRequires: php-composer(pear/archive_tar) >= 1.4.1
BuildRequires: php-composer(pear/archive_tar) < 2.0
%endif
BuildRequires: php-composer(patchwork/utf8) >= 1.2.6
BuildRequires: php-composer(patchwork/utf8) < 2.0
BuildRequires: php-composer(symfony/console) >= 2.8.3
BuildRequires: php-composer(symfony/console) < 3.0.0
BuildRequires: php-composer(symfony/event-dispatcher) >= 2.8.3
BuildRequires: php-composer(symfony/event-dispatcher) < 3.0.0
BuildRequires: php-composer(symfony/routing) >= 2.8.1
BuildRequires: php-composer(symfony/routing) < 3.0.0
BuildRequires: php-composer(symfony/process) >= 2.8.1
BuildRequires: php-composer(symfony/process) < 3.0.0
BuildRequires: php-composer(pimple/pimple) >= 3.0.2
BuildRequires: php-composer(pimple/pimple) < 4.0
%if 0%{?fedora} < 18 && 0%{?rhel} < 8
BuildRequires: php-composer(ircmaxell/password-compat) >= 1.0.0
BuildRequires: php-composer(ircmaxell/password-compat) < 2.0
%endif
BuildRequires: php-composer(nikic/php-parser) >= 1.4.1
BuildRequires: php-composer(nikic/php-parser) < 2.0
BuildRequires: php-composer(icewind/streams) >= 0.4.1
BuildRequires: php-composer(icewind/streams) < 1.0
BuildRequires: php-composer(swiftmailer/swiftmailer) >= 5.4.1
BuildRequires: php-composer(swiftmailer/swiftmailer) < 6.0
BuildRequires: php-composer(guzzlehttp/guzzle) >= 5.3.0
BuildRequires: php-composer(guzzlehttp/guzzle) < 6.0
BuildRequires: php-composer(league/flysystem) >= 1.0.20
BuildRequires: php-composer(league/flysystem) < 2.0
%if 0%{?el7}
BuildRequires: php-pear(Console_Getopt) > 1.3
BuildRequires: php-pear(Console_Getopt) < 2.0
BuildRequires: php-pear(PEAR) > 1.9
%else
BuildRequires: php-composer(pear/pear-core-minimal) >= 1.10.1
%endif
BuildRequires: php-composer(interfasys/lognormalizer) >= 1.0
BuildRequires: php-composer(interfasys/lognormalizer) < 2.0
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(symfony/polyfill-php70) >= 1.0
BuildRequires: php-composer(symfony/polyfill-php70) < 2.0
BuildRequires: php-composer(symfony/polyfill-php55) >= 1.0
BuildRequires: php-composer(symfony/polyfill-php55) < 2.0
BuildRequires: php-composer(symfony/polyfill-php56) >= 1.0
BuildRequires: php-composer(symfony/polyfill-php56) < 2.0
BuildRequires: php-composer(lukasreschke/id3parser) >= 0.0.1
BuildRequires: php-composer(lukasreschke/id3parser) < 1.0.0
BuildRequires: php-composer(icewind/smb) >= 1.1.0
BuildRequires: php-composer(icewind/smb) < 2.0
BuildRequires: php-pecl(smbclient) >= 0.8.0
BuildRequires: php-pecl(smbclient) < 2
BuildRequires: php-composer(google/apiclient) >= 1.1.7
# Note: 1.1.8 has BC breaks
BuildRequires: php-composer(google/apiclient) < 1.1.8
BuildRequires: php-composer(aws/aws-sdk-php) >= 2.7.5
BuildRequires: php-composer(aws/aws-sdk-php) < 3.0.0
BuildRequires: php-composer(symfony/yaml) >= 2.6.0
BuildRequires: php-composer(symfony/yaml) < 3.0.0
BuildRequires: php-pear(pear.dropbox-php.com/Dropbox)
BuildRequires: php-composer(onelogin/php-saml) >= 2.9.0
BuildRequires: php-composer(onelogin/php-saml) < 3.0
Requires: %{name}-webserver = %{version}-%{release}
Requires: %{name}-database = %{version}-%{release}
@ -181,196 +72,18 @@ Requires: php-xmlwriter
Requires: php-spl
Requires: php-zip
Requires: php-filter
Requires: php-mysqlnd
Requires: php-pgsql
Requires: php-ldap
Requires: php-smbclient
Requires: php-imap
Requires: php-gmp
Requires: php-pecl-imagick
Requires: php-pecl-memcached
Requires: php-pecl-apcu
Requires: php-pecl-redis5
### External PHP libs required by OC core
# "doctrine/dbal": "2.5.4"
# pulls in doctrine/common as a strict requires
# which pulls in doctrine/{annotations,inflector,cache,collections,lexer} as strict requires
Requires: php-composer(doctrine/dbal) >= 2.5.4
Requires: php-composer(doctrine/dbal) < 3
#"mcnetic/zipstreamer": "^1.0"
Requires: php-composer(mcnetic/zipstreamer) >= 1.0
Requires: php-composer(mcnetic/zipstreamer) < 2.0
# "phpseclib/phpseclib": "2.0.0"
Requires: php-composer(phpseclib/phpseclib) >= 2.0
Requires: php-composer(phpseclib/phpseclib) < 3.0
#Requires: php-composer(rackspace/php-opencloud) >= 1.9.2
# pulls in guzzle/http as a strict requires
# guzzle/http package include common, parser and stream too
Requires: php-composer(rackspace/php-opencloud) >= 1.9.2
Requires: php-composer(rackspace/php-opencloud) < 2.0
# "jeremeamia/superclosure": "2.1.0"
Requires: php-composer(jeremeamia/superclosure) >= 2.1.0
Requires: php-composer(jeremeamia/superclosure) < 3.0
# "bantu/ini-get-wrapper": "v1.0.1"
Requires: php-composer(bantu/ini-get-wrapper) >= 1.0.1
Requires: php-composer(bantu/ini-get-wrapper) < 2.0
# "natxet/CssMin": "dev-master"
Requires: php-composer(natxet/CssMin) >= 3.0.4
Requires: php-composer(natxet/CssMin) < 4.0
# "punic/punic": "1.6.3"
Requires: php-composer(punic/punic) >= 1.6.3
Requires: php-composer(punic/punic) < 2.0
# "pear/archive_tar": "1.4.1"
# archive_tar is in base el7 and doesn't have the fedora php-composer provides
%if 0%{?el7}
Requires: php-pear(Archive_Tar) >= 1.3
Requires: php-pear(Archive_Tar) < 2.0
%else
Requires: php-composer(pear/archive_tar) >= 1.4.1
Requires: php-composer(pear/archive_tar) < 2.0
%endif
# "patchwork/utf8": "1.2.6"
Requires: php-composer(patchwork/utf8) >= 1.2.6
Requires: php-composer(patchwork/utf8) < 2.0
# "symfony/console": "2.8.3"
Requires: php-composer(symfony/console) >= 2.8.3
Requires: php-composer(symfony/console) < 3.0.0
# "symfony/event-dispatcher": "2.8.3"
Requires: php-composer(symfony/event-dispatcher) >= 2.8.3
Requires: php-composer(symfony/event-dispatcher) < 3.0.0
# "symfony/routing": "2.8.1"
Requires: php-composer(symfony/routing) >= 2.8.1
Requires: php-composer(symfony/routing) < 3.0.0
# "symfony/process": "2.8.1"
Requires: php-composer(symfony/process) >= 2.8.1
Requires: php-composer(symfony/process) < 3.0.0
# "pimple/pimple": "3.0.2"
Requires: php-composer(pimple/pimple) >= 3.0.2
Requires: php-composer(pimple/pimple) < 4.0
%if 0%{?fedora} < 18 && 0%{?rhel} < 8
# "ircmaxell/password-compat": "1.0.*"
Requires: php-composer(ircmaxell/password-compat) >= 1.0.0
Requires: php-composer(ircmaxell/password-compat) < 2.0
%endif
# "nikic/php-parser": "1.4.1"
Requires: php-composer(nikic/php-parser) >= 1.4.1
Requires: php-composer(nikic/php-parser) < 2.0
# "icewind/Streams": "0.4.1"
Requires: php-composer(icewind/streams) >= 0.4.1
Requires: php-composer(icewind/streams) < 1.0
# "swiftmailer/swiftmailer": "@stable"
# Version 5.4.1 for autoloader in /usr/share/php
Requires: php-composer(swiftmailer/swiftmailer) >= 5.4.1
Requires: php-composer(swiftmailer/swiftmailer) < 6.0
# "guzzlehttp/guzzle": "5.3.0"
# pulls in guzzlehttp/ringphp as strict requires
# ringphp pulls in guzzlehttp/streams and react/promise as strict requires
Requires: php-composer(guzzlehttp/guzzle) >= 5.3.0
Requires: php-composer(guzzlehttp/guzzle) < 6.0
# "league/flysystem": "1.0.20"
Requires: php-composer(league/flysystem) >= 1.0.20
Requires: php-composer(league/flysystem) < 2.0
# "pear/pear-core-minimal": "v1.10.1"
# this includes pear/console_getopt and pear/PEAR
%if 0%{?el7}
Requires: php-pear(Console_Getopt) > 1.3
Requires: php-pear(Console_Getopt) < 2.0
Requires: php-pear(PEAR) > 1.9
%else
Requires: php-composer(pear/pear-core-minimal) >= 1.10.1
%endif
# "interfasys/lognormalizer": "v1.0"
Requires: php-composer(interfasys/lognormalizer) >= 1.0
Requires: php-composer(interfasys/lognormalizer) < 2.0
# "deepdiver1975/TarStreamer": "v0.1.0"
# Despite the difference in name this is correct
# https://github.com/owncloud/3rdparty/tree/master/deepdiver1975/tarstreamer
Requires: php-composer(owncloud/tarstreamer) >= 0.1
Requires: php-composer(owncloud/tarstreamer) < 1.0
# "patchwork/jsqueeze": "^2.0"
Requires: php-composer(patchwork/jsqueeze) >= 2.0
Requires: php-composer(patchwork/jsqueeze) < 3.0
# "sabre/dav" : "3.0.9"
# pulls in sabre event, http and vobject, xml, uri as strict requires
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
# we don't need it though as we ship mbstring itself
# "symfony/polyfill-php70": "^1.0",
# pulls in s strict requires of paragonie/random_compat
Requires: php-composer(symfony/polyfill-php70) >= 1.0
Requires: php-composer(symfony/polyfill-php70) < 2.0
# "symfony/polyfill-php55": "^1.0",
Requires: php-composer(symfony/polyfill-php55) >= 1.0
Requires: php-composer(symfony/polyfill-php55) < 2.0
# "symfony/polyfill-php56": "^1.0"
Requires: php-composer(symfony/polyfill-php56) >= 1.0
Requires: php-composer(symfony/polyfill-php56) < 2.0
# "lukasreschke/id3parser": "^0.0.1"
Requires: php-composer(lukasreschke/id3parser) >= 0.0.1
Requires: php-composer(lukasreschke/id3parser) < 1.0.0
### For dependencies of apps/files_external
## SMB/CIFS external storage stuff
#"icewind/smb": "1.1.0"
# note that streams is a dep but already required by core anyway
Requires: php-composer(icewind/smb) >= 1.1.0
Requires: php-composer(icewind/smb) < 2.0
# This makes smb external storage usable in performance
# and doesn't break things like encryption due to timeouts
Requires: php-pecl(smbclient) >= 0.8.0
Requires: php-pecl(smbclient) < 2
# Requiring so that the shipped external smb storage works
# The net command is needed and enabling smb tests for smbclient command
Requires: samba-common-tools
Requires: samba-client
## Note these next bits are not listed in composer but manually dropped in place
## Dropbox external storage
Requires: php-pear(pear.dropbox-php.com/Dropbox)
## Google Drive external storage
## Note: 1.1.8 has BC breaks
Requires: php-composer(google/apiclient) >= 1.1.7
Requires: php-composer(google/apiclient) < 1.1.8
## AWS S3 external storage
Requires: php-composer(aws/aws-sdk-php) >= 2.7.0
Requires: php-composer(aws/aws-sdk-php) < 3.0.0
## For dependency of apps/gallery
# "symfony/yaml": "~2.6"
Requires: php-composer(symfony/yaml) >= 2.6.0
Requires: php-composer(symfony/yaml) < 3.0.0
## For dependency of app/user_saml
# "onelogin/php-saml": "^2.9"
Requires: php-composer(onelogin/php-saml) >= 2.9.0
Requires: php-composer(onelogin/php-saml) < 3.0.0
#TODO: missing ffmpeg php extension
# Need to label the httpd rw stuff correctly until base selinux policy updated
Requires(post): %{_sbindir}/semanage
@ -378,42 +91,42 @@ Requires(postun): %{_sbindir}/semanage
# Bundled javascript libraries in core vendor
# State of javascript in fedora right now is too painful to unbundle
Provides: bundled(js-base64) = 0.3.0
Provides: bundled(js-blueimp-md5) = 1.1.0
Provides: bundled(js-bootstrap/tooltip) = 3.3.6
Provides: bundled(js-clipboard) = 1.5.12
Provides: bundled(js-davclient)
Provides: bundled(js-es6-promise) = 2.3.0
Provides: bundled(js-handlebars) = 1.3.0
Provides: bundled(js-jcrop) = 0.9.12
Provides: bundled(js-jquery-ui) = 1.10
Provides: bundled(js-jsTimezoneDetect) = 1.0.6
Provides: bundled(js-moment) = 2.10.3
Provides: bundled(js-select2) = 3.4.8
Provides: bundled(js-snapjs) = 2.0.0
Provides: bundled(js-strengthify) = 0.5.1
Provides: bundled(js-zxcvbn) = gitf2a8cda13d
Provides: bundled(js-jquery) = 2.1.4
Provides: bundled(js-jquery-migrate) = 1.4.0
Provides: bundled(js-backbone) = 1.2.3
Provides: bundled(js-underscore) = 1.8.3
#Provides: bundled(js-base64) = 0.3.0
#Provides: bundled(js-blueimp-md5) = 1.1.0
#Provides: bundled(js-bootstrap/tooltip) = 3.3.6
#Provides: bundled(js-clipboard) = 1.5.12
#Provides: bundled(js-davclient)
#Provides: bundled(js-es6-promise) = 2.3.0
#Provides: bundled(js-handlebars) = 1.3.0
#Provides: bundled(js-jcrop) = 0.9.12
#Provides: bundled(js-jquery-ui) = 1.10
#Provides: bundled(js-jsTimezoneDetect) = 1.0.6
#Provides: bundled(js-moment) = 2.10.3
#Provides: bundled(js-select2) = 3.4.8
#Provides: bundled(js-snapjs) = 2.0.0
#Provides: bundled(js-strengthify) = 0.5.1
#Provides: bundled(js-zxcvbn) = gitf2a8cda13d
#Provides: bundled(js-jquery) = 2.1.4
#Provides: bundled(js-jquery-migrate) = 1.4.0
#Provides: bundled(js-backbone) = 1.2.3
#Provides: bundled(js-underscore) = 1.8.3
# bundled from files_pdfviewer
Provides: bundled(js-pdfjs) = 1.1.469
#Provides: bundled(js-pdfjs) = 1.1.469
# bundled from files_theming
Provides: bundled(js-jscolor) = 2.0.4
#Provides: bundled(js-jscolor) = 2.0.4
# bundled from federatedfilesharing
Provides: bundled(js-gs-share)
#Provides: bundled(js-gs-share)
# bundled from files_texteditor
Provides: bundled(js-ace)
#Provides: bundled(js-ace)
# bundled from user_ldap
Provides: bundled(js-jquery-multiselect) = 1.13
#Provides: bundled(js-jquery-multiselect) = 1.13
# bundled from gallery
Provides: bundled(js-bigshot)
Provides: bundled(js-commonmark) = 0.22.0
Provides: bundled(js-dompurify) = 0.7.0
Provides: bundled(js-eventsource-polyfill) = 0.9.7
Provides: bundled(js-jquery-touchevents) = 1.0.1
Provides: bundled(js-jqueryui-touch-punch) = 0.2.3
#Provides: bundled(js-bigshot)
#Provides: bundled(js-commonmark) = 0.22.0
#Provides: bundled(js-dompurify) = 0.7.0
#Provides: bundled(js-eventsource-polyfill) = 0.9.7
#Provides: bundled(js-jquery-touchevents) = 1.0.1
#Provides: bundled(js-jqueryui-touch-punch) = 0.2.3
%description
NextCloud gives you universal access to your files through a web interface or
@ -456,7 +169,7 @@ Provides: %{name}-database = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
# From getSupportedDatabases, mysql => pdo, mysql
Requires: php-pdo_mysql
Requires: php-mysqlnd
%description mysql
This package ensures the necessary dependencies are in place for NextCloud to
@ -494,7 +207,6 @@ Summary: SQLite 3 database support for NextCloud
Provides: %{name}-database = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
# From getSupportedDatabases, pgsql => class, SQLite3
Requires: php-sqlite3 php-pcre
%description sqlite
This package ensures the necessary dependencies are in place for NextCloud to
@ -515,200 +227,129 @@ cp %{SOURCE4} README.mysql
cp %{SOURCE5} README.postgresql
cp %{SOURCE6} MIGRATION.fedora
mv 3rdparty/composer.json 3rdparty_composer.json
mv apps/files_external/3rdparty/composer.json files_external_composer.json
mv apps/gallery/composer.json gallery_composer.json
mv apps/user_saml/3rdparty/composer.json user_saml_composer.json
# Explicitly remove the bundled libraries we're aware of
pushd 3rdparty
rm -r doctrine/{annotations,cache,collections,common,dbal,inflector,lexer}
rm -r mcnetic/zipstreamer
rm -r phpseclib/phpseclib
rm -r rackspace/php-opencloud guzzle/{http,common,parser,stream}
rm -r jeremeamia/SuperClosure
rm -r bantu/ini-get-wrapper
rm -r natxet/CssMin
rm -r punic/punic
rm -r pear/archive_tar
rm -r patchwork/utf8
rm -r symfony/console
rm -r symfony/event-dispatcher
rm -r symfony/routing
rm -r symfony/process
rm -r pimple/pimple
rm -r ircmaxell/password-compat
rm -r nikic/php-parser
rm -r icewind/streams
rm -r swiftmailer/swiftmailer
rm -r guzzlehttp/{guzzle,ringphp,streams} react/promise
rm -r league/flysystem
rm -r pear/{pear-core-minimal,console_getopt,pear_exception}
rm -r interfasys/lognormalizer
rm -r deepdiver1975/tarstreamer
rm -r patchwork/jsqueeze
rm -r sabre/{dav,event,http,vobject,uri,xml}
rm -r symfony/polyfill-{php55,php56,php70,mbstring,util}
rm -r paragonie/random_compat
rm -r lukasreschke/id3parser
rm README.md
# remove composer stuff
rm -r composer*
# clean up any empty directories
find -type d -empty -delete
# remove extraneous files now we've cleaned up
rm "LICENSE INFO" patches.txt
# add our Fedora autoloader
cp %{SOURCE8} ./autoload.php
# Set the vendor directory to macro based datadir in our autoloader
sed -i "s,##DATADIR##,%{_datadir}," autoload.php
popd
# remove files_external bundled libraries
rm -r apps/files_external/3rdparty/{icewind,Dropbox,google-api-php-client,aws-sdk-php,composer*}
# create autoloader, from composer.json, "require": {
# "icewind/smb": "1.0.4",
# "icewind/streams": "0.2"
# include stuff required directly but not in composer too
cat << 'EOF' | tee apps/files_external/3rdparty/autoload.php
<?php
require_once '%{_datadir}/php/Icewind/Streams/autoload.php';
require_once '%{_datadir}/php/Icewind/SMB/autoload.php';
require_once '%{_datadir}/pear/Dropbox/autoload.php';
if (file_exists('%{_datadir}/php/Google1/autoload.php')) {
require_once '%{_datadir}/php/Google1/autoload.php';
} else {
require_once '%{_datadir}/php/Google/autoload.php';
}
require_once '%{_datadir}/php/Aws/autoload.php';
EOF
# remove gallery external bundled libraries
rm -r apps/gallery/vendor/{symfony,composer*}
rm apps/gallery/composer.lock
# create autoloader, from composer.json, "require": {
# "symfony/yaml": "_2.6"
cat << 'EOF' | tee apps/gallery/vendor/autoload.php
<?php
require_once '%{_datadir}/php/Symfony/Component/Yaml/autoload.php';
EOF
# remove user_saml external bundled libraries
rm -r apps/user_saml/3rdparty/vendor/{composer*,onelogin}
rm apps/user_saml/3rdparty/composer.lock
# create autoloader
cat << 'EOF' | tee apps/user_saml/3rdparty/vendor/autoload.php
<?php
require_once '%{_datadir}/php/OneLogin/Saml2/autoload.php';
EOF
# clean up content
for f in {l10n.pl,init.sh,setup_owncloud.sh,image-optimization.sh,install_dependencies.sh}; do
find . -name "$f" -delete
done
rm ./l10n/rm-old.sh
rm ./apps/gallery/build/after_failure.sh
rm ./apps/gallery/build/documentation/docpublisher.sh
rm ./apps/gallery/build/xdebug_install.sh
find -name '.tx' -print0 | xargs -0 rm -rf
find -name '.bower.json' -print0 | xargs -0 rm -rf
find . -size 0 -type f -delete
# let's not ship upstream's 'updatenotification' app, which has zero chance of working and
# a big chance of blowing things up
rm -dr apps/updatenotification
# also remove the actual updater
rm -r updater
# Locate license files and put them sensibly in place
mv apps/files_pdfviewer/vendor/pdfjs/LICENSE js-pdfjs-LICENSE
mv apps/files_pdfviewer/vendor/pdfjs/web/cmaps/LICENSE js-pdfjs-cmaps-LICENSE
mv apps/files_retention/LICENSE files_retention-LICENSE
mv apps/gallery/COPYING gallery-LICENSE
mv apps/gallery/js/vendor/bigshot/LICENSE.txt js-bigshot-LICENSE
mv apps/gallery/js/vendor/commonmark/LICENSE js-commonmark-LICENSE
mv apps/gallery/js/vendor/dompurify/LICENSE js-dompurify-LICENSE
mv apps/gallery/js/vendor/eventsource-polyfill/LICENSE js-eventsource-polyfill-LICENSE
mv apps/notifications/COPYING notifications-LICENSE
mv apps/password_policy/LICENSE password_policy-LICENSE
mv apps/serverinfo/COPYING serverinfo-LICENSE
mv apps/survey_client/COPYING survey_client-LICENSE
mv apps/theming/js/3rdparty/jscolor/LICENSE.txt js-jscolor-LICENSE
mv apps/user_ldap/vendor/ui-multiselect/MIT-LICENSE js-jqueryui-multiselect-LICENSE
mv COPYING-AGPL nextcloud-LICENSE
mv core/fonts/LICENSE.txt fonts-LICENSE
mv core/vendor/backbone/LICENSE js-backbone-LICENSE
mv core/vendor/base64/LICENSE js-base64-LICENSE
mv core/vendor/davclient.js/LICENSE js-davclient-LICENSE
mv core/vendor/es6-promise/LICENSE js-es6-promise-LICENSE
mv core/vendor/jcrop/MIT-LICENSE.txt js-jcrop-LICENSE
mv core/vendor/jquery/MIT-LICENSE.txt js-jquery-LICENSE
mv core/vendor/jquery-ui/MIT-LICENSE.txt js-jquery-ui-LICENSE
mv core/vendor/jsTimezoneDetect/LICENCE.txt js-jsTimezoneDetect-LICENSE
mv core/vendor/moment/LICENSE js-moment-LICENSE
mv core/vendor/select2/LICENSE js-select2-LICENSE
mv core/vendor/strengthify/LICENSE js-strengthify-LICENSE
mv core/vendor/underscore/LICENSE js-underscore-LICENSE
mv core/vendor/zxcvbn/LICENSE.txt js-zxcvbn-LICENSE
mv COPYING nextcloud-LICENSE
mv core/vendor/zxcvbn/LICENSE.txt zxcvbn-LICENSE
mv core/fonts/LICENSE_OFL.txt fonts-LICENSE
mv lib/composer/composer/LICENSE composer-LICENSE
mv 3rdparty/sabre/vobject/LICENSE sabre-LICENSE
mv 3rdparty/sabre/dav/LICENSE sabre-LICENSE
mv 3rdparty/sabre/dav/lib/DAV/Browser/assets/openiconic/ICON-LICENSE sabre-ICON-LICENSE
mv 3rdparty/sabre/event/LICENSE sabre-LICENSE
mv 3rdparty/sabre/http/LICENSE sabre-LICENSE
mv 3rdparty/sabre/xml/LICENSE sabre-LICENSE
mv 3rdparty/sabre/uri/LICENSE sabre-LICENSE
mv 3rdparty/nikic/php-parser/LICENSE nikic-LICENSE
mv 3rdparty/bantu/ini-get-wrapper/LICENSE bantu-LICENSE
mv '3rdparty/LICENSE INFO' 3rdparty-LICENSE_INFO
mv 3rdparty/egulias/email-validator/LICENSE egulias-LICENSE
mv 3rdparty/stecman/symfony-console-completion/LICENCE stecman-LICENCE
mv 3rdparty/jeremeamia/SuperClosure/LICENSE.md jeremeamia-LICENSE
mv 3rdparty/microsoft/azure-storage-blob/LICENSE microsoft-LICENSE
mv 3rdparty/microsoft/azure-storage-common/LICENSE microsoft-LICENSE
mv 3rdparty/justinrainbow/json-schema/LICENSE justinrainbow-LICENSE
mv 3rdparty/doctrine/collections/LICENSE doctrine-LICENSE
mv 3rdparty/doctrine/event-manager/LICENSE doctrine-LICENSE
mv 3rdparty/doctrine/common/LICENSE doctrine-LICENSE
mv 3rdparty/doctrine/persistence/LICENSE doctrine-LICENSE
mv 3rdparty/doctrine/reflection/LICENSE doctrine-LICENSE
mv 3rdparty/doctrine/inflector/LICENSE doctrine-LICENSE
mv 3rdparty/doctrine/cache/LICENSE doctrine-LICENSE
mv 3rdparty/doctrine/dbal/LICENSE doctrine-LICENSE
mv 3rdparty/doctrine/annotations/LICENSE doctrine-LICENSE
mv 3rdparty/deepdiver/zipstreamer/COPYING deepdiver-COPYING
mv 3rdparty/mtdowling/jmespath.php/LICENSE mtdowling-LICENSE
mv 3rdparty/punic/punic/LICENSE.txt punic-LICENSE.txt
mv 3rdparty/punic/punic/UNICODE-LICENSE.txt punic-UNICODE-LICENSE
mv 3rdparty/christophwurst/id3parser/LICENSE christophwurst-LICENSE
mv 3rdparty/symfony/event-dispatcher-contracts/LICENSE symfony-LICENSE
mv 3rdparty/symfony/process/LICENSE symfony-LICENSE
mv 3rdparty/symfony/event-dispatcher/LICENSE symfony-LICENSE
mv 3rdparty/symfony/polyfill-php56/LICENSE symfony-LICENSE
mv 3rdparty/symfony/routing/LICENSE symfony-LICENSE
mv 3rdparty/symfony/polyfill-intl-idn/LICENSE symfony-LICENSE
mv 3rdparty/symfony/polyfill-iconv/LICENSE symfony-LICENSE
mv 3rdparty/symfony/polyfill-mbstring/LICENSE symfony-LICENSE
mv 3rdparty/symfony/polyfill-php72/LICENSE symfony-LICENSE
mv 3rdparty/symfony/translation/LICENSE symfony-LICENSE
mv 3rdparty/symfony/console/LICENSE symfony-LICENSE
mv 3rdparty/symfony/polyfill-php73/LICENSE symfony-LICENSE
mv 3rdparty/symfony/translation-contracts/LICENSE symfony-LICENSE
mv 3rdparty/symfony/service-contracts/LICENSE symfony-LICENSE
mv 3rdparty/symfony/polyfill-util/LICENSE symfony-LICENSE
mv 3rdparty/react/promise/LICENSE react-LICENSE
mv 3rdparty/composer/LICENSE composer-LICENSE
mv 3rdparty/icewind/searchdav/LICENSE icewind-LICENSE
mv 3rdparty/aws/aws-sdk-php/LICENSE.md aws-LICENSE.md
mv 3rdparty/interfasys/lognormalizer/COPYING interfasys-COPYING
mv 3rdparty/php-opencloud/openstack/LICENSE php-opencloud-LICENSE
mv 3rdparty/league/flysystem/LICENSE league-LICENSE
mv 3rdparty/phpseclib/phpseclib/LICENSE phpseclib-LICENSE
mv 3rdparty/deepdiver1975/tarstreamer/LICENSE deepdiver1975-LICENSE
mv 3rdparty/patchwork/jsqueeze/LICENSE.GPLv2 patchwork-LICENSE
mv 3rdparty/patchwork/jsqueeze/LICENSE.ASL20 patchwork-LICENSE
mv 3rdparty/patchwork/utf8/LICENSE-GPL patchwork-LICENSE-GPL
mv 3rdparty/patchwork/utf8/LICENSE-APACHE patchwork-LICENSE-APACHE
mv 3rdparty/guzzlehttp/streams/LICENSE guzzlehttp-LICENSE
mv 3rdparty/guzzlehttp/guzzle/LICENSE guzzlehttp-LICENSE
mv 3rdparty/guzzlehttp/promises/LICENSE guzzlehttp-LICENSE
mv 3rdparty/guzzlehttp/ringphp/LICENSE guzzlehttp-LICENSE
mv 3rdparty/guzzlehttp/psr7/LICENSE guzzlehttp-LICENSE
mv 3rdparty/pear/pear_exception/LICENSE pear-LICENSE
mv 3rdparty/pear/console_getopt/LICENSE pear-LICENSE
mv 3rdparty/leafo/scssphp/LICENSE.md leafo-LICENSE
mv 3rdparty/ralouphie/getallheaders/LICENSE ralouphie-LICENSE
mv 3rdparty/psr/log/LICENSE psr-LICENSE
mv 3rdparty/psr/http-message/LICENSE psr-LICENSE
mv 3rdparty/psr/container/LICENSE psr-LICENSE
mv apps/encryption/composer/composer/LICENSE encryption-LICENSE
mv apps/federatedfilesharing/composer/composer/LICENSE federatedfilesharing-LICENSE
mv apps/theming/js/3rdparty/jscolor/LICENSE.txt jscolor-LICENSE
mv apps/viewer/COPYING viewer-COPYING
mv apps/workflowengine/composer/composer/LICENSE workflowengine-LICENSE
mv apps/dav/composer/composer/LICENSE dav-LICENSE
mv apps/nextcloud_announcements/COPYING nextcloud_announcements-COPYING
mv apps/files_trashbin/composer/composer/LICENSE files_trashbin-LICENSE
mv apps/photos/COPYING photos-COPYING
mv apps/comments/composer/composer/LICENSE comments-LICENSE
mv apps/files_external/3rdparty/composer/LICENSE files_external-LICENSE
mv apps/files_external/3rdparty/icewind/streams/LICENCE icewind_streams-LICENCE
mv apps/files_external/3rdparty/icewind/smb/LICENSE.txt icewind_smb-LICENSE
mv apps/oauth2/composer/composer/LICENSE oauth2-LICENSE
mv apps/systemtags/composer/composer/LICENSE systemtags-LICENSE
mv apps/accessibility/composer/composer/LICENSE accessibility-LICENSE
mv apps/updatenotification/composer/composer/LICENSE updatenotification-LICENSE
mv apps/cloud_federation_api/LICENSE cloud_federation_api-LICENSE
mv apps/cloud_federation_api/composer/composer/LICENSE cloud_federation_api-LICENSE
mv apps/provisioning_api/composer/composer/LICENSE provisioning_api-LICENSE
mv apps/admin_audit/composer/composer/LICENSE admin_audit-LICENSE
mv apps/files_sharing/composer/composer/LICENSE files_sharing-LICENSE
mv apps/federation/composer/composer/LICENSE federation-LICENSE
mv apps/recommendations/LICENSE recommendations-LICENSE
mv apps/settings/composer/composer/LICENSE settings-LICENSE
mv apps/user_ldap/composer/composer/LICENSE user_ldap-LICENSE
mv apps/files_rightclick/COPYING files_rightclick-COPYING
mv apps/files_rightclick/LICENSE files_rightclick-LICENSE
mv apps/sharebymail/composer/composer/LICENSE sharebymail-LICENSE
mv apps/privacy/COPYING privacy-COPYING
mv apps/files_versions/composer/composer/LICENSE files_versions-LICENSE
mv apps/files/composer/composer/LICENSE files-LICENSE
mv apps/twofactor_backupcodes/composer/composer/LICENSE twofactor_backupcodes-LICENSE
mv apps/lookup_server_connector/composer/composer/LICENSE lookup_server_connector-LICENSE
mv apps/text/COPYING text-COPYING
%check
# files_external checks
nb=$(ls %{buildroot}%{_datadir}/%{name}/apps/files_external/3rdparty | wc -l)
if [ $nb -gt 1 ]; then
false apps/files_external/3rdparty must only have autoload.php
fi
if grep -r 3rdparty %{buildroot}%{_datadir}/%{name}/apps/files_external \
| grep -v 3rdparty/autoload.php | grep -v signature.json; then
false App files_external needs to be adapted
fi
php %{buildroot}%{_datadir}/%{name}/apps/files_external/3rdparty/autoload.php
# gallery checks
nb=$(ls %{buildroot}%{_datadir}/%{name}/apps/gallery/vendor | wc -l)
if [ $nb -gt 1 ]; then
false apps/gallery/vendor must only have autoload.php
fi
php %{buildroot}%{_datadir}/%{name}/apps/gallery/vendor/autoload.php
# user_saml checks
nb=$(ls %{buildroot}%{_datadir}/%{name}/apps/user_saml/3rdparty/vendor | wc -l)
if [ $nb -gt 1 ]; then
false apps/user_saml/3rdparty/vendor must only have autoload.php
fi
php %{buildroot}%{_datadir}/%{name}/apps/user_saml/3rdparty/vendor/autoload.php
# core checks
nb=$(ls %{buildroot}%{_datadir}/%{name}/3rdparty | wc -l)
if [ $nb -gt 1 ]; then
false core 3rdparty must only have autoload.php
fi
php %{buildroot}%{_datadir}/%{name}/3rdparty/autoload.php
# There should not be an composer.json files remaining
nb=$(find -name 'composer.*' | wc -l)
if [ $nb -gt 0 ]
then
false found unexpected composer.json files
fi
# Make sure there are no license files left over
nb=$( find . -mindepth 2 \( -name '*LICENSE*' -o -name '*LICENCE*' -o -name '*COPYING*' \) | wc -l )
if [ $nb -gt 0 ]
@ -720,7 +361,6 @@ fi
%build
# Nothing to build
%install
install -dm 755 %{buildroot}%{_datadir}/%{name}
@ -736,7 +376,7 @@ for d in $(find . -mindepth 1 -maxdepth 1 -type d | grep -v config); do
cp -a "$d" %{buildroot}%{_datadir}/%{name}
done
for f in {*.php,*.xml,*.html,occ,robots.txt}; do
for f in {*.php,*.html,occ,robots.txt}; do
install -pm 644 "$f" %{buildroot}%{_datadir}/%{name}
done
@ -805,6 +445,7 @@ fi
# once this package is accepted pull request for selinux-policy to add
# these will be made
%post
touch '%{_sysconfdir}/%{name}/CAN_INSTALL'
semanage fcontext -a -t httpd_sys_rw_content_t '%{_sysconfdir}/%{name}/config.php' 2>/dev/null || :
semanage fcontext -a -t httpd_sys_rw_content_t '%{_sysconfdir}/%{name}' 2>/dev/null || :
semanage fcontext -a -t httpd_sys_rw_content_t '%{_localstatedir}/lib/%{name}(/.*)?' 2>/dev/null || :
@ -820,7 +461,6 @@ fi
%files
%doc AUTHORS README.fedora MIGRATION.fedora config/config.sample.php
%doc *_composer.json
%license *-LICENSE
@ -857,6 +497,10 @@ fi
%changelog
* Sat Feb 08 2020 Ivan Chavero <ichavero@redhat.com> - 18.0.0-1
- Refactor spec file
- Update to Nextcoud 18.0.0
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (nextcloud-10.0.4.tar.bz2) = 4bb7a760b56088780eee7be83dd4c645703095f8bf11818f3d4cbf52c6636637d8724c3d972df068c54b0d98836ae29cd7c206e6fb5845ee646aeacc098e701d
SHA512 (nextcloud-18.0.0.tar.bz2) = c6a3b2bb2abed416fdebecd0c35b2547298370ef8a3a2cc884da877b39ab4a03d205653d94b20fdc0660fa355966771f65a7c0aa1c2117bb5abc85d2f091d4f7