[php-bartlett-PHP-Reflect/el6] update to 1.5.0

[Remi Collet]

commit 03e5698908b5630b5ff64a0c5921620f609a9a40
Author: Remi Collet <remi at fedoraproject.org>
Date:   Fri Jan 18 13:32:47 2013 +0100

    update to 1.5.0

 .gitignore                    |    2 ++
 php-bartlett-PHP-Reflect.spec |   36 ++++++++++++++++++++----------------
 sources                       |    2 +-
 3 files changed, 23 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9b89eb2..1c3c6ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ package-*.xml
 /PHP_Reflect-1.1.0.tgz
 /PHP_Reflect-1.2.0.tgz
 /PHP_Reflect-1.3.0.tgz
+/PHP_Reflect-1.4.2.tgz
+/PHP_Reflect-1.5.0.tgz
diff --git a/php-bartlett-PHP-Reflect.spec b/php-bartlett-PHP-Reflect.spec
index 3116c05..fac7057 100644
--- a/php-bartlett-PHP-Reflect.spec
+++ b/php-bartlett-PHP-Reflect.spec
@@ -1,3 +1,4 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global channel   bartlett.laurent-laville.org
 %global pear_name PHP_Reflect
@@ -10,7 +11,7 @@
 
 
 Name:           php-bartlett-PHP-Reflect
-Version:        1.3.0
+Version:        1.5.0
 Release:        1%{?dist}
 Summary:        Adds the ability to reverse-engineer PHP
 
@@ -32,14 +33,17 @@ BuildRequires:  php-channel(%{channel})
 BuildRequires:  php-pear(pear.phpunit.de/PHPUnit) >= 3.5.0
 %if %{withhtmldoc}
 # to build HTML documentation
-BuildRequires:  php-pear(pear.phing.info/phing)
 BuildRequires:  asciidoc >= 8.4.0
+BuildRequires:  source-highlight
 %endif
 
 Requires:       php-pear(PEAR) >= 1.9.0
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Requires:       php-channel(%{channel})
+Requires:       php-pcre
+Requires:       php-spl
+Requires:       php-tokenizer
 
 Provides:       php-pear(%{channel}/%{pear_name}) = %{version}%{?prever}
 
@@ -50,6 +54,8 @@ functions, constants and more, by connecting php callbacks to other tokens.
 
 %if %{withhtmldoc}
 HTML Documentation:  %{pear_docdir}/%{pear_name}/docs/index.html
+%else
+Documentation: http://php5.laurent-laville.org/reflect/manual/current/en/
 %endif
 
 
@@ -70,19 +76,13 @@ mv -f ../package.xml %{name}.xml
 cd %{pear_name}-%{version}%{?prever}
 
 %if %{withhtmldoc}
-# Generate the HTML documentation
-phing -f docs/build-phing.xml  \
-      -Dhomedir=$PWD \
-      -Dasciidoc.home=%{_datadir}/asciidoc \
-      -Doutput.dir=$PWD/docs \
-      -Dbuild.tarball=false \
-      make-html-docs
-
-# Asciidoc fails silently
-# Check that our patch for installed doc is ok
-cpt=$(find docs -name \*.html | wc -l)
-echo "File generated:$cpt, expected:9"
-[ $cpt -eq 10 ] || exit 1
+for page in index INSTALL CHANGELOG LICENSE phpreflect-book \
+            sources/scanFile sources/scanFunctionArguments \
+            sources/Token sources/Autoload sources/Reflect ; do
+    asciidoc  -a linkcss -a icons -a theme=flask -a toc2 -n --safe \
+              -o $PWD/docs/$page.html  $PWD/docs/$page.txt || :
+    [ -f $PWD/docs/$page.html ] || exit 1
+done
 %endif
 
 
@@ -93,7 +93,7 @@ cd %{pear_name}-%{version}%{?prever}
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # Install XML package description
 mkdir -p %{buildroot}%{pear_xmldir}
@@ -135,6 +135,10 @@ fi
 
 
 %changelog
+* Sun Dec 30 2012 Remi Collet <remi at fedoraproject.org> - 1.5.0-1
+- Version 1.5.0 (stable) - API 1.5.0 (stable)
+- generate documentation using asciidoc, without phing
+
 * Fri Feb 17 2012 Remi Collet <remi at fedoraproject.org> - 1.3.0-1
 - Version 1.3.0 (stable) - API 1.3.0 (stable)
 
diff --git a/sources b/sources
index ad0f5a8..dca84d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-97ecba1716e3e669b7123641810d3511  PHP_Reflect-1.3.0.tgz
+3b631d3844e4565b0e58021db5e281a9  PHP_Reflect-1.5.0.tgz