[php-phpunit-phploc/f15] Upstream 1.6.4

[Guillaume Kulakowski]

commit 0cd6460d6d3399fe0aa6f5febf9ab9297b04cef3
Author: Guillaume Kulakowski <guillaume at llaumgui.com>
Date:   Sun Nov 20 11:48:12 2011 +0100

    Upstream 1.6.4

 .gitignore              |    1 +
 php-phpunit-phploc.spec |   29 ++++++++++++++---------------
 sources                 |    2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7898021..5e96ce7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /phploc-1.6.2.tgz
+/phploc-1.6.4.tgz
diff --git a/php-phpunit-phploc.spec b/php-phpunit-phploc.spec
index f71dee0..9515db4 100644
--- a/php-phpunit-phploc.spec
+++ b/php-phpunit-phploc.spec
@@ -3,7 +3,7 @@
 %global channel pear.phpunit.de
 
 Name:           php-phpunit-phploc
-Version:        1.6.2
+Version:        1.6.4
 Release:        1%{?dist}
 Summary:        A tool for quickly measuring the size of a PHP project
 
@@ -17,6 +17,7 @@ BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.9.4
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.7
+Requires:       php-tokenizer
 Requires:       php-channel(%{channel})
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -37,14 +38,9 @@ need to get a quick understanding of a project's size.
 %prep
 %setup -q -c
 [ -f package2.xml ] || mv package.xml package2.xml
-%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
+mv package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
-# Change pearinstaller version
-%if 0%{?rhel} && 0%{?rhel} <= 6
-    %{__sed} -i -e "s@<min>1.9.1</min>@<min>1.9.0</min>@" %{name}.xml
-%endif
-
 
 %build
 cd %{pear_name}-%{version}
@@ -53,29 +49,29 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-%{__rm} -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+rm -rf %{buildroot} docdir
+pear install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
-%{__rm} -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-%{__mkdir} -p $RPM_BUILD_ROOT%{pear_xmldir}
-%{__install} -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+mkdir -p %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
-%{__pear} install --nodeps --soft --force --register-only \
+pear install --nodeps --soft --force --register-only \
     %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 
 %postun
 if [ $1 -eq 0 ] ; then
-    %{__pear} uninstall --nodeps --ignore-errors --register-only \
+    pear uninstall --nodeps --ignore-errors --register-only \
         %{channel}/%{pear_name} >/dev/null || :
 fi
 
@@ -88,6 +84,9 @@ fi
 
 
 %changelog
+* Sun Nov 20 2011 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.4-1
+- upstream 1.6.4
+
 * Tue Nov  1 2011 Christof Damian <christof at damian.net> - 1.6.2-1
 - upstream 1.6.2
 
diff --git a/sources b/sources
index 1dff1e3..5523d10 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c5929cd24697bfd78146233309873951  phploc-1.6.2.tgz
+5620ffc5781fa80aef95de2647397838  phploc-1.6.4.tgz