[packages/eventum: 15/15] up to 3.0.4
glen
glen at pld-linux.org
Sat Oct 31 15:44:48 CET 2015
commit 9d20707017eb93c3b194af4b311a296be12f367e
Merge: 06ddb94 5132bae
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Oct 31 16:41:36 2015 +0200
up to 3.0.4
Merge branch 'dev-3.0.4'
Conflicts:
eventum.spec
autoload.patch | 79 ++++++++++++++-------------
eventum-bot-reconnect.patch | 11 ----
eventum-irc.init | 4 +-
eventum-irc.php | 19 -------
eventum-paths.patch | 129 ++++++++++----------------------------------
eventum.logrotate | 5 +-
eventum.spec | 120 ++++++++++++++++++++---------------------
7 files changed, 132 insertions(+), 235 deletions(-)
---
diff --cc eventum.spec
index 7cecd3c,c859964..850a1b7
--- a/eventum.spec
+++ b/eventum.spec
@@@ -2,21 -2,21 +2,21 @@@
# Conditional build:
%bcond_with order # with experimental order patch
-%define rel 1.15
-%define subver 305
-%define githash b67258d
-%define php_min_version 5.3.3
+%define rel 1
+#define subver 105
+#define githash 9c49ee5
- %define php_min_version 5.3.3
++%define php_min_version 5.3.7
%include /usr/lib/rpm/macros.php
Summary: Eventum Issue / Bug tracking system
Summary(pl.UTF-8): Eventum - system śledzenia spraw/błędów
Name: eventum
--Version: 3.0.3
++Version: 3.0.4
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: %{name}-%{version}-%{subver}-g%{githash}.tar.gz
-# Source0-md5: 5937959683a82b3f083f092a8408d037
+Source0: https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.gz
- # Source0-md5: 0ecee925e49d96cc827e99089848f55a
++# Source0-md5: 7c036b6c815a8e63f0b0b900f440c901
+#Source0: %{name}-%{version}-%{subver}-g%{githash}.tar.gz
Source1: %{name}-apache.conf
Source2: %{name}-mail-queue.cron
Source3: %{name}-mail-download.cron
@@@ -64,6 -67,6 +67,7 @@@ Requires: php(pcre
Requires: php(session)
Requires: php-Smarty >= 3.1
Requires: php-Smarty-plugin-gettext
++Requires: php-ZendFramework-Config >= 2.4
Requires: php-pear-DB
Requires: php-pear-Mail
Requires: php-pear-Mail_Mime
@@@ -85,7 -88,9 +89,10 @@@ Requires: webserver(indexfile
Requires: webserver(php) >= 4.2.0
Suggests: localedb
Suggests: php-pear-Net_LDAP2
+Suggests: webserver(setenv)
+ Provides: group(eventum)
+ Provides: user(eventum)
+ Obsoletes: eventum-base < 3.0.3-1.305
Conflicts: logrotate < 3.8.0
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@@ -464,9 -450,9 +452,6 @@@ This package contains the cron job
mv docs/examples .
--# GPL v2
--rm docs/COPYING
--
# bug fixes / features
%{?with_order:%patch2 -p1}
#%patch3 -p0
@@@ -499,10 -485,22 +484,21 @@@ rm -f config/config.ph
%patch107 -p1
%patch108 -p1
- %{__sed} -i -e "
- s;define('CONFIG_PATH'.*');define('CONFIG_PATH', '%{_webappdir}');
- " upgrade/{*/,}*.php
+ # cleanup vendor. keep only needed libraries.
+ # (the rest are packaged with system packages)
+ mv vendor vendor.dist
+ vendor() {
+ local path dir
+ for path; do
+ dir=$(dirname $path)
+ test -d vendor/$dir || mkdir -p vendor/$dir
+ mv vendor.dist/$path vendor/$path
+ done
+ }
+ 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 zendframework/zend-config
# remove backups from patching as we use globs to package files to buildroot
find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v
diff --cc autoload.patch
index bbc6bf0,303641e..f766959
--- a/autoload.patch
+++ b/autoload.patch
@@@ -264,28 -270,25 +270,37 @@@
- 'DB' => array($vendorDir . '/pear/db'),
- 'Auth' => array($vendorDir . '/pear/auth_sasl'),
- '' => array($vendorDir . '/pear/pear-core-minimal/src'),
- + 'PEAR' => array($pearDir),
- + 'Net' => array($pearDir),
- + 'Mail' => array($pearDir),
- + 'DB' => array($pearDir),
+ 'Auth' => array($pearDir),
- + 'XML' => array($pearDir),
+ + 'DB' => array($pearDir),
+ + 'Mail' => array($pearDir),
+ + 'Net' => array($pearDir),
+ + 'PEAR' => array($pearDir),
+ 'Text' => array($pearDir),
+ + 'XML' => array($pearDir),
);
- --- eventum-3.0.2-101-ge275162/autoload.php 2015-10-12 22:42:04.697464456 +0300
- +++ eventum-3.0.2-101-ge275162/autoload.php 2015-10-12 22:46:12.383826829 +0300
- @@ -39,7 +39,7 @@
- define('APP_PHP_GETTEXT_PATH', APP_PATH . '/vendor/php-gettext/php-gettext');
++--- eventum/vendor/composer/autoload_psr4.php~ 2015-10-30 11:28:39.000000000 +0200
+++++ eventum/vendor/composer/autoload_psr4.php 2015-10-30 11:28:41.458450142 +0200
++@@ -4,7 +4,8 @@
+
- // fonts directory for phplot
- - define('APP_FONTS_PATH', APP_PATH . '/vendor/fonts/liberation');
- + define('APP_FONTS_PATH', '/usr/share/fonts/TTF');
++ $vendorDir = dirname(dirname(__FILE__));
++ $baseDir = dirname($vendorDir);
+++$phpDir = PHP_DATADIR . '/php';
+
- return;
- }
++ return array(
++- 'Zend\\Config\\' => array($vendorDir . '/zendframework/zend-config/src'),
+++ 'Zend\\Config\\' => array($phpDir . '/Zend/Config'),
++ );
+ --- 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 @@
+ define('APP_PHP_GETTEXT_PATH', APP_PATH . '/vendor/php-gettext/php-gettext');
+
+ // fonts directory for phplot
+ -define('APP_FONTS_PATH', APP_PATH . '/vendor/fonts/liberation');
+ +define('APP_FONTS_PATH', '/usr/share/fonts/TTF');
--- eventum-3.0.2-101-ge275162/vendor/composer/autoload_real.php~ 2015-10-12 21:33:13.000000000 +0300
+++ eventum-3.0.2-101-ge275162/vendor/composer/autoload_real.php 2015-10-12 23:14:26.708974755 +0300
- @@ -23,20 +23,11 @@
+ @@ -23,10 +23,6 @@
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInitEventumCore', 'loadClassLoader'));
diff --cc eventum-paths.patch
index 59693b4,97578f9..2735287
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@@ -103,13 -64,13 +64,13 @@@
'check_permission' => true,
'permission' => 660,
'check_filesize' => true,
- --- eventum-2.3.3/config/sphinx.conf.php~ 2012-06-27 14:59:39.000000000 +0300
- +++ eventum-2.3.3/config/sphinx.conf.php 2012-06-27 15:04:52.928810689 +0300
---- eventum-3.0.3-13-gfefa325/config/sphinx.conf.php~ 2015-10-13 20:00:48.000000000 +0300
-+++ eventum-3.0.3-13-gfefa325/config/sphinx.conf.php 2015-10-13 23:34:19.668134549 +0300
--@@ -26,7 +26,7 @@
-- // | Authors: Bryan Alsdorf <bryan at mysql.com> |
-- // | Authors: Elan Ruusamäe <glen at delfi.ee> |
-- // +----------------------------------------------------------------------+
- -require_once dirname(__FILE__) . "/../init.php";
++--- eventum-3.0.3-314-gedea8e4/config/sphinx.conf.php~ 2015-10-27 18:02:36.000000000 +0200
+++++ eventum-3.0.3-314-gedea8e4/config/sphinx.conf.php 2015-10-29 11:53:26.068169385 +0200
++@@ -1,7 +1,7 @@
++ #!/usr/bin/php
++ <?php
++
+ -require_once __DIR__ . "/../init.php";
+require_once '/usr/share/eventum/init.php';
if (!defined('SPHINX_LOG_PATH')) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/9d20707017eb93c3b194af4b311a296be12f367e
More information about the pld-cvs-commit
mailing list