[packages/eventum: 5/6] up to 3.0.8-187-gacd7038
glen
glen at pld-linux.org
Sat Feb 6 15:17:09 CET 2016
commit 60c51158457e98d91b5228e04500ba28a6deb85f
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Feb 6 15:40:02 2016 +0200
up to 3.0.8-187-gacd7038
autoload.patch | 9 +++++----
eventum.spec | 10 ++++++----
2 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index 728530d..5ae2c87 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -2,9 +2,9 @@
# Conditional build:
%bcond_with order # with experimental order patch
-%define rel 1.3
-%define subver 102
-%define githash dd731ad
+%define rel 1.4
+%define subver 187
+%define githash acd7038
%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: 7c783515cb746faa4c8b009f2af2c4d4
+# Source0-md5: ae49292484aa2271c82dea1262aead96
Source1: %{name}-apache.conf
Source2: %{name}-mail-queue.cron
Source3: %{name}-mail-download.cron
@@ -436,6 +436,7 @@ 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 defuse/php-encryption
# remove backups from patching as we use globs to package files to buildroot
find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v
@@ -640,6 +641,7 @@ done
%dir %{_appdir}/upgrade
%{_appdir}/upgrade/flush_compiled_templates.php
%{_appdir}/upgrade/*.sql
+%attr(755,root,root) %{_appdir}/upgrade/change_usr_id.php
%attr(755,root,root) %{_appdir}/upgrade/ldap_import.php
%attr(755,root,root) %{_appdir}/upgrade/ldap_update_users.php
%attr(755,root,root) %{_appdir}/upgrade/scm_trac_import.php
diff --git a/autoload.patch b/autoload.patch
index 6e6b3a3..0474168 100644
--- a/autoload.patch
+++ b/autoload.patch
@@ -292,20 +292,21 @@
+ 'Smarty' => $phpDir. '/Smarty3/Smarty.class.php',
+ 'SphinxClient' => $phpDir . '/sphinxapi.php',
);
---- eventum-3.0.3-118-g751b8cc/vendor/composer/autoload_files.php~ 2015-10-19 22:57:36.000000000 +0300
-+++ eventum-3.0.3-118-g751b8cc/vendor/composer/autoload_files.php 2015-10-19 23:01:26.239594821 +0300
-@@ -4,10 +4,10 @@
+--- eventum-3.0.8-176-gcead81c/./vendor/composer/autoload_files.php~ 2016-02-04 22:54:38.000000000 +0200
++++ eventum-3.0.8-176-gcead81c/./vendor/composer/autoload_files.php 2016-02-04 22:59:09.554648194 +0200
+@@ -4,11 +4,11 @@
$vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
+$phpDir = PHP_DATADIR . '/php';
return array(
+ $vendorDir . '/defuse/php-encryption/Crypto.php',
$vendorDir . '/ircmaxell/password-compat/lib/password.php',
- $vendorDir . '/smarty-gettext/smarty-gettext/block.t.php',
- $vendorDir . '/smarty-gettext/smarty-gettext/function.locale.php',
-+ $phpDir. '/Smarty3/plugins/block.t.php',
$baseDir . '/lib/eventum/gettext.php',
++ $phpDir. '/Smarty3/plugins/block.t.php',
);
--- eventum-3.0.6-327-g34e5417/vendor/composer/autoload_namespaces.php 2015-12-31 19:33:54.323742468 +0200
+++ eventum-3.0.6-327-g34e5417/vendor/composer/autoload_namespaces.php 2015-12-31 19:46:27.515826070 +0200
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/aff846e1fc4c4ff9d95e0b2222cee31f83638901
More information about the pld-cvs-commit
mailing list