Compare commits

..

No commits in common. "rawhide" and "f34" have entirely different histories.

4 changed files with 29 additions and 102 deletions

2
.gitignore vendored
View file

@ -1,4 +1,2 @@
clog
/php-hamcrest2-2.0.0-776503d.tar.gz
/php-hamcrest2-2.0.1-8c3d0a3.tar.gz
/php-hamcrest2-2.1.1-f8b1c01.tgz

View file

@ -1,33 +0,0 @@
#!/bin/bash
NAME=$(sed -n '/^Name:/{s/.* //;p}' *.spec)
DATE=$(sed -n '/^%global gh_date/{s/.* //;p}' $NAME.spec)
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}
DATE=$(date -d "$DATE -4 days" +%Y-%m-%d)
if [ -f $NAME-$VERSION-$SHORT.tgz ]; then
echo "Skip $NAME-$VERSION-$SHORT.tgz"
else
echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Commit=$COMMIT, Date=$DATE\n"
echo "Cloning..."
git clone --shallow-since=$DATE https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1
echo "Getting commit..."
pushd $PROJECT-$COMMIT
git checkout $COMMIT || exit1
cp composer.json ../
popd
echo "Archiving..."
tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
echo "Cleaning..."
rm -rf $PROJECT-$COMMIT
fi

View file

@ -1,13 +1,12 @@
# remirepo/fedora spec file for php-hamcrest2
# remirepo/fedora spec file for php-hamcrest
#
# SPDX-FileCopyrightText: Copyright 2015-2025 Remi Collet
# SPDX-License-Identifier: CECILL-2.1
# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
# Copyright (c) 2015-2020 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
%global gh_date 2025-04-30
%global gh_commit f8b1c0173b22fa6ec77a81fe63e5b01eba7e6487
%global gh_commit 8c3d0a3f6af734494ad8f6fbbee0ba92422859f3
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner hamcrest
%global gh_project hamcrest-php
@ -16,15 +15,13 @@
%bcond_without tests
Name: php-hamcrest2
Version: 2.1.1
Release: 2%{?dist}
Version: 2.0.1
Release: 3%{?dist}
Summary: PHP port of Hamcrest Matchers
License: BSD-3-Clause
License: BSD
URL: https://github.com/%{gh_owner}/%{gh_project}
# git snapshot with tests
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
# Use generated autoloader instead of composer one
Patch0: bootstrap-autoload.patch
@ -33,21 +30,26 @@ BuildArch: noarch
BuildRequires: php-fedora-autoloader-devel
%if %{with tests}
# From composer.json, require-dev:
# "phpunit/php-file-iterator": "^1.4 || ^2.0 || ^3.0",
# "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0 || ^8.0 || ^9.0"
BuildRequires: phpunit9
BuildRequires: php(language) >= 7.4
# From phpcompatinfo report for 2.1.1
# "phpunit/php-file-iterator": "^1.4 || ^2.0",
# "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0"
BuildRequires: phpunit7
# composer.json, require:
# "php": "^5.3|^7.0|^8.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
# composer.json, require:
# "php": "^7.4|^8.0"
Requires: php(language) >= 7.4
# From phpcompatinfo report for 2.1.1
Requires: php(language) >= 5.3
# From phpcompatinfo report for 2.0.0
Requires: php-ctype
Requires: php-dom
Requires: php-pcre
Requires: php-spl
# Autoloader
Requires: php-composer(fedora/autoloader)
@ -68,8 +70,8 @@ Autoloader: %{_datadir}/php/%{ns_project}%{major}/autoload.php
%prep
%setup -q -n %{gh_project}-%{gh_commit}
%patch -P0 -p0 -b .rpm
find . -name \*.rpm -exec rm {} \; -print
%patch0 -p0 -b .rpm
find . -name \*.rpm -exec rm {} \;
# Move to Library tree
mv hamcrest/%{ns_project}.php hamcrest/%{ns_project}/%{ns_project}.php
@ -98,9 +100,9 @@ cp -pr hamcrest/%{ns_project} %{buildroot}%{_datadir}/php/%{ns_project}%{major}
%if %{with tests}
cd tests
ret=0
for cmd in php php81 php82 php83 php84; do
for cmd in php php72 php73 php74; do
if which $cmd; then
$cmd %{_bindir}/phpunit9 || ret=1
$cmd %{_bindir}/phpunit7 --verbose || ret=1
fi
done
exit $ret
@ -110,6 +112,7 @@ exit $ret
%files
%{!?_licensedir:%global license %%doc}
%license LICENSE.txt
%doc CHANGES.txt README.md
%doc composer.json
@ -117,47 +120,6 @@ exit $ret
%changelog
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Tue May 6 2025 Remi Collet <remi@remirepo.net> - 2.1.1-1
- update to 2.1.1
- raise dependency on PHP 7.4
* Wed Jan 22 2025 Remi Collet <remi@remirepo.net> - 2.0.1-12
- switch to phpunit9
- re-license spec file to CECILL-2.1
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Sep 4 2024 Miroslav Suchý <msuchy@redhat.com> - 2.0.1-12
- convert license to SPDX
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

View file

@ -1 +1 @@
SHA512 (php-hamcrest2-2.1.1-f8b1c01.tgz) = 04bd4aa0c71e49622cfd275ab93886f6e0150607d5918a89458c80964abf81031f57b4558786b0b07530d84b36a5c5d8db83ebc51edefde790d163e57a89fec5
SHA512 (php-hamcrest2-2.0.1-8c3d0a3.tar.gz) = 2c958c239f9aa6239ebf5cba190b94f2db39ab84d9bde8a435bcf3c212dc3b6e362f295f5a989f5dff571e0516c742ea37cdb1fd5c64b37a5076938cc57e8807