commit 376f0835f4f298b039e63c8c48e408b732e0ab28
Author: Elan Ruusamäe <[email protected]>
Date: Fri Mar 11 10:22:36 2016 +0200
up to 3.0.10-60-g788184f
autoload.patch | 35 +++++++++++++++++++++++++----------
eventum.spec | 15 ++++++++-------
2 files changed, 33 insertions(+), 17 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index d5e49de..895cbd8 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -2,9 +2,9 @@
# Conditional build:
%bcond_with order # with experimental order patch
-%define rel 1
-#define subver 187
-#define githash acd7038
+%define rel 1.1
+%define subver 60
+%define githash 788184f
%define php_min_version 5.3.7
%include /usr/lib/rpm/macros.php
Summary: Eventum Issue / Bug tracking system
@@ -14,9 +14,9 @@ Version: 3.0.10
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: a82c8e741892b09679722fc72a9f25bd
-#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: 23a1fc1e680a859fb872fbe6e521a5ab
Source1: %{name}-apache.conf
Source2: %{name}-mail-queue.cron
Source3: %{name}-mail-download.cron
@@ -44,7 +44,7 @@ Patch108: autoload.patch
Patch200: %{name}-fixed-nav.patch
URL: http://eventum.mysql.org/
BuildRequires: /usr/bin/php
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
BuildRequires: php(core) >= %{php_min_version}
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.654
@@ -440,6 +440,7 @@ 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
# 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 32c77ec..30ad83b 100644
--- a/autoload.patch
+++ b/autoload.patch
@@ -292,18 +292,19 @@
+ 'Smarty' => $phpDir. '/Smarty3/Smarty.class.php',
+ 'SphinxClient' => $phpDir . '/sphinxapi.php',
);
---- eventum-3.0.9-73-g0d6904c/vendor/composer/autoload_files.php~
2016-02-22 22:30:29.000000000 +0200
-+++ eventum-3.0.9-73-g0d6904c/vendor/composer/autoload_files.php
2016-02-22 23:16:39.646899108 +0200
-@@ -4,12 +4,12 @@
+--- 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 @@
$vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
+$phpDir = PHP_DATADIR . '/php';
return array(
+ $vendorDir . '/ircmaxell/password-compat/lib/password.php',
+ $vendorDir . '/symfony/polyfill-php55/bootstrap.php',
$vendorDir . '/defuse/php-encryption/Crypto.php',
$vendorDir . '/ramsey/array_column/src/array_column.php',
- $vendorDir . '/ircmaxell/password-compat/lib/password.php',
- $vendorDir . '/smarty-gettext/smarty-gettext/block.t.php',
- $vendorDir . '/smarty-gettext/smarty-gettext/function.locale.php',
$baseDir . '/lib/eventum/gettext.php',
@@ -336,20 +337,34 @@
+ 'Text' => array($pearDir),
+ 'XML' => array($pearDir),
);
---- eventum-3.0.6-327-g34e5417/vendor/composer/autoload_psr4.php
2015-12-31 19:35:06.415997365 +0200
-+++ eventum-3.0.6-327-g34e5417/vendor/composer/autoload_psr4.php
2015-12-31 19:50:20.312351155 +0200
-@@ -6,7 +6,8 @@
+--- eventum-3.0.10-60-g788184f/vendor/composer/autoload_psr4.php~
2016-03-11 10:18:46.856708564 +0200
++++ eventum-3.0.10-60-g788184f/vendor/composer/autoload_psr4.php
2016-03-11 10:18:50.023327584 +0200
+@@ -4,21 +4,22 @@
+
+ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
+$phpDir = PHP_DATADIR . '/php';
return array(
+ 'Zend\\Validator\\' => array($vendorDir .
'/zendframework/zend-validator/src'),
+ 'Zend\\Mime\\' => array($vendorDir . '/zendframework/zend-mime/src'),
+ '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\\HttpFoundation\\' => array($vendorDir .
'/symfony/http-foundation'),
-- 'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
+ 'Zend\\Config\\' => array($phpDir . '/Zend/Config'),
+ 'Symfony\\Polyfill\\Php55\\' => array($vendorDir .
'/symfony/polyfill-php55'),
+ '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\\HttpFoundation\\' => array($phpDir .
'/Symfony/Component/HttpFoundation'),
+ 'Symfony\\Component\\Filesystem\\' => array($vendorDir .
'/symfony/filesystem'),
+ 'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'),
+- 'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
+ 'Monolog\\' => array($phpDir . '/Monolog'),
- );
+ 'Eventum\\' => array($baseDir . '/src'),
+ 'EmailReplyParser\\' => array($vendorDir .
'/willdurand/email-reply-parser/src/EmailReplyParser'),
+ 'Cascade\\' => array($vendorDir . '/theorchard/monolog-cascade/src'),
--- eventum-3.0.3-13-gfefa325/autoload.php~ 2015-10-13 21:36:40.000000000
+0300
+++ eventum-3.0.3-13-gfefa325/autoload.php 2015-10-13 23:39:26.450266254
+0300
@@ -48,4 +48,4 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/1ea3a6502b8f41ad7de5bcc608d15f8f3645b558
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
