diff --git a/.gitignore b/.gitignore index e31088f..8a8dc5d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,3 @@ /php-doctrine-lexer-1.0-f12a5f74e5f4a9e3f558f3288504e121edfad891.tar.gz /php-doctrine-lexer-1.0-83893c552fd2045dd78aef794c31e694c37c0b8c.tar.gz /php-doctrine-lexer-1.0.1-83893c552fd2045dd78aef794c31e694c37c0b8c.tar.gz -/php-doctrine-lexer-1.0.2-1febd6c3ef84253d7c815bed85fc622ad207a9f8.tar.gz -/php-doctrine-lexer-1.1.0-e17f069.tgz -/php-doctrine-lexer-1.2.0-5242d66.tgz -/php-doctrine-lexer-1.2.1-e864bbf.tgz -/php-doctrine-lexer-1.2.2-9c50f84.tgz -/php-doctrine-lexer-1.2.3-c268e88.tgz diff --git a/composer.json b/composer.json deleted file mode 100644 index c435647..0000000 --- a/composer.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "doctrine/lexer", - "type": "library", - "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", - "keywords": [ - "php", - "parser", - "lexer", - "annotations", - "docblock" - ], - "homepage": "https://www.doctrine-project.org/projects/lexer.html", - "license": "MIT", - "authors": [ - {"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"}, - {"name": "Roman Borschel", "email": "roman@code-factory.org"}, - {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"} - ], - "require": { - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^9.0", - "phpstan/phpstan": "^1.3", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.11" - }, - "autoload": { - "psr-4": { "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" } - }, - "autoload-dev": { - "psr-4": { "Doctrine\\Tests\\": "tests/Doctrine" } - }, - "config": { - "allow-plugins": { - "composer/package-versions-deprecated": true, - "dealerdirect/phpcodesniffer-composer-installer": true - }, - "sort-packages": true - } -} diff --git a/makesrc.sh b/makesrc.sh deleted file mode 100755 index 97be9f6..0000000 --- a/makesrc.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -NAME=$(basename $PWD) -OWNER=$(sed -n '/^%global github_owner/{s/.* //;p}' $NAME.spec) -PROJECT=$(sed -n '/^%global github_name/{s/.* //;p}' $NAME.spec) -VERSION=$(sed -n '/^%global github_version/{s/.* //;p}' $NAME.spec) -COMMIT=$(sed -n '/^%global github_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 $PROJECT-$COMMIT - -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT - -echo "Done." diff --git a/php-doctrine-lexer.spec b/php-doctrine-lexer.spec index 272b4aa..36d365d 100644 --- a/php-doctrine-lexer.spec +++ b/php-doctrine-lexer.spec @@ -1,56 +1,42 @@ # # Fedora spec file for php-doctrine-lexer # -# Copyright (c) 2013-2022 Shawn Iwinski +# Copyright (c) 2013-2017 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT # # Please preserve changelog entries # -# Github + %global github_owner doctrine %global github_name lexer -%global github_version 1.2.3 -%global github_commit c268e882d4dbdd85e36e4ad69e02dc284f89d229 -%global github_short %(c=%{github_commit}; echo ${c:0:7}) -# Namespace -%global ns_vendor Doctrine -%global ns_project Common -%global ns_subproj Lexer -# Packagist +%global github_version 1.0.1 +%global github_commit 83893c552fd2045dd78aef794c31e694c37c0b8c + %global composer_vendor doctrine %global composer_project lexer -# "php": "^7.1 || ^8.0" -%global php_min_ver 7.1 +# "php": ">=5.3.2" +%global php_min_ver 5.3.2 %{!?phpdir: %global phpdir %{_datadir}/php} -%global with_tests 0%{!?_without_tests:1} Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} Release: 9%{?github_release}%{?dist} Summary: Base library for a lexer that can be used in top-down, recursive descent parsers +Group: Development/Libraries License: MIT URL: https://github.com/%{github_owner}/%{github_name} -# git snapshot with tests -Source0: %{name}-%{github_version}-%{github_short}.tgz -Source1: makesrc.sh +Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz BuildArch: noarch -BuildRequires: php-fedora-autoloader-devel -%if %{with_tests} -BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-pcre -BuildRequires: php-reflection -BuildRequires: phpunit9 -%endif # composer.json Requires: php(language) >= %{php_min_ver} -# phpcompatinfo (computed from version 1.1.0) +# phpcompatinfo (computed from version 1.0.1) Requires: php-pcre Requires: php-reflection # Autoloader @@ -65,7 +51,7 @@ parsers. This lexer is used in Doctrine Annotations and in Doctrine ORM (DQL). -Autoloader: %{phpdir}/%{ns_vendor}/%{ns_project}/%{ns_subproj}/autoload.php +Autoloader: %{phpdir}/Doctrine/Common/Lexer/autoload.php %prep @@ -73,11 +59,17 @@ Autoloader: %{phpdir}/%{ns_vendor}/%{ns_project}/%{ns_subproj}/autoload.php %build -: Generate a simple autoloader -%{_bindir}/phpab \ - --output lib/%{ns_vendor}/%{ns_project}/%{ns_subproj}/autoload.php \ - --template fedora \ - lib/%{ns_vendor}/%{ns_project} +: Create autoloader +cat <<'AUTOLOAD' | tee lib/Doctrine/Common/Lexer/autoload.php + - 1.2.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 1.2.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 1.2.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 1.2.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.2.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 1.2.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 1.2.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 1.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Feb 28 2022 Remi Collet - 1.2.3-1 -- update to 1.2.3 - -* Fri Jan 21 2022 Fedora Release Engineering - 1.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jan 12 2022 Remi Collet - 1.2.2-1 -- update to 1.2.2 -- switch to phpunit9 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.2.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 1.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Remi Collet - 1.2.1-1 -- update to 1.2.1 (no change) - -* Thu Jan 30 2020 Fedora Release Engineering - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Nov 13 2019 Remi Collet - 1.2.0-1 -- update to 1.2.0 - -* Thu Aug 1 2019 Remi Collet - 1.1.0-1 -- update to 1.1.0 -- raise dependency on PHP 7.2 -- sources from git snapshot -- run upstream test suite during build -- use classmap autoloader - -* Fri Jul 26 2019 Fedora Release Engineering - 1.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Jun 11 2019 Remi Collet - 1.0.2-1 -- update to 1.0.2 - -* Sat Feb 02 2019 Fedora Release Engineering - 1.0.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.0.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.0.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - * Thu Jul 27 2017 Fedora Release Engineering - 1.0.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 10ea7b3..2bc570e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-doctrine-lexer-1.2.3-c268e88.tgz) = d595844b12c048896f1cab68c3fdc26142921aea1ed06e0949035a9a8697b1b1b8cd168adecb88de91448511ff80965ae43f9ab710550eca77967a62cbbe4eb3 +fbd70767eb4849b2244f8fc33c95d6ef php-doctrine-lexer-1.0.1-83893c552fd2045dd78aef794c31e694c37c0b8c.tar.gz