cleanup (this is only for php 7.0)php70

1 files changed, 51 insertions, 32 deletions

diff --git a/php-ocramius-proxy-manager.spec b/php-ocramius-proxy-manager.spec
index 4e9bfdd..4a04297 100644
--- a/php-ocramius-proxy-manager.spec
+++ b/php-ocramius-proxy-manager.spec
@@ -12,31 +12,39 @@
 
 %global github_owner      Ocramius
 %global github_name       ProxyManager
-%global github_version    1.0.2
-%global github_commit     57e9272ec0e8deccf09421596e0e2252df440e11
+%global github_version    2.0.4
+%global github_commit     a55d08229f4f614bf335759ed0cf63378feeb2e6
+%global github_short      %(c=%{github_commit}; echo ${c:0:7})
 
 %global composer_vendor   ocramius
 %global composer_project  proxy-manager
 
-# "php": ">=5.3.3"
-%global php_min_ver 5.3.3
-# "zendframework/zend-code": ">2.2.5,<3.0"
-%global zf_min_ver  2.2.5
-%global zf_max_ver  3.0
+# "php": "7.0.0 - 7.0.5 || ^7.0.7"
+%global php_min_ver 7.0.7
+# "zendframework/zend-code": "~3.0.0 - 3.0.2 || ^3.0.4"
+%global zf_min_ver  3.0.4
+%global zf_max_ver  4
 
+# Build using "--without tests" to disable tests
 %global with_tests 0%{!?_without_tests:1}
 
 %{!?phpdir:  %global phpdir  %{_datadir}/php}
 
 Name:          php-%{composer_vendor}-%{composer_project}
 Version:       %{github_version}
-Release:       2%{?github_release}%{?dist}
+Release:       1%{?github_release}%{?dist}
 Summary:       OOP proxy wrappers utilities
 
 Group:         Development/Libraries
 License:       MIT
 URL:           http://ocramius.github.io/ProxyManager/
-Source0:       https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
+Source0:       %{name}-%{github_version}-%{github_short}.tgz
+# git snapshot to retrieve test suite
+Source1:       makesrc.sh
+
+# Hardcode library version
+# drop dependency on ocramius/package-versions
+Patch0:        %{name}-rpm.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:     noarch
@@ -45,25 +53,28 @@ BuildRequires: %{_bindir}/phpab
 %if %{with_tests}
 # Tests
 ## composer.json
-BuildRequires: %{_bindir}/phpunit
 BuildRequires: php(language) >= %{php_min_ver}
 BuildRequires: php-composer(zendframework/zend-code) >= %{zf_min_ver}
 BuildRequires: php-composer(zendframework/zend-code) <  %{zf_max_ver}
-BuildRequires: php-composer(ocramius/generated-hydrator) >= 1.2.0
-## phpcompatinfo (computed from version 1.0.2)
+BuildRequires: php-composer(zendframework/zend-loader)
+BuildRequires: php-composer(ocramius/generated-hydrator) >= 2
+## phpcompatinfo (computed from version 2.0.0)
 BuildRequires: php-pcre
 BuildRequires: php-reflection
 BuildRequires: php-spl
+BuildRequires: php-composer(phpunit/phpunit) >= 5.4.6
 %endif
 
 # composer.json
 Requires:      php(language) >= %{php_min_ver}
 Requires:      php-composer(zendframework/zend-code) >= %{zf_min_ver}
 Requires:      php-composer(zendframework/zend-code) <  %{zf_max_ver}
-# phpcompatinfo (computed from version 1.0.2)
+# phpcompatinfo (computed from version 2.0.0)
 Requires:      php-pcre
 Requires:      php-reflection
 Requires:      php-spl
+# Autoloader
+Requires:      php-composer(zendframework/zend-loader)
 
 # Weak dependencies
 %if 0%{?fedora} >= 21
@@ -74,15 +85,15 @@ Suggests:      php-composer(zendframework/zend-stdlib)
 Suggests:      php-composer(zendframework/zend-xmlrpc)
 %endif
 # For autoloader
-Conflicts:     php-ocramius-generated-hydrator < 1.2.0
-
+Conflicts:     php-ocramius-generated-hydrator < 2
 
 # Composer
 Provides:      php-composer(%{composer_vendor}/%{composer_project}) = %{version}
 
+
 %description
-A library providing utilities to generate, instantiate and generally operate
-with Object Proxies.
+This library aims at providing abstraction for generating various kinds
+of proxy classes.
 
 Autoloader: %{phpdir}/ProxyManager/autoload.php
 
@@ -90,6 +101,12 @@ Autoloader: %{phpdir}/ProxyManager/autoload.php
 %prep
 %setup -qn %{github_name}-%{github_commit}
 
+%patch0 -p0
+sed -e 's/@VERSION@/%{version}/' \
+    -e 's/@COMMIT@/%{github_commit}/' \
+    -i src/ProxyManager/Version.php
+grep ' return' src/ProxyManager/Version.php
+
 
 %build
 : Generate autoloader
@@ -120,19 +137,11 @@ cp -rp src/* %{buildroot}%{phpdir}/
 %check
 %if %{with_tests}
 : Create tests autoload
-%{_bindir}/phpab --output tests/autoload.php tests %{phpdir}/PHPUnit
-
-: Create mock Composer "vendor/autoload.php"
 mkdir vendor
-cat <<'AUTOLOAD' | tee vendor/autoload.php
-<?php
-require __DIR__.'/../tests/autoload.php';
-require '%{buildroot}%{phpdir}/ProxyManager/autoload.php';
-AUTOLOAD
-
-: Skip test known to fail
-sed 's/function testCodeGeneration/function SKIP_testCodeGeneration/' \
-    -i tests/ProxyManagerTest/Functional/FatalPreventionFunctionalTest.php
+%{_bindir}/phpab --output vendor/autoload.php tests
+cat << 'EOF' | tee -a vendor/autoload.php
+require_once '%{buildroot}%{phpdir}/ProxyManager/autoload.php';
+EOF
 
 : Run tests
 %{_bindir}/phpunit --verbose --exclude-group Performance
@@ -155,11 +164,21 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Tue Oct 18 2016 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.0.2-2
-- Update to 1.0.2 (RHBZ #1251784)
+* Sun Nov  6 2016 Remi Collet <remi@fedoraproject.org> - 2.0.4-1
+- update to 2.0.4
+
+* Wed Oct 19 2016 Remi Collet <remi@fedoraproject.org> - 2.0.3-2
 - Add weak dependencies
 - Use dependencies' autoloaders
-- Temporarily skip tests on Fedora 25+ (RHBZ #1350615)
+
+* Fri Jul  1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.3-1
+- update to 2.0.3
+- raise dependency on zendframework/zend-code 3.0.4
+
+* Wed Jun 29 2016 Remi Collet <remi@fedoraproject.org> - 2.0.2-1
+- update to 2.0.2
+- raise dependency on php 7.0.7
+- raise dependency on zendframework/zend-code 3.0
 
 * Mon Aug 10 2015 Remi Collet <remi@remirepo.net> - 1.0.2-1
 - update to 1.0.2