summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-06-29 08:51:24 +0200
committerRemi Collet <remi@remirepo.net>2020-06-29 08:51:24 +0200
commit5486ba2c7c28e3bfa34dfd01e802a9284c66700a (patch)
tree934dab963bb19eed7a2000d15c8a18042f6bfd55
parent920dd934bc6264320173c12ae9d1e88829584433 (diff)
update to 1.10.0 (no change)
-rw-r--r--composer.json2
-rw-r--r--php-myclabs-deep-copy.spec24
2 files changed, 13 insertions, 13 deletions
diff --git a/composer.json b/composer.json
index 4108a23..45656c9 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
},
"require": {
- "php": "^7.1"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
"doctrine/collections": "^1.0",
diff --git a/php-myclabs-deep-copy.spec b/php-myclabs-deep-copy.spec
index 98c892c..6d3e41a 100644
--- a/php-myclabs-deep-copy.spec
+++ b/php-myclabs-deep-copy.spec
@@ -6,22 +6,17 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit b2c28789e80a97badd14145fda39b545d83ca3ef
+%global gh_commit 5796d127b0c4ff505b77455148ea9d5269d99758
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner myclabs
%global gh_project DeepCopy
%global c_project deep-copy
%global major %nil
%global php_home %{_datadir}/php
-%global with_tests 0%{!?_without_tests:1}
+%bcond_without tests
-# remirepo:4
-%if 0%{?fedora} < 26 && 0%{?rhel} < 8
-%global major 19
-%global with_tests 0
-%endif
Name: php-myclabs-deep-copy%{major}
-Version: 1.9.5
+Version: 1.10.0
Release: 1%{?dist}
Summary: Create deep copies (clones) of your objects
@@ -34,7 +29,7 @@ Source1: makesrc.sh
Source2: php-myclabs-deep-copy-autoload.php
BuildArch: noarch
-%if %{with_tests}
+%if %{with tests}
# For tests
BuildRequires: php(language) >= 7.1
BuildRequires: php-reflection
@@ -60,7 +55,7 @@ BuildRequires: php-composer(fedora/autoloader)
%endif
# From composer.json, "require": {
-# "php": "^7.1"
+# "php": "^7.1 || ^8.0"
Requires: php(language) >= 7.1
# From phpcompatinfo report for version 1.8.0
Requires: php-reflection
@@ -68,6 +63,8 @@ Requires: php-date
Requires: php-spl
# Required by autoloader
Requires: php-composer(fedora/autoloader)
+# remirepo:1
+Obsoletes: php-myclabs-deep-copy19 < 1.10
Provides: php-composer(%{gh_owner}/%{c_project}) = %{version}
@@ -94,7 +91,7 @@ cp -pr src/%{gh_project} %{buildroot}%{php_home}/%{gh_project}%{major}
%check
-%if %{with_tests}
+%if %{with tests}
mkdir vendor
cat << 'EOF' | tee vendor/autoload.php
<?php
@@ -106,7 +103,7 @@ require_once '%{php_home}/Doctrine/Common/autoload.php';
EOF
ret=0
-for cmd in php php71 php72 php73 php74; do
+for cmd in php php72 php73 php74 php80; do
if which $cmd; then
$cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{gh_project}%{major}/autoload.php \
%{_bindir}/phpunit7 --verbose || ret=1
@@ -128,6 +125,9 @@ exit $ret
%changelog
+* Mon Jun 29 2020 Remi Collet <remi@remirepo.net> - 1.10.0-1
+- update to 1.10.0 (no change)
+
* Mon Jan 20 2020 Remi Collet <remi@remirepo.net> - 1.9.5-1
- update to 1.9.5