diff --git a/.gitignore b/.gitignore index b3e6878..a4c5d05 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ /php-sebastian-comparator3-3.0.0-ed5fd22.tar.gz /php-sebastian-comparator3-3.0.1-591a309.tar.gz /php-sebastian-comparator3-3.0.2-5de4fc1.tar.gz -/php-sebastian-comparator3-3.0.3-1071dfc.tar.gz -/php-sebastian-comparator3-3.0.4-c05dd18.tar.gz -/php-sebastian-comparator3-3.0.5-1dc7ceb.tgz -/php-sebastian-comparator3-3.0.6-4b3c947.tgz diff --git a/makesrc.sh b/makesrc.sh deleted file mode 100755 index 4190c13..0000000 --- a/makesrc.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/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-vcs --exclude tools $PROJECT-$COMMIT - -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT - -echo "Done." diff --git a/php-sebastian-comparator3.spec b/php-sebastian-comparator3.spec index 1f5ac0b..a2d545d 100644 --- a/php-sebastian-comparator3.spec +++ b/php-sebastian-comparator3.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-sebastian-comparator3 # -# SPDX-FileCopyrightText: Copyright 2014-2025 Remi Collet -# SPDX-License-Identifier: CECILL-2.1 -# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +# Copyright (c) 2014-2018 Remi Collet +# License: CC-BY-SA +# http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 4b3c947888c81708b20fb081bb653a2ba68f989a +%global gh_commit 5de4fc177adf9bce8df98d8d141a7559d7ccf6da %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project comparator @@ -24,14 +24,13 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.0.6 -Release: 1%{?dist} -Summary: Compare PHP values for equality, version %{major} +Version: 3.0.2 +Release: 6%{?dist} +Summary: Compare PHP values for equality -License: BSD-3-Clause +License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: %{name}-%{version}-%{gh_short}.tgz -Source1: makesrc.sh +Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz BuildArch: noarch BuildRequires: php(language) >= 7.1 @@ -40,19 +39,21 @@ BuildRequires: (php-composer(%{pk_vendor}/exporter) >= 3.1 with php-composer(%{ BuildRequires: php-fedora-autoloader-devel %if %{with_tests} # from composer.json, "require-dev": { -# "phpunit/phpunit": "^8.5" -BuildRequires: phpunit8 >= 8.5 +# "phpunit/phpunit": "^7.1" +BuildRequires: phpunit7 >= 7.1 %endif # from composer.json -# "php": ">=7.1", +# "php": "^7.1", # "sebastian/diff": "^3.0", # "sebastian/exporter": "^3.1" Requires: php(language) >= 7.1 Requires: (php-composer(%{pk_vendor}/diff) >= 3.0 with php-composer(%{pk_vendor}/diff) < 4) Requires: (php-composer(%{pk_vendor}/exporter) >= 3.1 with php-composer(%{pk_vendor}/exporter) < 4) # from phpcompatinfo report for version 3.0.0 +Requires: php-date Requires: php-dom +Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) @@ -62,8 +63,6 @@ Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} %description This component provides the functionality to compare PHP values for equality. -This package provides the version %{major} of the library. - Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php @@ -97,10 +96,10 @@ mkdir vendor : Run upstream test suite ret=0 -for cmd in php php81 php82 php83 php84 php85; do +for cmd in php php71 php72 php73; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ - %{_bindir}/phpunit8 --no-coverage --verbose || ret=1 + %{_bindir}/phpunit7 --no-coverage --verbose || ret=1 fi done exit $ret @@ -118,56 +117,6 @@ exit $ret %changelog -* Mon Aug 11 2025 Remi Collet - 3.0.6-1 -- update to 3.0.6 - -* Fri Jul 25 2025 Fedora Release Engineering - 3.0.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 3.0.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 3.0.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 3.0.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 3.0.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 3.0.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Apr 21 2023 Remi Collet - 3.0.5-3 -- use SPDX license ID - -* Fri Jan 20 2023 Fedora Release Engineering - 3.0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Sep 14 2022 Remi Collet - 3.0.5-1 -- update to 3.0.5 -- sources from git snapshot - -* Wed Sep 14 2022 Remi Collet - 3.0.4-1 -- update to 3.0.4 - -* Fri Jul 22 2022 Fedora Release Engineering - 3.0.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 3.0.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 3.0.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 3.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Nov 30 2020 Remi Collet - 3.0.3-1 -- update to 3.0.3 (no change) -- switch to phpunit8 - * Tue Jul 28 2020 Fedora Release Engineering - 3.0.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index b5336e0..cc9e22d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-comparator3-3.0.6-4b3c947.tgz) = a2220853a80f470d8b8ca9a31644cd5af8a6a66a457d108778a73582d1bc7628d7d36f07b72b9b2be7a1c29b159ba4c939f6816359436d93e773d4e705b6c22d +SHA512 (php-sebastian-comparator3-3.0.2-5de4fc1.tar.gz) = ac84f0c4a81a8bfd3931f602553029de243f120cbfe0a5ffd3324bba9895d8bbddbde3c3c9c6c3b50db242fa3eb61e9789443d0538ba35918c15fbb77e09ef9b