[php-doctrine-cache] Added "php-composer(doctrine/cache)" virtual provide

[Shawn Iwinski]

commit 8615415b7eec819df42c4ce8421e0d1c34c37d96
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Fri Jun 20 16:39:46 2014 -0400

    Added "php-composer(doctrine/cache)" virtual provide

 php-doctrine-cache.spec |   63 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 45 insertions(+), 18 deletions(-)
---
diff --git a/php-doctrine-cache.spec b/php-doctrine-cache.spec
index 178c90f..26d2659 100644
--- a/php-doctrine-cache.spec
+++ b/php-doctrine-cache.spec
@@ -1,19 +1,34 @@
-%global github_owner    doctrine
-%global github_name     cache
-%global github_version  1.3.0
-%global github_commit   e16d7adf45664a50fa86f515b6d5e7f670130449
+#
+# RPM spec file for php-doctrine-cache
+#
+# Copyright (c) 2013-2014 Shawn Iwinski <shawn.iwinski at gmail.com>
+#
+# License: MIT
+# http://opensource.org/licenses/MIT
+#
+# Please preserve changelog entries
+#
+
+%global github_owner     doctrine
+%global github_name      cache
+%global github_version   1.3.0
+%global github_commit    e16d7adf45664a50fa86f515b6d5e7f670130449
+
+%global composer_vendor  doctrine
+%global composer_project cache
 
 # "php": ">=5.3.2"
-%global php_min_ver     5.3.2
+%global php_min_ver      5.3.2
 # "phpunit/phpunit": ">=3.7"
-%global phpunit_min_ver 3.7
+%global phpunit_min_ver  3.7
 
-%global summary_base    Doctrine Cache
+# Build using "--without tests" to disable tests
+%global with_tests       %{?_without_tests:0}%{!?_without_tests:1}
 
-Name:          php-%{github_owner}-%{github_name}
+Name:          php-%{composer_vendor}-%{composer_project}
 Version:       %{github_version}
-Release:       3%{?dist}
-Summary:       %{summary_base}
+Release:       4%{?dist}
+Summary:       Doctrine Cache
 
 Group:         Development/Libraries
 License:       MIT
@@ -21,15 +36,17 @@ URL:           https://github.com/%{github_owner}/%{github_name}
 Source0:       %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
 
 BuildArch:     noarch
+%if %{with_tests}
 # For tests
-BuildRequires: php(language) >= %{php_min_ver}
-BuildRequires: php-pear(pear.phpunit.de/PHPUnit) >= %{phpunit_min_ver}
+BuildRequires: php(language)       >= %{php_min_ver}
+BuildRequires: php-phpunit-PHPUnit >= %{phpunit_min_ver}
 # For tests: phpcompatinfo (computed from v1.3.0)
 BuildRequires: php-date
 BuildRequires: php-hash
 BuildRequires: php-pcre
 BuildRequires: php-reflection
 BuildRequires: php-spl
+%endif
 
 Requires:      php(language) >= %{php_min_ver}
 # phpcompatinfo (computed from git commit v1.3.0)
@@ -38,6 +55,9 @@ Requires:      php-hash
 Requires:      php-pcre
 Requires:      php-spl
 
+# Composer
+Provides:      php-composer(%{composer_vendor}/%{composer_project}) = %{version}
+
 # Extracted from Doctrine Common as of version 2.4
 Conflicts:     php-pear(pear.doctrine-project.org/DoctrineCommon) < 2.4
 
@@ -56,7 +76,7 @@ Optional:
 
 
 %prep
-%setup -q -n %{github_name}-%{github_commit}
+%setup -qn %{github_name}-%{github_commit}
 
 # Remove files that will never be used
 find . -name '*WinCache*' -delete
@@ -73,6 +93,7 @@ cp -rp lib/* %{buildroot}/%{_datadir}/php/
 
 
 %check
+%if %{with_tests}
 # Create tests' init
 cat > tests/Doctrine/Tests/TestInit.php <<'TESTINIT'
 <?php
@@ -85,9 +106,7 @@ spl_autoload_register(function ($class) {
 TESTINIT
 
 # Create PHPUnit config w/ colors turned off
-cat phpunit.xml.dist \
-    | sed 's/colors="true"/colors="false"/' \
-    > phpunit.xml
+sed 's/colors="true"/colors="false"/' phpunit.xml.dist > phpunit.xml
 
 # Skip tests requiring a server to connect to
 rm -f \
@@ -96,6 +115,9 @@ rm -f \
     tests/Doctrine/Tests/Common/Cache/RiakCacheTest.php
 
 %{_bindir}/phpunit --include-path ./lib:./tests -d date.timezone="UTC"
+%else
+: Tests skipped
+%endif
 
 
 %files
@@ -106,13 +128,18 @@ rm -f \
 
 
 %changelog
+* Fri Jun 20 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.3.0-4
+- Added php-composer(%%{composer_vendor}/%%{composer_project}) virtual provide
+- Removed %%{summary_base}
+- Added option to build without tests
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-* Fri Jan 03 2014 Shawn Iwinski <shawn.iwinski at gmail.com> 1.3.0-2
+* Fri Jan 03 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.3.0-2
 - Conditional %%{?dist}
 - Removed sub-packages
 - Skip all tests requiring a server to connect to
 
-* Mon Dec 23 2013 Shawn Iwinski <shawn.iwinski at gmail.com> 1.3.0-1
+* Mon Dec 23 2013 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.3.0-1
 - Initial package