diff --git a/.gitignore b/.gitignore index 39ee0c6..37c72b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ /php-sebastian-type-1.1.1-b2a7f9a.tar.gz /php-sebastian-type-1.1.2-251ca77.tar.gz /php-sebastian-type-1.1.3-3aaaa15.tar.gz -/php-sebastian-type-1.1.4-0150cfb.tar.gz -/php-sebastian-type-1.1.5-18f071c.tgz diff --git a/makesrc.sh b/makesrc.sh deleted file mode 100755 index 3d8028d..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-type.spec b/php-sebastian-type.spec index ab0e9a5..22028f0 100644 --- a/php-sebastian-type.spec +++ b/php-sebastian-type.spec @@ -1,14 +1,14 @@ # remirepo/fedora spec file for php-sebastian-type # -# Copyright (c) 2019-2024 Remi Collet -# License: CC-BY-SA-4.0 +# Copyright (c) 2019 Remi Collet +# License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 # github -%global gh_commit 18f071c3a29892b037d35e6b20ddf3ea39b42874 +%global gh_commit 3aaaa15fa71d27650d62a948be022fe3b48541a3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project type @@ -27,14 +27,13 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 1.1.5 -Release: 4%{?dist} -Summary: Collection of value objects that represent the types of the PHP type system, v1 +Version: 1.1.3 +Release: 2%{?dist} +Summary: Collection of value objects that represent the types of the PHP type system -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.2 @@ -49,7 +48,7 @@ BuildRequires: phpunit8 > 8.1 %endif # from composer.json, "require": { -# "php": ">=7.2", +# "php": "^7.2", Requires: php(language) >= 7.2 # from phpcompatinfo report for version 1.0.0: only core # Autoloader @@ -61,10 +60,6 @@ Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} %description Collection of value objects that represent the types of the PHP type system. -This package provides version %{major} of %{pk_vendor}/%{pk_project} library. - -Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php - %prep %setup -q -n %{gh_project}-%{gh_commit} @@ -94,7 +89,7 @@ EOF : Run upstream test suite ret=0 -for cmd in php php81 php82 php83; do +for cmd in php php72 php73 php74; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ %{_bindir}/phpunit8 --verbose || ret=1 @@ -115,56 +110,6 @@ exit $ret %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 1.1.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 1.1.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 1.1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Mar 1 2024 Remi Collet - 1.1.5-1 -- update to 1.1.5 (no change) -- sources from git snapshot - -* Thu Jan 25 2024 Fedora Release Engineering - 1.1.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.1.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 1.1.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Apr 21 2023 Remi Collet - 1.1.4-7 -- use SPDX License id - -* Fri Jan 20 2023 Fedora Release Engineering - 1.1.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 1.1.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 1.1.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Jul 27 2021 Fedora Release Engineering - 1.1.4-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Nov 30 2020 Remi Collet - 1.1.4-1 -- update to 1.1.4 (no change) - -* Tue Jul 28 2020 Fedora Release Engineering - 1.1.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jan 30 2020 Fedora Release Engineering - 1.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - * Fri Jul 26 2019 Fedora Release Engineering - 1.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 9945a9f..e69f646 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-type-1.1.5-18f071c.tgz) = 60c908ac15af6b924edab20b8148506cc520e4861dee6a165eb5ed9ab48ba4f4c2090608fc07961fc3ec361532a5475ae2a0bedbfb586de851860ba6f4bf1209 +SHA512 (php-sebastian-type-1.1.3-3aaaa15.tar.gz) = f58a85a0b40470559e6f801e5635669712b5b7dc28fb5208ced5912e4fc967fc873c5d7373e946ec8d3f80e8eb1f7946939e6bff026743472ed3dbf1a98ed604