up to 3.6.2

diff --git a/autoload.patch b/autoload.patch
index 7831df71bed5df6e807a9058b6e0da46b9301f04..1634197b7342e8f49d595f58e724cf33520ebc8f 100644 (file)
--- a/autoload.patch
+++ b/autoload.patch
@@ -1,5 +1,5 @@
---- eventum-3.5.6-67-g26f3e1f3/vendor/composer/autoload_classmap.php~  2019-01-28 00:43:31.648570821 +0200
-+++ eventum-3.5.6-67-g26f3e1f3/vendor/composer/autoload_classmap.php   2019-01-28 00:44:17.377912139 +0200
+--- eventum-3.6.1-76-g74f125a7a/vendor/composer/autoload_classmap.php~ 2019-03-07 17:19:22.676504958 +0200
++++ eventum-3.6.1-76-g74f125a7a/vendor/composer/autoload_classmap.php  2019-03-07 17:20:50.191892269 +0200
 @@ -4,6 +4,7 @@
  
  $vendorDir = dirname(dirname(__FILE__));
@@ -8,7 +8,7 @@
  
  return array(
      'APIAuthToken' => $baseDir . '/lib/eventum/auth/APIAuthToken.php',
-@@ -55,7 +55,6 @@
+@@ -54,7 +55,6 @@
      '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',
@@ -16,7 +16,7 @@
      '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',
-@@ -63,8 +62,6 @@
+@@ -62,8 +62,6 @@
      'News' => $baseDir . '/lib/eventum/class.news.php',
      'Note' => $baseDir . '/lib/eventum/class.note.php',
      'Notification' => $baseDir . '/lib/eventum/class.notification.php',
@@ -25,8 +25,8 @@
      'Pager' => $baseDir . '/lib/eventum/class.pager.php',
      'Partner' => $baseDir . '/lib/eventum/class.partner.php',
      'Phone_Support' => $baseDir . '/lib/eventum/class.phone_support.php',
-@@ -83,43 +77,20 @@
-     'Search_Profile' => $baseDir . '/lib/eventum/class.search_profile.php',
+@@ -94,12 +92,9 @@
+     'SebastianBergmann\\Diff\\TimeEfficientLongestCommonSubsequenceCalculator' => $vendorDir . '/sebastian/diff/src/TimeEfficientLongestCommonSubsequenceCalculator.php',
      'Setup' => $baseDir . '/lib/eventum/class.setup.php',
      'Severity' => $baseDir . '/lib/eventum/class.severity.php',
 -    'SphinxClient' => $vendorDir . '/sphinx/php-sphinxapi/sphinxapi.php',
@@ -38,34 +38,7 @@
      'Support' => $baseDir . '/lib/eventum/class.support.php',
      'SupportLevelNotFoundException' => $baseDir . '/lib/eventum/crm/class.support_level.php',
      'Support_Level' => $baseDir . '/lib/eventum/crm/class.support_level.php',
-     'Template_Helper' => $baseDir . '/lib/eventum/class.template_helper.php',
--    'Text_Diff' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff.php',
--    'Text_Diff3' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff3.php',
--    'Text_Diff3_BlockBuilder' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff3.php',
--    'Text_Diff3_Op' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff3.php',
--    'Text_Diff3_Op_copy' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff3.php',
--    'Text_Diff_Engine_native' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff/Engine/native.php',
--    'Text_Diff_Engine_shell' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff/Engine/shell.php',
--    'Text_Diff_Engine_string' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff/Engine/string.php',
--    'Text_Diff_Engine_xdiff' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff/Engine/xdiff.php',
--    'Text_Diff_Mapped' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff/Mapped.php',
--    'Text_Diff_Op' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff.php',
--    'Text_Diff_Op_add' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff.php',
--    'Text_Diff_Op_change' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff.php',
--    'Text_Diff_Op_copy' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff.php',
--    'Text_Diff_Op_delete' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff.php',
--    'Text_Diff_Renderer' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff/Renderer.php',
--    'Text_Diff_Renderer_context' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff/Renderer/context.php',
--    'Text_Diff_Renderer_inline' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff/Renderer/inline.php',
--    'Text_Diff_Renderer_unified' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff/Renderer/unified.php',
--    'Text_Diff_ThreeWay' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff/ThreeWay.php',
--    'Text_Diff_ThreeWay_BlockBuilder' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff/ThreeWay.php',
--    'Text_Diff_ThreeWay_Op' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff/ThreeWay.php',
--    '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',
-     'User' => $baseDir . '/lib/eventum/class.user.php',
-     'Validation' => $baseDir . '/lib/eventum/class.validation.php',
+@@ -110,3 +105,7 @@
      'Workflow' => $baseDir . '/lib/eventum/class.workflow.php',
 -    'gettext_reader' => $vendorDir . '/php-gettext/php-gettext/gettext.php',
 +
@@ -117,8 +90,8 @@
 +    'PEAR' => array($pearDir),
 +    'Text' => array($pearDir),
  );
