diff --git a/.gitignore b/.gitignore index 42fa6e4..a914996 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,11 @@ -/tokenizer-1.1.0-cb2f008.tar.gz +clog +/tokenizer-1.1.1-06b6ce4.tar.gz +/tokenizer-1.1.2-1c42705.tar.gz +/tokenizer-1.1.3-11336f6.tar.gz +/tokenizer-1.2.0-75a63c3.tar.gz +/php-theseer-tokenizer-1.2.0-75a63c3.tgz +/php-theseer-tokenizer-1.2.1-34a41e9.tgz +/php-theseer-tokenizer-1.2.2-b2ad500.tgz +/php-theseer-tokenizer-1.2.3-737eda6.tgz +/php-theseer-tokenizer-1.3.0-d74205c.tgz +/php-theseer-tokenizer-1.3.1-b7489ce.tgz diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..8152336 --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +NAME=$(basename $PWD) +OWNER=$(sed -n '/^%global gh_vendor/{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-theseer-tokenizer.spec b/php-theseer-tokenizer.spec index be9a966..f3d4e8e 100644 --- a/php-theseer-tokenizer.spec +++ b/php-theseer-tokenizer.spec @@ -1,12 +1,14 @@ # remirepo/fedora spec file for php-theseer-tokenizer # -# Copyright (c) 2017 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2017-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # -%global gh_commit cb2f008f3f05af2893a87208fe6a6c4985483f8b +%bcond_without tests + +%global gh_commit b7489ce515e168639d17feec34b8847c326b0b3c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor theseer %global gh_project tokenizer @@ -14,14 +16,14 @@ %global ns_project Tokenizer Name: php-%{gh_vendor}-%{gh_project} -Version: 1.1.0 -Release: 4%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Summary: Library for converting tokenized PHP source code into XML -Group: Development/Libraries -License: BSD +License: BSD-3-Clause URL: https://github.com/%{gh_vendor}/%{gh_project} -Source0: https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{?gh_short}.tar.gz +Source0: %{name}-%{version}-%{?gh_short}.tgz +Source1: makesrc.sh BuildArch: noarch BuildRequires: php(language) >= 7.0 @@ -30,13 +32,15 @@ BuildRequires: php-dom BuildRequires: php-tokenizer BuildRequires: php-pcre BuildRequires: php-spl +%if %{with tests} +# Tests +BuildRequires: phpunit9 +%endif # Autoloader BuildRequires: php-fedora-autoloader-devel >= 1.0.0 -# Tests -BuildRequires: phpunit6 # From composer.json, "require": { -# "php": "^7.0", +# "php": "^7.0 || ^8.0", # "ext-xmlwriter": "*", # "ext-dom": "*", # "ext-tokenizer": "*" @@ -65,7 +69,7 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php %build : Generate a simple classmap autoloader -%{_bindir}/phpab --template fedora2 --output src/autoload.php src +%{_bindir}/phpab --template fedora --output src/autoload.php src %install @@ -73,21 +77,21 @@ mkdir -p %{buildroot}%{_datadir}/php/%{ns_vendor} cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project} +%if %{with tests} %check ret=0 -for cmd in php php70 php71 php72; do - if which $cmd; then - $cmd -d include_path=.:%{buildroot}%{php_home}:%{php_home} \ - %{_bindir}/phpunit6 \ - --bootstrap %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php \ - --no-coverage --verbose || ret=1 +for cmdarg in php php81 php82 php83 php84 php85; do + if which $cmdarg; then + $cmdarg -d auto_prepend_file=%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php \ + %{_bindir}/phpunit9 \ + --no-coverage --verbose || ret=1 fi done exit $ret +%endif %files -%{!?_licensedir:%global license %%doc} %license LICENSE %doc README.md composer.json %dir %{_datadir}/php/%{ns_vendor} @@ -95,6 +99,87 @@ exit $ret %changelog +* Wed Nov 19 2025 Remi Collet - 1.3.1-1 +- update to 1.3.1 + +* Fri Nov 14 2025 Remi Collet - 1.3.0-1 +- update to 1.3.0 +- re-license spec file to CECILL-2.1 + +* Fri Jul 25 2025 Fedora Release Engineering - 1.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sat Jan 18 2025 Fedora Release Engineering - 1.2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 19 2024 Fedora Release Engineering - 1.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Mar 5 2024 Remi Collet - 1.2.3-1 +- update to 1.2.3 + +* Thu Jan 25 2024 Fedora Release Engineering - 1.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Nov 20 2023 Remi Collet - 1.2.2-1 +- update to 1.2.2 + +* Fri Jul 21 2023 Fedora Release Engineering - 1.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Apr 20 2023 Remi Collet - 1.2.1-5 +- use SPDX license ID +- switch to phpunit9 + +* Fri Jan 20 2023 Fedora Release Engineering - 1.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 1.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 28 2021 Remi Collet - 1.2.1-1 +- update to 1.2.1 + +* Tue Jul 27 2021 Fedora Release Engineering - 1.2.0-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 13 2020 Remi Collet - 1.2.0-1 +- update to 1.2.0 +- sources from git snapshot + +* 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 + +* Fri Jun 14 2019 Remi Collet - 1.1.3-1 +- update to 1.1.3 + +* Thu Apr 4 2019 Remi Collet - 1.1.2-1 +- update to 1.1.2 (no change) +- switch back to phpunit 7 + +* Thu Apr 4 2019 Remi Collet - 1.1.1-1 +- update to 1.1.1 +- use phpunit8 + +* Sat Feb 02 2019 Fedora Release Engineering - 1.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 1e24f10..9c485e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tokenizer-1.1.0-cb2f008.tar.gz) = ab6a8dde2296ccf7ffda86c8906b6d546309c442611f12e87b829b44635a8cd17a6cdd834d21ba33b7f346561420739dd81cf2293ba52900f121c0c4311dbed2 +SHA512 (php-theseer-tokenizer-1.3.1-b7489ce.tgz) = 0eaecbe299b3844be21e22891eff42d864885b5dfb9960e29abc804f44c79884f429ea29acf0671f9107ffb1948398c181c5f7c0cee7d8ce4299d59af0ff3113