[packages/eventum: 2/10] fix phinx packaging
glen
glen at pld-linux.org
Sat May 20 13:50:01 CEST 2017
commit 8be9fbff4fffaa5abd5fa24b2cfdcdf0905088a5
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed May 17 20:25:49 2017 +0300
fix phinx packaging
autoload.patch | 6 +++---
eventum.spec | 12 ++++++++----
2 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index 0cfab5a..af526de 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 340
-%define githash fc2f2394
+%define rel 0.2
+%define subver 344
+%define githash 7f34327f
%define php_min_version 5.5.0
%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: https://github.com/eventum/eventum/releases/download/snapshot/%{name}-%{version}-%{subver}-g%{githash}.tar.gz
-# Source0-md5: 89a78328f88d8b27aab1756ebc824b46
+# Source0-md5: d7001291388fedcb55f3d3ad4da947db
Source1: %{name}-apache.conf
Source2: %{name}-mail-queue.cron
Source3: %{name}-mail-download.cron
@@ -409,6 +409,7 @@ vendor willdurand/email-reply-parser
vendor theorchard/monolog-cascade
vendor malkusch/lock
vendor phpxmlrpc/phpxmlrpc
+vendor robmorgan/phinx
# remove backups from patching as we use globs to package files to buildroot
find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v
@@ -611,6 +612,9 @@ done
%dir %{_appdir}/upgrade
%{_appdir}/upgrade/*.sql
%{_appdir}/upgrade/patches
+%dir %{_appdir}/db
+%dir %{_appdir}/db/migrations
+%{_appdir}/db/migrations/*.php
%{_appdir}/res
%{_appdir}/src
diff --git a/autoload.patch b/autoload.patch
index fdf59d8..387ffe5 100644
--- a/autoload.patch
+++ b/autoload.patch
@@ -158,8 +158,8 @@
+ 'PEAR' => array($pearDir),
+ 'Text' => array($pearDir),
);
---- eventum-3.1.10-340-gfc2f2394/vendor/composer/autoload_psr4.php~ 2017-05-16 18:19:02.000000000 +0300
-+++ eventum-3.1.10-340-gfc2f2394/vendor/composer/autoload_psr4.php 2017-05-17 19:58:51.303058671 +0300
+--- eventum-3.1.10-344-g7f34327f/./vendor/composer/autoload_psr4.php~ 2017-05-17 20:20:58.000000000 +0300
++++ eventum-3.1.10-344-g7f34327f/./vendor/composer/autoload_psr4.php 2017-05-17 20:24:43.533459636 +0300
@@ -7,27 +7,25 @@
return array(
@@ -183,7 +183,7 @@
'PhpXmlRpc\\' => array($vendorDir . '/phpxmlrpc/phpxmlrpc/src'),
'Phinx\\' => array($vendorDir . '/robmorgan/phinx/src/Phinx'),
- 'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
-- 'Eventum\\Test\\' => array($baseDir . '/tests'),
+- 'Eventum\\Test\\' => array($baseDir . '/tests', $baseDir . '/tests/src'),
'Eventum\\' => array($baseDir . '/src'),
'EmailReplyParser\\' => array($vendorDir . '/willdurand/email-reply-parser/src/EmailReplyParser'),
'Cascade\\' => array($vendorDir . '/theorchard/monolog-cascade/src'),
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/ea3c18c959573399f020716d5d28188b4364d8e2
More information about the pld-cvs-commit
mailing list