From a8005c4854d421964c252b4a7a53938365b4cbbd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 13 May 2016 10:34:55 +0300 Subject: [PATCH] up to 3.1.0-51-g61de085 polyfills for php < 5.5 dropped --- autoload.patch | 30 ++++++++++++++---------------- eventum-paths.patch | 6 +++--- eventum.spec | 15 ++++++--------- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/autoload.patch b/autoload.patch index 3d575b7..9e41457 100644 --- a/autoload.patch +++ b/autoload.patch @@ -292,8 +292,8 @@ + 'Smarty' => $phpDir. '/Smarty3/Smarty.class.php', + 'SphinxClient' => $phpDir . '/sphinxapi.php', ); ---- eventum-3.0.10-88-g58096f4/vendor/composer/autoload_files.php~ 2016-03-28 18:51:44.000000000 +0300 -+++ eventum-3.0.10-88-g58096f4/vendor/composer/autoload_files.php 2016-03-28 18:54:46.229802427 +0300 +--- eventum-3.1.0-51-g61de085/vendor/composer/autoload_files.php~ 2016-05-13 10:29:50.063813186 +0300 ++++ eventum-3.1.0-51-g61de085/vendor/composer/autoload_files.php 2016-05-13 10:30:10.463509567 +0300 @@ -4,6 +4,7 @@ $vendorDir = dirname(dirname(__FILE__)); @@ -302,10 +302,10 @@ return array( $vendorDir . '/ircmaxell/password-compat/lib/password.php', -@@ -11,7 +12,6 @@ - $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php', +@@ -8,7 +8,6 @@ + + return array( $vendorDir . '/defuse/php-encryption/Crypto.php', - $vendorDir . '/ramsey/array_column/src/array_column.php', - $vendorDir . '/smarty-gettext/smarty-gettext/block.t.php', - $vendorDir . '/smarty-gettext/smarty-gettext/function.locale.php', $baseDir . '/lib/eventum/gettext.php', @@ -338,9 +338,9 @@ + 'Text' => array($pearDir), + 'XML' => array($pearDir), ); ---- eventum-3.0.10-88-g58096f4/vendor/composer/autoload_psr4.php~ 2016-03-28 18:51:44.000000000 +0300 -+++ eventum-3.0.10-88-g58096f4/vendor/composer/autoload_psr4.php 2016-03-28 18:56:37.231490194 +0300 -@@ -4,23 +4,24 @@ +--- eventum-3.1.0-51-g61de085/vendor/composer/autoload_psr4.php~ 2016-05-13 10:27:32.000000000 +0300 ++++ eventum-3.1.0-51-g61de085/vendor/composer/autoload_psr4.php 2016-05-13 10:32:20.194912026 +0300 +@@ -4,21 +4,22 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); @@ -353,14 +353,6 @@ - 'Zend\\Mail\\' => array($vendorDir . '/zendframework/zend-mail/src'), - 'Zend\\Loader\\' => array($vendorDir . '/zendframework/zend-loader/src'), - 'Zend\\Config\\' => array($vendorDir . '/zendframework/zend-config/src'), -+ 'Zend\\Validator\\' => array($phpDir . '/Zend/Validator'), -+ 'Zend\\Stdlib\\' => array($phpDir . '/Zend/Stdlib'), -+ 'Zend\\Mime\\' => array($phpDir . '/Zend/Mime'), -+ 'Zend\\Mail\\' => array($phpDir . '/Zend/Mail'), -+ 'Zend\\Loader\\' => array($phpDir . '/Zend/Loader'), -+ 'Zend\\Config\\' => array($phpDir . '/Zend/Config'), - 'Symfony\\Polyfill\\Php55\\' => array($vendorDir . '/symfony/polyfill-php55'), - 'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'), - 'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'), - 'Symfony\\Component\\Serializer\\' => array($vendorDir . '/symfony/serializer'), - 'Symfony\\Component\\OptionsResolver\\' => array($vendorDir . '/symfony/options-resolver'), @@ -368,6 +360,12 @@ - 'Symfony\\Component\\Filesystem\\' => array($vendorDir . '/symfony/filesystem'), - 'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'), - 'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'), ++ 'Zend\\Validator\\' => array($phpDir . '/Zend/Validator'), ++ 'Zend\\Stdlib\\' => array($phpDir . '/Zend/Stdlib'), ++ 'Zend\\Mime\\' => array($phpDir . '/Zend/Mime'), ++ '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'), diff --git a/eventum-paths.patch b/eventum-paths.patch index 5b8290e..bf3d6fe 100644 --- a/eventum-paths.patch +++ b/eventum-paths.patch @@ -44,7 +44,7 @@ +++ eventum-3.0.8-100-g3543f89/src/Command/MonitorCommand.php 2016-02-01 00:16:28.751423105 +0200 @@ -31,17 +31,17 @@ $required_files = array( - APP_CONFIG_PATH . '/config.php' => array( + APP_CONFIG_PATH . '/config.php' => [ 'check_owner' => true, - 'owner' => 'apache', + 'owner' => 'root', @@ -53,8 +53,8 @@ + 'group' => 'http', 'check_permission' => true, 'permission' => 640, - ), - APP_CONFIG_PATH . '/setup.php' => array( + ], + APP_CONFIG_PATH . '/setup.php' => [ 'check_owner' => true, - 'owner' => 'apache', + 'owner' => 'root', diff --git a/eventum.spec b/eventum.spec index 21f061b..c838ead 100644 --- a/eventum.spec +++ b/eventum.spec @@ -3,8 +3,8 @@ %bcond_with order # with experimental order patch %define rel 1 -#define subver 134 -#define githash fd60b15 +%define subver 51 +%define githash 61de085 %define php_min_version 5.5.0 %include /usr/lib/rpm/macros.php Summary: Eventum Issue / Bug tracking system @@ -14,9 +14,9 @@ Version: 3.1.0 Release: %{?subver:1.%{subver}.%{?githash:g%{githash}.}}%{rel} License: GPL v2+ Group: Applications/WWW -Source0: https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 3e918ac947a883e2e6c83a32f3bb0779 -#Source0: %{name}-%{version}-%{subver}-g%{githash}.tar.gz +#Source0: https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.gz +Source0: %{name}-%{version}-%{subver}-g%{githash}.tar.gz +# Source0-md5: de63594849033f61c039262ef84df248 Source1: %{name}-apache.conf Source2: %{name}-mail-queue.cron Source3: %{name}-mail-download.cron @@ -409,13 +409,10 @@ vendor() { vendor autoload.php vendor composer/autoload_{classmap,files,namespaces,real,psr4}.php vendor composer/ClassLoader.php -vendor ircmaxell/{password-compat,random-lib,security-lib} +vendor ircmaxell/{random-lib,security-lib} vendor defuse/php-encryption -vendor ramsey/array_column vendor willdurand/email-reply-parser vendor theorchard/monolog-cascade -vendor symfony/polyfill-php55 -vendor symfony/polyfill-mbstring # remove backups from patching as we use globs to package files to buildroot find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v -- 2.44.0