From f2782e19870911ad2b65f1dffae49897c481bf8f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 3 Apr 2017 14:05:51 +0200
Subject: rewrite autoloaders

---
 nextcloud.spec | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

(limited to 'nextcloud.spec')

diff --git a/nextcloud.spec b/nextcloud.spec
index 46ad3dd..562d565 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -16,7 +16,7 @@
 
 Name:           nextcloud
 Version:        10.0.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Private file sync and share server
 Group:          Applications/Internet
 
@@ -91,6 +91,8 @@ Requires:       crontabs
 # expand pear macros on install
 BuildRequires:  php-pear
 
+# Use by our autoloader
+BuildRequires:       php-composer(fedora/autoloader) >= 1.0.0
 # For sanity %%check
 BuildRequires:       php-cli
 BuildRequires:       php-composer(sabre/dav)  >= 3.0.9
@@ -170,6 +172,8 @@ BuildRequires:       php-composer(onelogin/php-saml) < 3.0
 Requires:       %{name}-webserver = %{version}-%{release}
 Requires:       %{name}-database = %{version}-%{release}
 
+# Use by our autoloader
+Requires:       php-composer(fedora/autoloader) >= 1.0.0
 # Core PHP libs/extensions required by OC core
 Requires:       php-curl
 Requires:       php-dom
@@ -592,15 +596,17 @@ rm -r apps/files_external/3rdparty/{icewind,Dropbox,google-api-php-client,aws-sd
 # 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';
+require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
+\Fedora\Autoloader\Dependencies::required(array(
+    '%{_datadir}/php/Icewind/Streams/autoload.php',
+    '%{_datadir}/php/Icewind/SMB/autoload.php',
+    '%{_datadir}/pear/Dropbox/autoload.php',
+    array(
+        '%{_datadir}/php/Google1/autoload.php',
+        '%{_datadir}/php/Google/autoload.php',
+    ),
+    '%{_datadir}/php/Aws/autoload.php',
+));
 EOF
 
 # remove gallery external bundled libraries
@@ -611,7 +617,10 @@ rm    apps/gallery/composer.lock
 #                "symfony/yaml": "_2.6"
 cat << 'EOF' | tee apps/gallery/vendor/autoload.php
 <?php
-require_once '%{_datadir}/php/Symfony/Component/Yaml/autoload.php';
+require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
+\Fedora\Autoloader\Dependencies::required(array(
+    '%{_datadir}/php/Symfony/Component/Yaml/autoload.php',
+));
 EOF
 
 # remove user_saml external bundled libraries
@@ -621,7 +630,10 @@ 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';
+require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
+\Fedora\Autoloader\Dependencies::required(array(
+    '%{_datadir}/php/OneLogin/Saml2/autoload.php',
+));
 EOF
 
 # clean up content
@@ -905,6 +917,10 @@ fi
 
 
 %changelog
+* Mon Apr  3 2017 Remi Collet remi@remirepo.net> - 10.0.4-3
+- ensure aws/php-sdk v2 loaded before v3
+- rewrite autoloader using fedora/autoloader
+
 * Mon Apr  3 2017 Remi Collet remi@remirepo.net> - 10.0.4-2
 - back to remi's repository
 
-- 
cgit