diff --git a/.gitignore b/.gitignore index a914996..140e7cd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,10 +2,3 @@ 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 deleted file mode 100755 index 8152336..0000000 --- a/makesrc.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/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 f3d4e8e..7bcf850 100644 --- a/php-theseer-tokenizer.spec +++ b/php-theseer-tokenizer.spec @@ -1,14 +1,12 @@ # remirepo/fedora spec file for php-theseer-tokenizer # -# SPDX-FileCopyrightText: Copyright 2017-2025 Remi Collet -# SPDX-License-Identifier: CECILL-2.1 -# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +# Copyright (c) 2017-2019 Remi Collet +# License: CC-BY-SA +# http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%bcond_without tests - -%global gh_commit b7489ce515e168639d17feec34b8847c326b0b3c +%global gh_commit 11336f6f84e16a720dae9d8e6ed5019efa85a0f9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor theseer %global gh_project tokenizer @@ -16,14 +14,14 @@ %global ns_project Tokenizer Name: php-%{gh_vendor}-%{gh_project} -Version: 1.3.1 +Version: 1.1.3 Release: 1%{?dist} Summary: Library for converting tokenized PHP source code into XML -License: BSD-3-Clause +Group: Development/Libraries +License: BSD URL: https://github.com/%{gh_vendor}/%{gh_project} -Source0: %{name}-%{version}-%{?gh_short}.tgz -Source1: makesrc.sh +Source0: https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{?gh_short}.tar.gz BuildArch: noarch BuildRequires: php(language) >= 7.0 @@ -32,15 +30,14 @@ 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 +%global phpunit %{_bindir}/phpunit7 +BuildRequires: %{phpunit} # From composer.json, "require": { -# "php": "^7.0 || ^8.0", +# "php": "^7.0", # "ext-xmlwriter": "*", # "ext-dom": "*", # "ext-tokenizer": "*" @@ -77,18 +74,17 @@ mkdir -p %{buildroot}%{_datadir}/php/%{ns_vendor} cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project} -%if %{with tests} %check ret=0 -for cmdarg in php php81 php82 php83 php84 php85; do +for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do if which $cmdarg; then - $cmdarg -d auto_prepend_file=%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php \ - %{_bindir}/phpunit9 \ + set $cmdarg + $1 -d auto_prepend_file=%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php \ + ${2:-%{_bindir}/phpunit7} \ --no-coverage --verbose || ret=1 fi done exit $ret -%endif %files @@ -99,73 +95,6 @@ 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 @@ -177,9 +106,6 @@ exit $ret - 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 9c485e2..b8044b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-theseer-tokenizer-1.3.1-b7489ce.tgz) = 0eaecbe299b3844be21e22891eff42d864885b5dfb9960e29abc804f44c79884f429ea29acf0671f9107ffb1948398c181c5f7c0cee7d8ce4299d59af0ff3113 +SHA512 (tokenizer-1.1.3-11336f6.tar.gz) = 08f39ab9927830f8f434acef3ccb594f7aaccaa205dba239844a5acea835ec84bea4e96bf36f2940a68003ce94af1cb3d2513f59686762f7ab8f411e64554ad9