From 3695202b33324694daf68e2deb4e4ed2f8a89714 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sun, 28 Jun 2015 09:18:43 +0200
Subject: php-bartlett-umlwriter: fix autoloader

---
 php-bartlett-umlwriter-autoload.php | 9 +++------
 php-bartlett-umlwriter.spec         | 9 +++++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/php-bartlett-umlwriter-autoload.php b/php-bartlett-umlwriter-autoload.php
index 7f70544..8581826 100644
--- a/php-bartlett-umlwriter-autoload.php
+++ b/php-bartlett-umlwriter-autoload.php
@@ -15,13 +15,10 @@ if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Compo
     $fedoraClassLoader->register();
 }
 $fedoraClassLoader->addPrefixes(array(
-    'Symfony\\Component'                  => $vendorDir,
-    'TokenReflection'                     => $vendorDir,
-    'Bartlett\\Umlwiter'                  => dirname(dirname(__DIR__)),
+    'Symfony\\Component\\'                  => $vendorDir,
+    'TokenReflection\\'                     => $vendorDir,
+    'Bartlett\\UmlWriter\\'                 => dirname(dirname(__DIR__)),
 ));
-if (is_file('/usr/share/php-bartlett-PHP-CompatInfo/compatinfo.sqlite')) {
-    putenv('BARTLETT_COMPATINFO_DB=/usr/share/php-bartlett-PHP-CompatInfo/compatinfo.sqlite');
-}
 
 // Dependencies
 require_once $vendorDir . '/SebastianBergmann/Version/autoload.php';
diff --git a/php-bartlett-umlwriter.spec b/php-bartlett-umlwriter.spec
index 2801ece..672b31c 100644
--- a/php-bartlett-umlwriter.spec
+++ b/php-bartlett-umlwriter.spec
@@ -21,7 +21,7 @@
 
 Name:           php-bartlett-umlwriter
 Version:        1.0.0
-%global specrel 5
+%global specrel 6
 Release:        %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        Create UML class diagrams from your PHP source
 
@@ -115,8 +115,10 @@ install -D -p -m 755 bin/umlwriter  %{buildroot}%{_bindir}/umlwriter
 
 %check
 %if %{with_tests}
+#php -r 'require "%{buildroot}%{_datadir}/php/Bartlett/UmlWriter/autoload.php"; print_r($fedoraClassLoader->getPrefixes());'
+
 %{_bindir}/phpunit \
-  --bootstrap src/Bartlett/UmlWriter/autoload.php \
+  --bootstrap %{buildroot}%{_datadir}/php/Bartlett/UmlWriter/autoload.php \
   --verbose
 %else
 : Test suite disabled
@@ -133,6 +135,9 @@ install -D -p -m 755 bin/umlwriter  %{buildroot}%{_bindir}/umlwriter
 
 
 %changelog
+* Sun Jun 28 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-6
+- fix autoloader
+
 * Fri Jun 26 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-5
 - rewrite autoloader
 
-- 
cgit