From 756554ddfae2686744c6b8c7e5938f326b14d0e3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 18 Jan 2019 00:39:50 +0200 Subject: [PATCH] up to 3.5.6-75-g293a8feb --- autoload.patch | 73 +++++++++++++++++++------------------------------- eventum.spec | 16 +++++------ 2 files changed, 34 insertions(+), 55 deletions(-) diff --git a/autoload.patch b/autoload.patch index badcb26..34a9b7b 100644 --- a/autoload.patch +++ b/autoload.patch @@ -1,5 +1,5 @@ ---- eventum-3.3.4-387-geb24072d/vendor/composer/autoload_classmap.php~ 2018-03-15 13:08:57.843633962 +0200 -+++ eventum-3.3.4-387-geb24072d/vendor/composer/autoload_classmap.php 2018-03-15 13:09:53.566126362 +0200 +--- eventum-3.5.6-75-g293a8feb/vendor/composer/autoload_classmap.php~ 2019-01-23 00:18:07.562769763 +0200 ++++ eventum-3.5.6-75-g293a8feb/vendor/composer/autoload_classmap.php 2019-01-23 00:19:46.887983481 +0200 @@ -4,6 +4,7 @@ $vendorDir = dirname(dirname(__FILE__)); @@ -8,23 +8,7 @@ return array( 'APIAuthToken' => $baseDir . '/lib/eventum/auth/APIAuthToken.php', -@@ -24,7 +25,6 @@ - 'CLI_Misc' => $baseDir . '/lib/eventum/class.cli_misc.php', - 'CRM' => $baseDir . '/lib/eventum/class.crm.php', - 'CRMException' => $baseDir . '/lib/eventum/class.crmexception.php', -- 'CachedFileReader' => $vendorDir . '/php-gettext/php-gettext/streams.php', - 'Category' => $baseDir . '/lib/eventum/class.category.php', - 'Command_Line' => $baseDir . '/lib/eventum/class.command_line.php', - 'Contact' => $baseDir . '/lib/eventum/crm/class.contact.php', -@@ -45,7 +45,6 @@ - 'Email_Response' => $baseDir . '/lib/eventum/class.email_response.php', - 'Eventum_Bot' => $baseDir . '/lib/eventum/irc/Eventum_Bot.php', - 'FAQ' => $baseDir . '/lib/eventum/class.faq.php', -- 'FileReader' => $vendorDir . '/php-gettext/php-gettext/streams.php', - 'Filter' => $baseDir . '/lib/eventum/class.filter.php', - 'Group' => $baseDir . '/lib/eventum/class.group.php', - 'Help' => $baseDir . '/lib/eventum/class.help.php', -@@ -60,20 +60,14 @@ +@@ -48,19 +48,13 @@ 'Link_Filter' => $baseDir . '/lib/eventum/class.link_filter.php', 'Mail_Helper' => $baseDir . '/lib/eventum/class.mail_helper.php', 'Mail_Queue' => $baseDir . '/lib/eventum/class.mail_queue.php', @@ -32,7 +16,6 @@ 'Mime_Helper' => $baseDir . '/lib/eventum/class.mime_helper.php', 'Misc' => $baseDir . '/lib/eventum/class.misc.php', 'MySQL_Fulltext_Search' => $baseDir . '/lib/eventum/search/class.mysql_fulltext_search.php', - 'Mysql_Auth_Backend' => $baseDir . '/lib/eventum/auth/class.mysql_auth_backend.php', - 'Net_POP3' => $vendorDir . '/pear-pear.php.net/Net_POP3/Net/POP3.php', - 'Net_Socket' => $vendorDir . '/pear-pear.php.net/Net_Socket/Net/Socket.php', - 'Net_URL' => $vendorDir . '/pear-pear.php.net/Net_URL/Net/URL.php', @@ -43,10 +26,10 @@ - 'PHPlot' => $vendorDir . '/phplot/phplot/phplot.php', - 'PHPlot_truecolor' => $vendorDir . '/phplot/phplot/phplot.php', 'Pager' => $baseDir . '/lib/eventum/class.pager.php', - 'ParseError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/ParseError.php', 'Partner' => $baseDir . '/lib/eventum/class.partner.php', -@@ -99,44 +93,21 @@ - 'SessionUpdateTimestampHandlerInterface' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/SessionUpdateTimestampHandlerInterface.php', + 'Phone_Support' => $baseDir . '/lib/eventum/class.phone_support.php', +@@ -83,43 +77,20 @@ + 'Search_Profile' => $baseDir . '/lib/eventum/class.search_profile.php', 'Setup' => $baseDir . '/lib/eventum/class.setup.php', 'Severity' => $baseDir . '/lib/eventum/class.severity.php', - 'SphinxClient' => $vendorDir . '/sphinx/php-sphinxapi/sphinxapi.php', @@ -84,7 +67,6 @@ - 'Text_Diff_ThreeWay_Op_copy' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff/ThreeWay.php', - 'Text_MappedDiff' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff.php', 'Time_Tracking' => $baseDir . '/lib/eventum/class.time_tracking.php', - 'TypeError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/TypeError.php', 'User' => $baseDir . '/lib/eventum/class.user.php', 'Validation' => $baseDir . '/lib/eventum/class.validation.php', 'Workflow' => $baseDir . '/lib/eventum/class.workflow.php', @@ -95,16 +77,19 @@ + 'Smarty' => $phpDir. '/Smarty3/Smarty.class.php', + 'SphinxClient' => $phpDir . '/sphinxapi.php', ); ---- eventum-3.5.2/vendor/composer/autoload_files.php 2018-07-06 10:56:53.018210155 +0300 -+++ eventum-3.5.2/vendor/composer/autoload_files.php 2018-07-06 10:57:42.254191350 +0300 -@@ -6,12 +6,10 @@ +--- eventum-3.5.6-75-g293a8feb/vendor/composer/autoload_files.php~ 2019-01-22 23:56:16.000000000 +0200 ++++ eventum-3.5.6-75-g293a8feb/vendor/composer/autoload_files.php 2019-01-23 00:22:07.852588625 +0200 +@@ -4,15 +4,13 @@ + + $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); +$phpDir = PHP_DATADIR . '/php'; return array( - '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php', - '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php', - '023d27dca8066ef29e6739335ea73bad' => $vendorDir . '/symfony/polyfill-php70/bootstrap.php', + '72142d7b40a3a0b14e91825290b5ad82' => $vendorDir . '/cakephp/core/functions.php', + '028fdea3165c4ba1ecccc83b7fec69fc' => $vendorDir . '/cakephp/collection/functions.php', + '948ad5488880985ff1c06721a4e447fe' => $vendorDir . '/cakephp/utility/bootstrap.php', - 'f084d01b0a599f67676cffef638aa95b' => $vendorDir . '/smarty/smarty/libs/bootstrap.php', 'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php', - 'b2b3f01361f3aaeab67fde08ae76446f' => $vendorDir . '/smarty-gettext/smarty-gettext/block.t.php', @@ -112,9 +97,9 @@ 'd12685060d57775f2bc3adf90c7d62bd' => $baseDir . '/lib/eventum/gettext.php', + 'b2b3f01361f3aaeab67fde08ae76446f' => $phpDir. '/Smarty3/plugins/block.t.php', ); ---- eventum-3.4.2-27-g4318eb0a/vendor/composer/autoload_namespaces.php~ 2018-05-20 15:47:14.000000000 +0300 -+++ eventum-3.4.2-27-g4318eb0a/vendor/composer/autoload_namespaces.php 2018-05-20 15:55:55.040415223 +0300 -@@ -3,19 +3,23 @@ +--- eventum-3.5.6-75-g293a8feb/vendor/composer/autoload_namespaces.php~ 2019-01-22 23:56:16.000000000 +0200 ++++ eventum-3.5.6-75-g293a8feb/vendor/composer/autoload_namespaces.php 2019-01-23 00:25:11.149906012 +0200 +@@ -3,16 +3,20 @@ // autoload_namespaces.php @generated by Composer $vendorDir = dirname(dirname(__FILE__)); @@ -128,10 +113,7 @@ - 'PEAR' => array($vendorDir . '/pear/pear_exception'), - 'Net' => array($vendorDir . '/pear/net_smtp'), 'Enrise\\' => array($vendorDir . '/enrise/urihelper/src'), - 'Doctrine\\ORM\\' => array($vendorDir . '/doctrine/orm/lib'), - 'Doctrine\\DBAL\\' => array($vendorDir . '/doctrine/dbal/lib'), 'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib'), - 'Doctrine\\Common\\Inflector\\' => array($vendorDir . '/doctrine/inflector/lib'), 'Doctrine\\Common\\Collections\\' => array($vendorDir . '/doctrine/collections/lib'), - 'Auth' => array($vendorDir . '/pear/auth_sasl'), - '' => array($vendorDir . '/pear/pear-core-minimal/src'), @@ -143,8 +125,8 @@ + 'PEAR' => array($pearDir), + 'Text' => array($pearDir), ); ---- eventum-3.3.4-421-g0643f20c/vendor/composer/autoload_psr4.php~ 2018-04-14 03:48:20.217212779 +0300 -+++ eventum-3.3.4-421-g0643f20c/vendor/composer/autoload_psr4.php 2018-04-14 03:48:39.833586386 +0300 +--- eventum-3.5.6-75-g293a8feb/vendor/composer/autoload_psr4.php~ 2019-01-22 23:56:16.000000000 +0200 ++++ eventum-3.5.6-75-g293a8feb/vendor/composer/autoload_psr4.php 2019-01-23 00:30:36.488478338 +0200 @@ -10,13 +10,6 @@ 'glen\\FilenameNormalizer\\Test\\' => array($vendorDir . '/glen/filename-normalizer/tests'), 'glen\\FilenameNormalizer\\' => array($vendorDir . '/glen/filename-normalizer/src'), @@ -156,10 +138,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\\Polyfill\\Php70\\' => array($vendorDir . '/symfony/polyfill-php70'), 'Symfony\\Polyfill\\Intl\\Normalizer\\' => array($vendorDir . '/symfony/polyfill-intl-normalizer'), - 'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'), -@@ -26,16 +19,12 @@ + 'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'), + 'Symfony\\Contracts\\' => array($vendorDir . '/symfony/contracts'), +@@ -32,15 +25,11 @@ 'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'), 'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'), 'Silly\\' => array($vendorDir . '/mnapoli/silly/src'), @@ -171,15 +153,14 @@ - 'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'), 'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'), 'Invoker\\' => array($vendorDir . '/php-di/invoker/src'), - 'Interop\\Container\\' => array($vendorDir . '/container-interop/container-interop/src/Interop/Container'), - 'Eventum\\Test\\' => array($baseDir . '/tests', $baseDir . '/tests/src'), 'Eventum\\' => array($baseDir . '/src'), 'EmailReplyParser\\' => array($vendorDir . '/willdurand/email-reply-parser/src/EmailReplyParser'), - 'Doctrine\\Instantiator\\' => array($vendorDir . '/doctrine/instantiator/src/Doctrine/Instantiator'), -@@ -43,4 +32,14 @@ - 'Doctrine\\Common\\Annotations\\' => array($vendorDir . '/doctrine/annotations/lib/Doctrine/Common/Annotations'), - 'Doctrine\\Common\\' => array($vendorDir . '/doctrine/common/lib/Doctrine/Common'), - 'Cascade\\' => array($vendorDir . '/theorchard/monolog-cascade/src'), + 'Doctrine\\ORM\\' => array($vendorDir . '/doctrine/orm/lib/Doctrine/ORM'), +@@ -59,4 +48,14 @@ + 'Cake\\Core\\' => array($vendorDir . '/cakephp/core'), + 'Cake\\Collection\\' => array($vendorDir . '/cakephp/collection'), + 'Cake\\Cache\\' => array($vendorDir . '/cakephp/cache'), + + 'Zend\\Validator\\' => array($phpDir . '/Zend/Validator'), + 'Zend\\ServiceManager\\' => array($phpDir . '/Zend/ServiceManager'), diff --git a/eventum.spec b/eventum.spec index 0afacdb..ddec304 100644 --- a/eventum.spec +++ b/eventum.spec @@ -3,8 +3,8 @@ %bcond_with order # with experimental order patch %define rel 1 -%define subver 50 -%define githash 34453995 +%define subver 75 +%define githash 293a8feb %define php_min_version 5.6.0 Summary: Eventum Issue / Bug tracking system Summary(pl.UTF-8): Eventum - system śledzenia spraw/błędów @@ -15,7 +15,7 @@ License: GPL v2+ Group: Applications/WWW #Source0: https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.xz Source0: https://github.com/eventum/eventum/releases/download/snapshot/%{name}-%{version}-%{subver}-g%{githash}.tar.xz -# Source0-md5: 36ea0d8eb6a1c4bc51da0cbaf29fb8d9 +# Source0-md5: e3059184b6eafb87b4504722f64fb93f Source1: %{name}-apache.conf Source2: %{name}-mail-queue.cron Source3: %{name}-mail-download.cron @@ -303,9 +303,7 @@ mv docs/examples . %{?with_order:%patch2 -p1} #%patch3 -p0 #%patch4 -p1 - %{?with_order:cp -p %{SOURCE16} htdocs/images} - #%patch200 -p1 # produce default sphinx config @@ -331,7 +329,6 @@ rm config/config.php %patch108 -p1 rm htdocs/.htaccess.dist - rm config/config.dist.php # cleanup vendor. keep only needed libraries. @@ -360,10 +357,9 @@ vendor psr/container 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/contracts vendor symfony/event-dispatcher vendor symfony/filesystem vendor symfony/http-foundation @@ -372,7 +368,6 @@ vendor symfony/serializer vendor symfony/yaml vendor symfony/ldap vendor paragonie/random_compat -vendor symfony/polyfill-php70 vendor symfony/polyfill-intl-normalizer vendor symfony/security-core vendor symfony/security-csrf @@ -388,6 +383,9 @@ vendor doctrine/lexer vendor doctrine/orm vendor cebe/markdown vendor enrise/urihelper +vendor cakephp/core +vendor cakephp/collection +vendor cakephp/utility # remove backups from patching as we use globs to package files to buildroot find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v -- 2.43.0