[php-phpunit-PHP-CodeCoverage/el6] update to 1.1.1

Remi Collet remi at fedoraproject.org
Tue Jan 17 17:17:12 UTC 2012


commit 7140a4e3a91f2ac68e94db3d6fcbf1c7f7540f54
Author: remi <fedora at famillecollet.com>
Date:   Tue Jan 17 18:16:45 2012 +0100

    update to 1.1.1

 .gitignore                        |    2 +
 README.markdown                   |   87 -------------------------------------
 php-phpunit-PHP-CodeCoverage.spec |   43 ++++++++----------
 sources                           |    2 +-
 4 files changed, 23 insertions(+), 111 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 25d76f2..bd6eb37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 *spec~
 package*.xml
 /PHP_CodeCoverage-1.0.5.tgz
+/PHP_CodeCoverage-1.1.0.tgz
+/PHP_CodeCoverage-1.1.1.tgz
diff --git a/php-phpunit-PHP-CodeCoverage.spec b/php-phpunit-PHP-CodeCoverage.spec
index d4e7d99..bc3b139 100644
--- a/php-phpunit-PHP-CodeCoverage.spec
+++ b/php-phpunit-PHP-CodeCoverage.spec
@@ -3,7 +3,7 @@
 %global channel pear.phpunit.de
 
 Name:           php-phpunit-PHP-CodeCoverage
-Version:        1.0.5
+Version:        1.1.1
 Release:        1%{?dist}
 Summary:        PHP code coverage information
 
@@ -14,16 +14,16 @@ Source0:        http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  php-pear(PEAR) >= 1.9.0
+BuildRequires:  php-pear(PEAR) >= 1.9.4
 BuildRequires:  php-channel(%{channel})
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Requires:       php-xml >= 5.2.7
 Requires:       php-pecl(Xdebug) >= 2.0.5
-Requires:       php-pear(%{channel}/File_Iterator) >= 1.2.2
-Requires:       php-pear(%{channel}/PHP_TokenStream) >= 1.0.0
-Requires:       php-pear(%{channel}/Text_Template) >= 1.0.0
+Requires:       php-pear(%{channel}/File_Iterator) >= 1.3.0
+Requires:       php-pear(%{channel}/PHP_TokenStream) >= 1.1.0
+Requires:       php-pear(%{channel}/Text_Template) >= 1.1.1
 Requires:       php-pear(components.ez.no/ConsoleTools) >= 1.6
 
 Provides:       php-pear(%{channel}/%{pear_name}) = %{version}
@@ -35,18 +35,9 @@ for PHP code coverage information.
 
 %prep
 %setup -q -c
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
-
 cd %{pear_name}-%{version}
-# package.xml is V2 - hack to lower PEAR dependency
-%{_bindir}/php <<EOF
-<?php
-\$xml = simplexml_load_file("../package.xml"); 
-\$xml->dependencies->required->pearinstaller->min="1.9.0";
-file_put_contents("%{name}.xml",\$xml->asXML());
-EOF
+# package.xml is V2
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -56,19 +47,19 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT docdir
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+rm -rf %{buildroot}
+%{__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
@@ -87,10 +78,16 @@ fi
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/PHP
-%{_bindir}/phpcov
 
 
 %changelog
+* Fri Nov 04 2011 Remi Collet <remi at fedoraproject.org> - 1.1.1-1
+- Version 1.1.1 (stable) - API 1.1.0 (stable)
+- no more phpcov script in bindir
+- remove PEAR hack
+- raise PEAR dependency to 1.9.4
+- rebuild for doc in /usr/share/doc/pear
+
 * Fri Aug 19 2011 Remi Collet <remi at fedoraproject.org> - 1.0.5-1
 - Version 1.0.5 (stable) - API 1.0.3 (stable)
 
diff --git a/sources b/sources
index 0c9a0f3..5bc1a2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-38c49a6ff3a19e560d8862c0b09d7680  PHP_CodeCoverage-1.0.5.tgz
+fd74dd3d20ab08f603f0acaf1ca07987  PHP_CodeCoverage-1.1.1.tgz


More information about the scm-commits mailing list