---- eventum-3.5.6-67-g26f3e1f3/vendor/composer/autoload_psr4.php~      2019-01-28 00:48:54.920583094 +0200
-+++ eventum-3.5.6-67-g26f3e1f3/vendor/composer/autoload_psr4.php       2019-01-28 00:49:18.200249716 +0200
+--- eventum-3.6.1-82-gd9bc22cf6/vendor/composer/autoload_psr4.php~     2019-03-08 16:59:06.044745889 +0200
++++ eventum-3.6.1-82-gd9bc22cf6/vendor/composer/autoload_psr4.php      2019-03-08 17:11:50.127383625 +0200
 @@ -10,13 +10,6 @@
      'glen\\FilenameNormalizer\\Test\\' => array($vendorDir . '/glen/filename-normalizer/tests'),
      'glen\\FilenameNormalizer\\' => array($vendorDir . '/glen/filename-normalizer/src'),
@@ -130,9 +103,9 @@
 -    'Zend\\Mail\\' => array($vendorDir . '/zendframework/zend-mail/src'),
 -    'Zend\\Loader\\' => array($vendorDir . '/zendframework/zend-loader/src'),
 -    'Zend\\Config\\' => array($vendorDir . '/zendframework/zend-config/src'),
+     'TrueBV\\' => array($vendorDir . '/true/punycode/src'),
      'Symfony\\Contracts\\' => array($vendorDir . '/symfony/contracts'),
      'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
-     'Symfony\\Component\\Serializer\\' => array($vendorDir . '/symfony/serializer'),
 @@ -32,15 +25,11 @@
      'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'),
      'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'),

diff --git a/eventum-gettext.patch b/eventum-gettext.patch
index 1dcb7a01ebb82776f048f2dabcde06661dde0c23..a1903faa5f312d4891cdfb724f4f49fb9b70fa84 100644 (file)
--- a/eventum-gettext.patch
+++ b/eventum-gettext.patch
@@ -1,9 +1,10 @@
---- eventum-3.0.0/lib/eventum/gettext.php~     2014-11-12 18:47:36.000000000 +0200
-+++ eventum-3.0.0/lib/eventum/gettext.php      2015-02-02 20:08:38.869227761 +0200
-@@ -95,6 +95,5 @@
+--- eventum-3.6.1-76-g74f125a7a/lib/eventum/gettext.php~       2019-02-27 17:49:42.000000000 +0200
++++ eventum-3.6.1-76-g74f125a7a/lib/eventum/gettext.php        2019-03-07 17:18:16.284142306 +0200
+@@ -82,7 +82,6 @@
  }
  
- // this won't change over the request. so set it once and permanently
--_bindtextdomain('eventum', APP_PATH . '/localization/');
- _bind_textdomain_codeset('eventum', APP_CHARSET);
- _textdomain('eventum');
+ if (defined('APP_PATH')) {
+-    _bindtextdomain('eventum', APP_PATH . '/localization/');
+     _bind_textdomain_codeset('eventum', APP_CHARSET);
+     _textdomain('eventum');
+ }

diff --git a/eventum.spec b/eventum.spec
index a91de324cf3279dd1de4c5545fbc6539c367bbde..6be96e0701208cc383a75019813191c4645a1676 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -3,18 +3,18 @@
 %bcond_with    order   # with experimental order patch
 
 %define                rel             1
-#define                subver  43
-#define                githash 860c74205
+#define                subver  82
+#define                githash d9bc22cf6
 %define                php_min_version 7.1.3
 Summary:       Eventum Issue / Bug tracking system
 Summary(pl.UTF-8):     Eventum - system śledzenia spraw/błędów
 Name:          eventum
-Version:       3.6.1
+Version:       3.6.2
 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.xz
-# Source0-md5: bd31b91e0670a521686571cbf558ac49
+# Source0-md5: 59635b7c5b6c016fce3cdb5626303666
 #Source0:      https://github.com/eventum/eventum/releases/download/snapshot/%{name}-%{version}-%{subver}-g%{githash}.tar.xz
 Source1:       %{name}-apache.conf
 Source2:       %{name}-mail-queue.cron
@@ -74,7 +74,6 @@ Requires:     php-pear-Net_SMTP
 Requires:      php-pear-Net_Socket
 Requires:      php-pear-Net_URL
 Requires:      php-pear-PEAR-core
-Requires:      php-pear-Text_Diff
 Requires:      php-psr-Log >= 1.0.0-2
 Requires:      phplot >= 5.8.0
 Requires:      webapps
@@ -322,7 +321,6 @@ rm -r vendor/monolog/monolog
 rm -r vendor/pear/pear-core-minimal
 rm -r vendor/pear/pear_exception
 rm -r vendor/pear-pear.php.net/Math_Stats
-rm -r vendor/pear-pear.php.net/Text_Diff
 rm -r vendor/php-gettext/php-gettext
 rm -r vendor/phplot/phplot
 rm -r vendor/psr/log