[packages/eventum: 7/8] up to 3.0.10-88-g58096f4
glen
glen at pld-linux.org
Mon Mar 28 18:18:31 CEST 2016
commit e61aeca076933e62722089e7442bc19738d2ec74
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Mar 28 18:59:28 2016 +0300
up to 3.0.10-88-g58096f4
autoload.patch | 16 +++++++++-------
eventum.spec | 11 ++++++-----
2 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index 6d656fe..7418fa8 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -2,9 +2,9 @@
# Conditional build:
%bcond_with order # with experimental order patch
-%define rel 1.8
-%define subver 69
-%define githash 9cf04f5
+%define rel 1.9
+%define subver 88
+%define githash 58096f4
%define php_min_version 5.3.7
%include /usr/lib/rpm/macros.php
Summary: Eventum Issue / Bug tracking system
@@ -16,7 +16,7 @@ License: GPL v2+
Group: Applications/WWW
#Source0: https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.gz
Source0: %{name}-%{version}-%{subver}-g%{githash}.tar.gz
-# Source0-md5: a849ee92409155c89dd2972e5fdba18a
+# Source0-md5: 91e4512fe3509b950cf9c7ee01376afc
Source1: %{name}-apache.conf
Source2: %{name}-mail-queue.cron
Source3: %{name}-mail-download.cron
@@ -449,8 +449,9 @@ vendor ircmaxell/{password-compat,random-lib,security-lib}
vendor defuse/php-encryption
vendor ramsey/array_column
vendor willdurand/email-reply-parser
-vendor symfony/polyfill-php55
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
diff --git a/autoload.patch b/autoload.patch
index cc2505d..3d575b7 100644
--- a/autoload.patch
+++ b/autoload.patch
@@ -292,9 +292,9 @@
+ 'Smarty' => $phpDir. '/Smarty3/Smarty.class.php',
+ 'SphinxClient' => $phpDir . '/sphinxapi.php',
);
---- eventum-3.0.10-60-g788184f/vendor/composer/autoload_files.php~ 2016-03-11 09:43:28.000000000 +0200
-+++ eventum-3.0.10-60-g788184f/vendor/composer/autoload_files.php 2016-03-11 10:01:49.058692552 +0200
-@@ -4,13 +4,13 @@
+--- 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
+@@ -4,6 +4,7 @@
$vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
@@ -302,7 +302,8 @@
return array(
$vendorDir . '/ircmaxell/password-compat/lib/password.php',
- $vendorDir . '/symfony/polyfill-php55/bootstrap.php',
+@@ -11,7 +12,6 @@
+ $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
$vendorDir . '/defuse/php-encryption/Crypto.php',
$vendorDir . '/ramsey/array_column/src/array_column.php',
- $vendorDir . '/smarty-gettext/smarty-gettext/block.t.php',
@@ -337,9 +338,9 @@
+ 'Text' => array($pearDir),
+ 'XML' => array($pearDir),
);
---- eventum-3.0.10-69-g9cf04f5/vendor/composer/autoload_psr4.php~ 2016-03-22 23:06:48.000000000 +0200
-+++ eventum-3.0.10-69-g9cf04f5/vendor/composer/autoload_psr4.php 2016-03-22 23:17:24.690856445 +0200
-@@ -4,22 +4,23 @@
+--- 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 @@
$vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
@@ -359,6 +360,7 @@
+ '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'),
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/1ea3a6502b8f41ad7de5bcc608d15f8f3645b558
More information about the pld-cvs-commit
mailing list