summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json16
-rwxr-xr-xmakesrc.sh28
-rw-r--r--php-phpspec.spec30
3 files changed, 53 insertions, 21 deletions
diff --git a/composer.json b/composer.json
index 20c0ea4..15eaaef 100644
--- a/composer.json
+++ b/composer.json
@@ -22,22 +22,22 @@
],
"require": {
- "php": "^7.3 || 8.0.*",
+ "php": "^7.3 || 8.0.* || 8.1.*",
"phpspec/prophecy": "^1.9",
"phpspec/php-diff": "^1.0.0",
"sebastian/exporter": "^3.0 || ^4.0",
- "symfony/console": "^3.4 || ^4.4 || ^5.0",
- "symfony/event-dispatcher": "^3.4 || ^4.4 || ^5.0",
- "symfony/process": "^3.4 || ^4.4 || ^5.0",
- "symfony/finder": "^3.4 || ^4.4 || ^5.0",
- "symfony/yaml": "^3.4 || ^4.4 || ^5.0",
+ "symfony/console": "^3.4 || ^4.4 || ^5.0 || ^6.0",
+ "symfony/event-dispatcher": "^3.4 || ^4.4 || ^5.0 || ^6.0",
+ "symfony/process": "^3.4 || ^4.4 || ^5.0 || ^6.0",
+ "symfony/finder": "^3.4 || ^4.4 || ^5.0 || ^6.0",
+ "symfony/yaml": "^3.4 || ^4.4 || ^5.0 || ^6.0",
"doctrine/instantiator": "^1.0.5",
"ext-tokenizer": "*"
},
"require-dev": {
"behat/behat": "^3.3",
- "symfony/filesystem": "^3.4 || ^4.0 || ^5.0",
+ "symfony/filesystem": "^3.4 || ^4.0 || ^5.0 || ^6.0",
"phpunit/phpunit": "^8.0 || ^9.0",
"vimeo/psalm": "^4.3"
},
@@ -66,7 +66,7 @@
"extra": {
"branch-alias": {
- "dev-main": "7.1.x-dev"
+ "dev-main": "7.2.x-dev"
}
}
diff --git a/makesrc.sh b/makesrc.sh
new file mode 100755
index 0000000..87d223d
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+NAME=$(basename $PWD)
+OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec)
+PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
+VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec)
+COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec)
+SHORT=${COMMIT:0:7}
+
+echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n"
+
+echo "Cloning..."
+rm -rf $PROJECT-$COMMIT
+git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
+
+echo "Getting commit..."
+pushd $PROJECT-$COMMIT
+git checkout $COMMIT
+cp composer.json ../composer.json
+popd
+
+echo "Archiving..."
+tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
+
+echo "Cleaning..."
+rm -rf $PROJECT-$COMMIT
+
+echo "Done."
diff --git a/php-phpspec.spec b/php-phpspec.spec
index a78c41f..1d7729e 100644
--- a/php-phpspec.spec
+++ b/php-phpspec.spec
@@ -1,6 +1,6 @@
# remirepo/fedora spec file for php-phpspec
#
-# Copyright (c) 2015-2021 Remi Collet
+# Copyright (c) 2015-2022 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -13,7 +13,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit 30dc06a0f20642d9589bb644fbcfcb1692828699
+%global gh_commit bbeb10f73c02bfa11d92159ad9d3e75abc3faa69
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner phpspec
%global gh_project phpspec
@@ -26,15 +26,16 @@
%global symfony_max 5
Name: php-phpspec
-Version: 7.1.0
+Version: 7.2.0
Release: 1%{?dist}
Summary: Specification-oriented BDD framework for PHP
License: MIT
URL: https://github.com/%{gh_owner}/%{gh_project}
-Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}%{?prever}-%{gh_short}.tar.gz
-
+Source0: %{name}-%{version}%{?prever}-%{gh_short}.tgz
Source1: %{gh_project}-autoload.php
+# get git snapshot to retrieve tests
+Source2: makesrc.sh
# Use our autoloader
Patch0: %{gh_project}-4-rpm.patch
@@ -62,7 +63,7 @@ BuildRequires: php-symfony4-process >= %{symfony_min}
BuildRequires: php-symfony4-yaml >= %{symfony_min}
# From composer.json, require-dev
# "behat/behat": "^3.3",
-# "symfony/filesystem": "^3.4 || ^4.0 || ^5.0",
+# "symfony/filesystem": "^3.4 || ^4.0 || ^5.0 || ^6.0",
# "phpunit/phpunit": "^8.0 || ^9.0",
# "vimeo/psalm": "^4.3"
BuildRequires: php-symfony4-filesystem >= %{symfony_min}
@@ -73,15 +74,15 @@ BuildRequires: %{phpunit}
BuildRequires: php-composer(fedora/autoloader) >= 1
# From composer.json, require
-# "php": "^7.3 || 8.0.*",
+# "php": "^7.3 || 8.0.* || 8.1.*",
# "phpspec/prophecy": "^1.9",
# "phpspec/php-diff": "^1.0.0",
# "sebastian/exporter": "^3.0 || ^4.0",
-# "symfony/console": "^3.4 || ^4.4 || ^5.0",
-# "symfony/event-dispatcher": "^3.4 || ^4.4 || ^5.0",
-# "symfony/process": "^3.4 || ^4.4 || ^5.0",
-# "symfony/finder": "^3.4 || ^4.4 || ^5.0",
-# "symfony/yaml": "^3.4 || ^4.4 || ^5.0",
+# "symfony/console": "^3.4 || ^4.4 || ^5.0 || ^6.0",
+# "symfony/event-dispatcher": "^3.4 || ^4.4 || ^5.0 || ^6.0",
+# "symfony/process": "^3.4 || ^4.4 || ^5.0 || ^6.0",
+# "symfony/finder": "^3.4 || ^4.4 || ^5.0 || ^6.0",
+# "symfony/yaml": "^3.4 || ^4.4 || ^5.0 || ^6.0",
# "doctrine/instantiator": "^1.0.5"
# "ext-tokenizer": "*"
@@ -162,7 +163,7 @@ rm spec/PhpSpec/Message/CurrentExampleTrackerSpec.php
# Ignore this test which rely on composer installation
rm spec/PhpSpec/NamespaceProvider/ComposerPsrNamespaceProviderSpec.php
-for cmdarg in "php %{phpunit}" php73 php74 php80; do
+for cmdarg in "php %{phpunit}" php74 php80 php81; do
if which $cmdarg; then
set $cmdarg
$1 -d memory_limit=1G -d include_path=.:%{buildroot}%{_datadir}/php \
@@ -187,6 +188,9 @@ done
%changelog
+* Mon Mar 14 2022 Remi Collet <remi@remirepo.net> - 7.2.0-1
+- update to 7.2.0
+
* Mon Jun 21 2021 Remi Collet <remi@remirepo.net> - 7.1.0-1
- update to 7.1.0