[php-phpunit-phploc] - upstream 1.7.4 - use metadir, fixes FTBFS #914376

Christof Damian cdamian at fedoraproject.org
Mon Feb 25 23:12:06 UTC 2013


commit e7ff8ba78b0b93748e0e49b8f1a22f790eab6f05
Author: Christof Damian <christof at damian.net>
Date:   Tue Feb 26 00:11:22 2013 +0100

    - upstream 1.7.4
    - use metadir, fixes FTBFS #914376

 .gitignore              |    1 +
 php-phpunit-phploc.spec |   18 ++++++++++++------
 sources                 |    2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index df0167b..a79f824 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ phploc-1.5.1.tgz
 /phploc-1.6.1.tgz
 /phploc-1.6.2.tgz
 /phploc-1.6.4.tgz
+/phploc-1.7.4.tgz
diff --git a/php-phpunit-phploc.spec b/php-phpunit-phploc.spec
index d262cb9..75da00a 100644
--- a/php-phpunit-phploc.spec
+++ b/php-phpunit-phploc.spec
@@ -1,10 +1,11 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %global pear_name phploc
 %global channel pear.phpunit.de
 
 Name:           php-phpunit-phploc
-Version:        1.6.4
-Release:        4%{?dist}
+Version:        1.7.4
+Release:        1%{?dist}
 Summary:        A tool for quickly measuring the size of a PHP project
 
 Group:          Development/Libraries
@@ -16,12 +17,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.9.4
 BuildRequires:  php-channel(%{channel})
-Requires:       php-common >= 5.2.7
+Requires:       php-common >= 5.3.3
 Requires:       php-tokenizer
 Requires:       php-channel(%{channel})
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Requires:       php-pear(pear.phpunit.de/File_Iterator) >= 1.3.0
+Requires:       php-pear(pear.phpunit.de/FinderFacade) >= 1.0.4
 Requires:       php-pear(components.ez.no/ConsoleTools) >= 1.6
 
 Provides:       php-pear(%{channel}/%{pear_name}) = %{version}
@@ -53,7 +54,7 @@ rm -rf %{buildroot} docdir
 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}
@@ -77,13 +78,18 @@ fi
 
 
 %files
+%doc %{pear_docdir}/%{pear_name}
 %defattr(-,root,root,-)
 %{pear_xmldir}/%{name}.xml
-%{pear_phpdir}/PHPLOC
+%{pear_phpdir}/SebastianBergmann/PHPLOC
 %{_bindir}/phploc
 
 
 %changelog
+* Mon Feb 25 2013 Christof Damian <christof at damian.net> - 1.7.4-1
+- upstream 1.7.4
+- use metadir, fixes FTBFS #914376
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 5523d10..15ee50c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5620ffc5781fa80aef95de2647397838  phploc-1.6.4.tgz
+86ccf49dbb7a444556e408559bd88a1a  phploc-1.7.4.tgz


More information about the scm-commits mailing list