up to eventum-3.0.2-98-g018285e, use composer autoloader as base

diff --git a/eventum-paths.patch b/eventum-paths.patch
index ffbfa1431214916b7082994e189efc6535ae157b..59693b49b6f8ea86600bf7ddb130b081910e010d 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -41,15 +41,6 @@
  }
  
  if (!defined('APP_ERROR_LOG')) {
-@@ -197,6 +197,8 @@
- }
- 
- require_once APP_PATH . '/autoload.php';
-+# hack
-+require_once '/usr/share/php/Smarty3/plugins/block.t.php';
- 
- // fix magic_quote_gpc'ed values
- if (get_magic_quotes_gpc()) {
 --- eventum-3.0.0/htdocs/setup/index.php~      2015-02-02 20:03:49.507010317 +0200
 +++ eventum-3.0.0/htdocs/setup/index.php       2015-02-02 20:05:00.139257552 +0200
 @@ -44,10 +44,10 @@

diff --git a/eventum.spec b/eventum.spec
index d3e960200c9d480ef4cb24e38f8d31242d603bd3..fe119a19166a576bb5606f12984504cd1477c485 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -2,9 +2,9 @@
 # Conditional build:
 %bcond_with    order   # with experimental order patch
 
-%define                rel             1
-%define                subver  28
-%define                githash 0d12f69
+%define                rel             1.4
+%define                subver  101
+%define                githash e275162
 %define                php_min_version 5.3.3
 %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: 9a6b3cd1c8deaceacf674d33784953d0
+# Source0-md5: 57aa4927f9b93e807848ffdaa3acc2a5
 Source1:       %{name}-apache.conf
 Source2:       %{name}-mail-queue.cron
 Source3:       %{name}-mail-download.cron
@@ -42,6 +42,7 @@ Patch100:     %{name}-paths.patch
 Patch101:      %{name}-cvs-config.patch
 Patch105:      %{name}-bot-reconnect.patch
 Patch107:      %{name}-gettext.patch
+Patch108:      autoload.patch
 # some tests
 Patch200:      %{name}-fixed-nav.patch
 URL:           http://eventum.mysql.org/
@@ -491,6 +492,7 @@ rm -f config/config.php
 %patch101 -p1
 %patch105 -p1
 %patch107 -p1
+%patch108 -p1
 
 %{__sed} -i -e "
 s;define('CONFIG_PATH'.*');define('CONFIG_PATH', '%{_webappdir}');
@@ -518,6 +520,9 @@ install -d \
        localedir=%{_localedir} \
        DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_appdir}/vendor
+cp -a vendor/autoload.php vendor/composer $RPM_BUILD_ROOT%{_appdir}/vendor
+
 # unsupported locale
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ht
 
@@ -697,6 +702,13 @@ done
 %attr(755,root,root) %{_appdir}/upgrade/scm_trac_import.php
 %{_appdir}/upgrade/patches
 
+%dir %{_appdir}/vendor
+%dir %{_appdir}/vendor/composer
+%{_appdir}/vendor/autoload.php
+%{_appdir}/vendor/composer/ClassLoader.php
+%{_appdir}/vendor/composer/autoload_*.php
+%{_appdir}/vendor/composer/include_paths.php
+
 %dir %{_appdir}/lib
 %{_appdir}/lib/eventum
 %exclude %{_appdir}/lib/eventum/class.monitor.php