[php-bartlett-PHP-Reflect/el6] update to 1.6.2, fix merge

[Remi Collet]

commit a64d12c75f1e9e017853c8b90992064a853496d6
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Apr 9 16:07:01 2013 +0200

    update to 1.6.2, fix merge

 .gitignore                    |    3 ++
 PHP_Reflect-addhtml.patch     |   19 -------------
 PHP_Reflect-deljs.patch       |   16 -----------
 php-bartlett-PHP-Reflect.spec |   58 +++++++---------------------------------
 sources                       |    2 +-
 5 files changed, 14 insertions(+), 84 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c3c6ab..4961e93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,6 @@ package-*.xml
 /PHP_Reflect-1.3.0.tgz
 /PHP_Reflect-1.4.2.tgz
 /PHP_Reflect-1.5.0.tgz
+/PHP_Reflect-1.6.0.tgz
+/PHP_Reflect-1.6.1.tgz
+/PHP_Reflect-1.6.2.tgz
diff --git a/php-bartlett-PHP-Reflect.spec b/php-bartlett-PHP-Reflect.spec
index fac7057..f03aa10 100644
--- a/php-bartlett-PHP-Reflect.spec
+++ b/php-bartlett-PHP-Reflect.spec
@@ -3,15 +3,8 @@
 %global channel   bartlett.laurent-laville.org
 %global pear_name PHP_Reflect
 
-%if 0%{?fedora} >= 12
-%global withhtmldoc 1
-%else
-%global withhtmldoc 0
-%endif
-
-
 Name:           php-bartlett-PHP-Reflect
-Version:        1.5.0
+Version:        1.6.2
 Release:        1%{?dist}
 Summary:        Adds the ability to reverse-engineer PHP
 
@@ -20,23 +13,14 @@ License:        BSD
 URL:            http://bartlett.laurent-laville.org/
 Source0:        http://%{channel}/get/%{pear_name}-%{version}%{?prever}.tgz
 
-# Don't install .js (unused)
-Patch1:         PHP_Reflect-deljs.patch
-# Install generated doc using pear command
-Patch2:         PHP_Reflect-addhtml.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  php(language) >= 5.2.0
 BuildRequires:  php-pear(PEAR) >= 1.9.0
 BuildRequires:  php-channel(%{channel})
 # to run test suite
-BuildRequires:  php-pear(pear.phpunit.de/PHPUnit) >= 3.5.0
-%if %{withhtmldoc}
-# to build HTML documentation
-BuildRequires:  asciidoc >= 8.4.0
-BuildRequires:  source-highlight
-%endif
+BuildRequires:  php-pear(pear.phpunit.de/PHPUnit) >= 3.6.0
 
+Requires:       php(language) >= 5.2.0
 Requires:       php-pear(PEAR) >= 1.9.0
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -52,11 +36,7 @@ Provides:       php-pear(%{channel}/%{pear_name}) = %{version}%{?prever}
 PHP_Reflect adds the ability to reverse-engineer classes, interfaces,
 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
+HTML Documentation:  %{pear_docdir}/%{pear_name}/html/index.html
 
 
 %prep
@@ -66,28 +46,12 @@ Documentation: http://php5.laurent-laville.org/reflect/manual/current/en/
 cd %{pear_name}-%{version}%{?prever}
 mv -f ../package.xml %{name}.xml
 
-%patch1 -p1 -b .deljs
-%if %{withhtmldoc}
-%patch2 -p1 -b .addhtml
-%endif
-
 
 %build
 cd %{pear_name}-%{version}%{?prever}
 
-%if %{withhtmldoc}
-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
-
 
 %install
-rm -rf %{buildroot}
 cd %{pear_name}-%{version}%{?prever}
 
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
@@ -100,21 +64,16 @@ mkdir -p %{buildroot}%{pear_xmldir}
 install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
-
 %check
 cd %{pear_name}-%{version}%{?prever}
 
-# Version 1.3.0 : OK (34 tests, 55 assertions)
+# Version 1.6.2 : OK (Tests: 49, Assertions: 110, Skipped: 1)
 %{_bindir}/phpunit \
   -d date.timezone=UTC \
   --bootstrap %{buildroot}%{pear_phpdir}/Bartlett/PHP/Reflect/Autoload.php \
   tests
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %post
 %{__pear} install --nodeps --soft --force --register-only \
     %{pear_xmldir}/%{name}.xml >/dev/null || :
@@ -127,7 +86,6 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Bartlett
@@ -135,6 +93,10 @@ fi
 
 
 %changelog
+* Sat Apr 06 2013 Remi Collet <remi at fedoraproject.org> - 1.6.2-1
+- Update to 1.6.2
+- html documentation is now provided by upstream
+
 * 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
diff --git a/sources b/sources
index dca84d2..ddd67a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3b631d3844e4565b0e58021db5e281a9  PHP_Reflect-1.5.0.tgz
+5900cb2d97c9694abfa18d153a6e3ae6  PHP_Reflect-1.6.2.tgz