From bcb86d50ba3cafa5212bb2d9e7363dc6711184c6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Thu, 22 Oct 2015 00:11:56 +0300
Subject: [PATCH] up to eventum-3.0.3-144-g9fcce7c

simplify vendor packaging,
includes zend-config 2.4
---
 autoload.patch | 12 +-----------
 eventum.spec   | 42 +++++++++++++++++++++++-------------------
 2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/autoload.patch b/autoload.patch
index 2d7763d..7cab1df 100644
--- a/autoload.patch
+++ b/autoload.patch
@@ -288,7 +288,7 @@
 +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'));
  
@@ -299,13 +299,3 @@
          $map = require __DIR__ . '/autoload_namespaces.php';
          foreach ($map as $namespace => $path) {
              $loader->set($namespace, $path);
-         }
- 
--        $map = require __DIR__ . '/autoload_psr4.php';
--        foreach ($map as $namespace => $path) {
--            $loader->setPsr4($namespace, $path);
--        }
--
-         $classMap = require __DIR__ . '/autoload_classmap.php';
-         if ($classMap) {
-             $loader->addClassMap($classMap);
diff --git a/eventum.spec b/eventum.spec
index 7c8376b..dd9e300 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  120
-%define		githash 0b3339c
+%define		rel		1.6
+%define		subver  144
+%define		githash 9fcce7c
 %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:	dced95de62683ee778f51862cf4dde38
+# Source0-md5:	f488e72825c21ddb8adb0d9180848a52
 Source1:	%{name}-apache.conf
 Source2:	%{name}-mail-queue.cron
 Source3:	%{name}-mail-download.cron
@@ -503,6 +503,23 @@ rm -f config/config.php
 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
 
@@ -527,11 +544,7 @@ install -d \
 
 ln -s %{_webappdir} $RPM_BUILD_ROOT%{_appdir}/config
 
-install -d $RPM_BUILD_ROOT%{_appdir}/vendor/ircmaxell
-cp -a vendor/autoload.php vendor/composer $RPM_BUILD_ROOT%{_appdir}/vendor
-rm $RPM_BUILD_ROOT%{_appdir}/vendor/composer/include_paths.php
-rm $RPM_BUILD_ROOT%{_appdir}/vendor/composer/autoload_psr4.php
-cp -a vendor/ircmaxell/{password-compat,random-lib,security-lib} $RPM_BUILD_ROOT%{_appdir}/vendor/ircmaxell
+cp -a vendor $RPM_BUILD_ROOT%{_appdir}
 
 # unsupported locale
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ht
@@ -713,16 +726,7 @@ 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
-
-%dir %{_appdir}/vendor/ircmaxell
-%{_appdir}/vendor/ircmaxell/password-compat
-%{_appdir}/vendor/ircmaxell/random-lib
-%{_appdir}/vendor/ircmaxell/security-lib
+%{_appdir}/vendor
 
 %dir %{_appdir}/lib
 %{_appdir}/lib/eventum
-- 
2.44.0