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

[Remi Collet]

commit 62b062f3c5acfd907f188fd7cfe65f10feb7d863
Author: Remi Collet <remi at fedoraproject.org>
Date:   Sun Dec 30 08:44:27 2012 +0100

    update to 1.5.0

 .gitignore                    |    1 +
 php-bartlett-PHP-Reflect.spec |   43 +++++++++++++++++++++++-----------------
 sources                       |    2 +-
 3 files changed, 27 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index af281e9..1c3c6ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ package-*.xml
 /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 5b9b080..473d09c 100644
--- a/php-bartlett-PHP-Reflect.spec
+++ b/php-bartlett-PHP-Reflect.spec
@@ -1,8 +1,9 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global channel   bartlett.laurent-laville.org
 %global pear_name PHP_Reflect
 
-%if 0%{?fedora} >= 12
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 %global withhtmldoc 1
 %else
 %global withhtmldoc 0
@@ -10,8 +11,8 @@
 
 
 Name:           php-bartlett-PHP-Reflect
-Version:        1.4.2
-Release:        2%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        Adds the ability to reverse-engineer PHP
 
 Group:          Development/Libraries
@@ -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,13 @@ 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
+
+* Tue Oct 30 2012 Remi Collet <remi at fedoraproject.org> - 1.4.3-1
+- Version 1.4.3 (stable) - API 1.4.0 (stable)
+
 * Tue Aug 14 2012 Remi Collet <remi at fedoraproject.org> - 1.4.2-2
 - rebuildt for new pear_testdir
 
diff --git a/sources b/sources
index 1509832..dca84d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-75be4f9c27b6af4f3dd566dc9846c8fa  PHP_Reflect-1.4.2.tgz
+3b631d3844e4565b0e58021db5e281a9  PHP_Reflect-1.5.0.tgz