use bundled symfony components

requires symfony/console ^3.2.0

https://github.com/eventum/eventum/pull/279#issuecomment-328251866

diff --git a/autoload.patch b/autoload.patch
index d44e78b7fb08a7597b53731b9433788dec4dc63f..8c020cb3ca59ebba83557904e68dc0660aeb6496 100644 (file)
--- a/autoload.patch
+++ b/autoload.patch
@@ -157,9 +157,9 @@
 +    'PEAR' => array($pearDir),
 +    'Text' => array($pearDir),
  );
---- eventum-3.2.3-136-gbd09ead2/vendor/composer/autoload_psr4.php~     2017-09-20 19:58:12.000000000 +0300
-+++ eventum-3.2.3-136-gbd09ead2/vendor/composer/autoload_psr4.php      2017-09-20 20:12:31.188141500 +0300
-@@ -7,34 +7,32 @@
+--- eventum-3.2.3-136-gbd09ead2/vendor/composer/autoload_psr4.php      2017-09-20 20:12:31.188141500 +0300
++++ eventum-3.2.3-136-gbd09ead2/vendor/composer/autoload_psr4.php      2017-09-20 20:33:35.633314968 +0300
+@@ -7,13 +7,6 @@
  
  return array(
      'malkusch\\lock\\' => array($vendorDir . '/malkusch/lock/classes'),
@@ -170,15 +170,10 @@
 -    'Zend\\Mail\\' => array($vendorDir . '/zendframework/zend-mail/src'),
 -    'Zend\\Loader\\' => array($vendorDir . '/zendframework/zend-loader/src'),
 -    'Zend\\Config\\' => array($vendorDir . '/zendframework/zend-config/src'),
--    'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
--    'Symfony\\Component\\Serializer\\' => array($vendorDir . '/symfony/serializer'),
--    'Symfony\\Component\\OptionsResolver\\' => array($vendorDir . '/symfony/options-resolver'),
--    'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),
--    'Symfony\\Component\\Filesystem\\' => array($vendorDir . '/symfony/filesystem'),
--    'Symfony\\Component\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher'),
--    'Symfony\\Component\\Debug\\' => array($vendorDir . '/symfony/debug'),
--    'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'),
--    'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'),
+     'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
+     'Symfony\\Component\\Serializer\\' => array($vendorDir . '/symfony/serializer'),
+     'Symfony\\Component\\OptionsResolver\\' => array($vendorDir . '/symfony/options-resolver'),
+@@ -26,15 +19,21 @@
      'Silly\\' => array($vendorDir . '/mnapoli/silly/src'),
 -    'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
 -    'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
@@ -201,14 +196,6 @@
 +    'Zend\\Mail\\' => array($phpDir . '/Zend/Mail'),
 +    'Zend\\Loader\\' => array($phpDir . '/Zend/Loader'),
 +    'Zend\\Config\\' => array($phpDir . '/Zend/Config'),
-+    'Symfony\\Component\\Yaml\\' => array($phpDir . '/Symfony/Component/Yaml'),
-+    'Symfony\\Component\\Serializer\\' => array($phpDir . '/Symfony/Component/Serializer'),
-+    'Symfony\\Component\\OptionsResolver\\' =>  array($phpDir . '/Symfony/Component/OptionsResolver'),
-+    'Symfony\\Component\\HttpFoundation\\' => array($phpDir . '/Symfony/Component/HttpFoundation'),
-+    'Symfony\\Component\\EventDispatcher\\' => array($phpDir . '/Symfony/Component/EventDispatcher'),
-+    'Symfony\\Component\\Filesystem\\' => array($phpDir . '/Symfony/Component/Filesystem'),
-+    'Symfony\\Component\\Config\\' =>  array($phpDir . '/Symfony/Component/Config'),
-+    'Symfony\\Component\\Console\\' => array($phpDir . '/Symfony/Component/Console'),
 +    'Monolog\\' => array($phpDir . '/Monolog'),
 +    'Psr\\Log\\' => array($phpDir. '/Psr/Log'),
  );

diff --git a/eventum.spec b/eventum.spec
index 039b14ef91e272d2ab409c703dc69dcda86a24f2..689c6f4f80d2dbfcff79530c72d1be06aa03519d 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -2,7 +2,7 @@
 # Conditional build:
 %bcond_with    order   # with experimental order patch
 
-%define                rel             1.1
+%define                rel             1.3
 %define                subver  136
 %define                githash bd09ead2
 %define                php_min_version 5.6.0
@@ -79,14 +79,6 @@ Requires:    php-pear-Net_URL
 Requires:      php-pear-PEAR-core
 Requires:      php-pear-Text_Diff
 Requires:      php-psr-Log >= 1.0.0-2
-Requires:      php-symfony2-Config >= 2.7.7
-Requires:      php-symfony2-Console >= 2.7.7
-Requires:      php-symfony2-EventDispatcher >= 2.7.7
-Requires:      php-symfony2-Filesystem >= 2.7.7
-Requires:      php-symfony2-HttpFoundation >= 2.7.7
-Requires:      php-symfony2-OptionsResolver >= 2.7.7
-Requires:      php-symfony2-Serializer >= 2.7.7
-Requires:      php-symfony2-Yaml >= 2.7.7
 Requires:      phplot >= 5.8.0
 Requires:      webapps
 Requires:      webserver(access)
@@ -416,6 +408,15 @@ vendor phlib/flysystem-pdo
 vendor league/flysystem
 vendor php-di/invoker
 vendor container-interop/container-interop
+vendor symfony/config
+vendor symfony/console
+vendor symfony/debug
+vendor symfony/event-dispatcher
+vendor symfony/filesystem
+vendor symfony/http-foundation
+vendor symfony/options-resolver
+vendor symfony/serializer
+vendor symfony/yaml
 
 # remove backups from patching as we use globs to package files to buildroot
 find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v