From 621eeb7ca545dd727c10bfd50be78d4202d40575 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 22 Jan 2018 10:00:26 +0100
Subject: Update to 2.0.0 rename to php-hamcrest2

---
 php-hamcrest2.spec | 72 ++++++++++++++++++++++++++----------------------------
 1 file changed, 34 insertions(+), 38 deletions(-)

(limited to 'php-hamcrest2.spec')

diff --git a/php-hamcrest2.spec b/php-hamcrest2.spec
index 3742c53..8e261b8 100644
--- a/php-hamcrest2.spec
+++ b/php-hamcrest2.spec
@@ -1,48 +1,54 @@
 # remirepo/fedora spec file for php-hamcrest
 #
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    b37020aa976fa52d3de9aa904aa2522dc518f79c
+%global gh_commit    776503d3a8e85d4f9a1148614f95b7a608b046ad
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     hamcrest
 %global gh_project   hamcrest-php
+%global ns_project   Hamcrest
+%global major        2
 %global with_tests   0%{!?_without_tests:1}
 
-Name:           php-hamcrest
-Version:        1.2.2
-Release:        4%{?dist}
+Name:           php-hamcrest2
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        PHP port of Hamcrest Matchers
 
 Group:          Development/Libraries
 License:        BSD
 URL:            https://github.com/%{gh_owner}/%{gh_project}
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
+Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
 
 # Use generated autoloader instead of composer one
 Patch0:         bootstrap-autoload.patch
-# Upstream patch for PHP 7+
-Patch1:         %{name}-upstream.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-fedora-autoloader-devel
 %if %{with_tests}
+# From composer.json, require-dev:
+#               "satooshi/php-coveralls": "^1.0",
+#               "phpunit/php-file-iterator": "1.3.3",
+#               "phpunit/phpunit": "~4.0"
 BuildRequires:  php-composer(phpunit/phpunit)
-# composer.json
-#      "php": ">=5.3.2"
-BuildRequires:  php(language) >= 5.3.2
-# From phpcompatinfo report for 1.2.2
+# composer.json, require:
+#      "php": "^5.3|^7.0"
+BuildRequires:  php(language) >= 5.3
+# From phpcompatinfo report for 2.0.0
+BuildRequires:  php-reflection
+BuildRequires:  php-ctype
 BuildRequires:  php-dom
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 %endif
 
-Requires:       php(language) >= 5.3.2
-# From phpcompatinfo report for 1.2.2
+Requires:       php(language) >= 5.3
+# From phpcompatinfo report for 2.0.0
+Requires:       php-ctype
 Requires:       php-dom
 Requires:       php-pcre
 Requires:       php-spl
@@ -60,45 +66,36 @@ but subsequently ported to many other languages.
 a literal translation of the original Java API for Hamcrest,
 with a few Exceptions, mostly down to PHP language barriers.
 
-To use this library, you just have to add, in your project:
-  require_once '%{_datadir}/php/Hamcrest/autoload.php';
+Autoloader: %{_datadir}/php/%{ns_project}%{major}/autoload.php
 
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
 %patch0 -p0 -b .rpm
-%patch1 -p1 -b .upstream
-find . -name \*.upstream -exec rm {} \;
+find . -name \*.rpm -exec rm {} \;
 
 # Move to Library tree
-mv hamcrest/Hamcrest.php hamcrest/Hamcrest/Hamcrest.php
+mv hamcrest/%{ns_project}.php hamcrest/%{ns_project}/%{ns_project}.php
 
 
 %build
 # Library autoloader
 %{_bindir}/phpab \
     --template fedora \
-    --output hamcrest/Hamcrest/autoload.php \
-    hamcrest/Hamcrest
-
-cat << 'EOF' | tee -a hamcrest/Hamcrest/autoload.php
-
-// Functions
-require __DIR__ . '/Hamcrest.php';
-EOF
+    --output hamcrest/%{ns_project}/autoload.php \
+    hamcrest/%{ns_project}
 
 # Test suite autoloader
 %{_bindir}/phpab \
     --output tests/autoload.php \
     --exclude '*Test.php' \
-    tests
+    tests generator
 
 
 %install
-rm -rf            %{buildroot}
-mkdir -p          %{buildroot}%{_datadir}/php
-cp -pr hamcrest/* %{buildroot}%{_datadir}/php
+mkdir -p %{buildroot}%{_datadir}/php
+cp -pr hamcrest/%{ns_project} %{buildroot}%{_datadir}/php/%{ns_project}%{major}
 
 
 %check
@@ -116,20 +113,19 @@ exit $ret
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license LICENSE.txt
 %doc CHANGES.txt README.md TODO.txt
 %doc composer.json
-%{_datadir}/php/Hamcrest
+%{_datadir}/php/%{ns_project}%{major}
 
 
 %changelog
+* Mon Jan 22 2018 Remi Collet <remi@remirepo.net> - 2.0.0-1
+- Update to 2.0.0
+- rename to php-hamcrest2
+
 * Fri Feb 17 2017 Remi Collet <remi@fedoraproject.org> - 1.2.2-4
 - add upstream patch for PHP 7, fix FTBFS
 - switch to fedora/autoloader
-- 
cgit