[php-PhpCollection] Updated to version 0.2.0

- Added phpoption_max_ver global
- Bad licensed files stripped from source
- php-common => php(language)
- Removed tests sub-package

Author: siwinski

php-PhpCollection-strip.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+if [ $# != 2 ]; then
+	echo "Usage: $0 VERSION GITHUB_COMMIT" 1>&2
+	exit 1
+fi
+
+VERSION=$1
+GITHUB_COMMIT=$2
+
+ORIGINAL_SOURCE_FILE="${GITHUB_COMMIT}.tar.gz"
+NEW_SOURCE_FILE="php-PhpCollection-${VERSION}-${GITHUB_COMMIT}.tar.gz"
+
+if [ ! -f "$ORIGINAL_SOURCE_FILE" ]; then
+	echo "ERROR: Original source file '${ORIGINAL_SOURCE_FILE}' not found" 1>&2
+	exit 1
+fi
+
+TAR=`which tar`
+
+$TAR -xzf "$ORIGINAL_SOURCE_FILE"
+rm -rf "php-collection-${GITHUB_COMMIT}/doc" "$NEW_SOURCE_FILE"
+$TAR -czf "$NEW_SOURCE_FILE" "php-collection-${GITHUB_COMMIT}"
+
+echo "${NEW_SOURCE_FILE} created"
+exit 0

php-PhpCollection.spec

@@ -1,12 +1,13 @@
 %global github_owner      schmittjoh
 %global github_name       php-collection
-%global github_version    0.1.0
-%global github_commit     360a888f246773e660fce0d175cf62e41f50dd22
+%global github_version    0.2.0
+%global github_commit     acb02a921bb364f360ce786b13455345063c4a07
 
 %global lib_name          PhpCollection
 
 %global php_min_ver       5.3.0
-%global phpoption_min_ver 0.9
+%global phpoption_min_ver 1.0
+%global phpoption_max_ver 2.0
 
 Name:          php-%{lib_name}
 Version:       %{github_version}
@@ -16,23 +17,26 @@ Summary:       General purpose collection library for PHP
 Group:         Development/Libraries
 License:       ASL 2.0
 URL:           http://jmsyst.com/libs/%{github_name}
-Source0:       https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
+# To create source:
+# wget https://github.com/schmittjoh/php-collection/archive/%%{github_commit}.tar.gz
+# php-PhpCollection-strip.sh %%{github_version} %%{github_commit}
+Source0:       %{name}-%{github_version}-%{github_commit}.tar.gz
 
 BuildArch:     noarch
 # Test build requires
-BuildRequires: php-common >= %{php_min_ver}
+BuildRequires: php(language) >= %{php_min_ver}
 BuildRequires: php-pear(pear.phpunit.de/PHPUnit)
 BuildRequires: php-PhpOption >= %{phpoption_min_ver}
+BuildRequires: php-PhpOption <  %{phpoption_max_ver}
 # Test build requires:phpci
 BuildRequires: php-spl
 
-Requires:      php-common >= %{php_min_ver}
+Requires:      php(language) >= %{php_min_ver}
 Requires:      php-PhpOption >= %{phpoption_min_ver}
+Requires:      php-PhpOption <  %{phpoption_max_ver}
 # phpci requires
 Requires:      php-spl
 
-Conflicts:     php-PhpOption >= 2.0
-
 %description
 This library adds basic collections for PHP.
 
@@ -63,25 +67,11 @@ General Characteristics:
   undefined (the default, and only PHP behavior).
 
 
-%package tests
-Summary:  Test suite for %{name}
-Group:    Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description tests
-%{summary}.
-
-
 %prep
 %setup -q -n %{github_name}-%{github_commit}
 
-# PHPUnit config
-sed 's:\(\./\)\?tests/:./:' -i phpunit.xml.dist
-mv phpunit.xml.dist tests/
-
 # Rewrite tests' bootstrap (which uses Composer autoloader) with simple
 # autoloader that uses include path
-mv tests/bootstrap.php tests/bootstrap.php.dist
 ( cat <<'AUTOLOAD'
 <?php
 spl_autoload_register(function ($class) {
@@ -100,25 +90,25 @@ AUTOLOAD
 mkdir -p -m 755 %{buildroot}%{_datadir}/php
 cp -rp src/%{lib_name} %{buildroot}%{_datadir}/php/
 
-mkdir -p -m 755 %{buildroot}%{_datadir}/tests/%{name}
-cp -rp tests/* %{buildroot}%{_datadir}/tests/%{name}/
-
 
 %check
 %{_bindir}/phpunit \
     -d include_path="./src:./tests:.:%{pear_phpdir}:%{_datadir}/php" \
-    -c tests/phpunit.xml.dist
+    -c phpunit.xml.dist
 
 
 %files
 %doc LICENSE README.md composer.json
 %{_datadir}/php/%{lib_name}
 
-%files tests
-%dir %{_datadir}/tests
-     %{_datadir}/tests/%{name}
-
 
 %changelog
+* Wed Jan 23 2013 Shawn Iwinski <shawn.iwinski@gmail.com> 0.2.0-1
+- Updated to version 0.2.0
+- Added phpoption_max_ver global
+- Bad licensed files stripped from source
+- php-common => php(language)
+- Removed tests sub-package
+
 * Wed Jan 23 2013 Shawn Iwinski <shawn.iwinski@gmail.com> 0.1.0-1
 - Initial package