summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-06-22 06:47:45 +0200
committerRemi Collet <fedora@famillecollet.com>2015-06-22 06:47:45 +0200
commit56097ddb6981b431fa7b9f40b9eb3577656706b1 (patch)
tree41bc08b57275393e3b679b835499d1d11e856e34
parent457ad557cb0eea5a4d96b517c87e2ed20cd5bcf8 (diff)
php-bartlett-umlwriter: fix autoload
-rw-r--r--php-bartlett-umlwriter-rpm.patch6
-rw-r--r--php-bartlett-umlwriter.spec11
2 files changed, 12 insertions, 5 deletions
diff --git a/php-bartlett-umlwriter-rpm.patch b/php-bartlett-umlwriter-rpm.patch
index 5a09d6f..994f79c 100644
--- a/php-bartlett-umlwriter-rpm.patch
+++ b/php-bartlett-umlwriter-rpm.patch
@@ -3,7 +3,7 @@ diff -up ./bin/umlwriter.rpm ./bin/umlwriter
+++ ./bin/umlwriter 2015-03-31 11:29:43.000000000 +0200
@@ -1,24 +1,36 @@
-#!/usr/bin/env php
-+#!/usr/bin/php
++#!/usr/bin/env php
<?php
$appName = 'umlWriter';
@@ -29,7 +29,7 @@ diff -up ./bin/umlwriter.rpm ./bin/umlwriter
+PhpParser\Autoloader::register();
+
+require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
-+require_once $vendorDir . '/SebastianBergmann/Version/Version.php';
++require_once $vendorDir . '/SebastianBergmann/Version/autoload.php';
+
+use Symfony\Component\ClassLoader\UniversalClassLoader;
+
@@ -65,7 +65,7 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
-require_once $vendorDir . '/autoload.php';
+require_once $vendorDir . '/PhpParser/Autoloader.php';
+PhpParser\Autoloader::register();
-+require_once $vendorDir . '/SebastianBergmann/Version/Version.php';
++require_once $vendorDir . '/SebastianBergmann/Version/autoload.php';
+require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+
+use Symfony\Component\ClassLoader\UniversalClassLoader;
diff --git a/php-bartlett-umlwriter.spec b/php-bartlett-umlwriter.spec
index b8c3d70..eda1d5c 100644
--- a/php-bartlett-umlwriter.spec
+++ b/php-bartlett-umlwriter.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global bootstrap 1
+%global bootstrap 0
%global gh_commit c883bf1f80370397198c5eae0615173380fa6119
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20150331
@@ -21,7 +21,7 @@
Name: php-bartlett-umlwriter
Version: 1.0.0
-%global specrel 1
+%global specrel 4
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
@@ -49,6 +49,7 @@ BuildRequires: php-composer(andrewsville/php-token-reflection) >= 1.4
# "symfony/console": "~2.5",
# "sebastian/version": "~1.0"
Requires: php(language) >= 5.3.0
+Requires: php-spl
Requires: php-composer(symfony/console) >= 2.5
Requires: php-composer(symfony/console) < 3
Requires: php-composer(sebastian/version) >= 1.0
@@ -122,6 +123,12 @@ install -D -p -m 755 bin/umlwriter %{buildroot}%{_bindir}/umlwriter
%changelog
+* Mon Jun 22 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-4
+- fix Autoload
+
+* Fri May 22 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-2
+- standard build (no bootstrap)
+
* Fri Apr 3 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-1
- update to 1.0.0