[php-phpunit-phpcpd/f16] Upstream for 1.3.3

[Guillaume Kulakowski]

commit ceb61c3eae95d66da2f3db0dab138befe530ccfa
Author: Guillaume Kulakowski <guillaume at llaumgui.com>
Date:   Sat Nov 5 11:22:27 2011 +0100

    Upstream for 1.3.3

 .gitignore              |    1 +
 php-phpunit-phpcpd.spec |   30 +++++++++++++++++-------------
 sources                 |    2 +-
 3 files changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5979979..ac8bb44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 phpcpd-1.3.1.tgz
 /phpcpd-1.3.2.tgz
+/phpcpd-1.3.3.tgz
diff --git a/php-phpunit-phpcpd.spec b/php-phpunit-phpcpd.spec
index 9f9c148..a2c7fec 100644
--- a/php-phpunit-phpcpd.spec
+++ b/php-phpunit-phpcpd.spec
@@ -3,8 +3,8 @@
 %global channel pear.phpunit.de
 
 Name:           php-phpunit-phpcpd
-Version:        1.3.2
-Release:        2%{?dist}
+Version:        1.3.3
+Release:        1%{?dist}
 Summary:        Copy/Paste Detector (CPD) for PHP code
 
 Group:          Development/Libraries
@@ -18,9 +18,10 @@ BuildRequires:  php-pear >= 1:1.9.0
 BuildRequires:  php-channel(%{channel})
 Requires:       php-common >= 5.2.7
 Requires:       php-tokenizer
+Requires:       php-xml
 Requires:       php-channel(%{channel})
-Requires(post): %{__pear}
-Requires(postun): %{__pear}
+Requires(post): pear
+Requires(postun): pear
 Requires:       php-pear(pear.phpunit.de/File_Iterator) >= 1.2.2
 Requires:       php-pear(pear.phpunit.de/PHP_Timer) >= 1.0.0
 Requires:       php-pear(components.ez.no/ConsoleTools) >= 1.6 
@@ -39,7 +40,7 @@ need to get a quick overview of duplicated code in a project.
 %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}
 
 
@@ -50,29 +51,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
 
@@ -85,6 +86,9 @@ fi
 
 
 %changelog
+* Sat Nov 05 2011 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.3.3-1
+- upstream 1.3.3
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 29cedb0..9a3c6c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-07b5b68fda3f57739edf3c6d1f3f4b09  phpcpd-1.3.2.tgz
+dbab082642cd10b4408c3aa976bc99d7  phpcpd-1.3.3.tgz