diff --git a/.gitignore b/.gitignore index 5cf5e7d..cc4f5c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,2 @@ -/php-nikic-php-parser4-4.0.0-9c18e3d.tar.gz -/php-nikic-php-parser4-4.0.1-e4a54fa.tar.gz -/php-nikic-php-parser4-4.0.2-35b8caf.tar.gz -/php-nikic-php-parser4-4.0.3-bd088dc.tar.gz -/php-nikic-php-parser4-4.0.4-fa6ee28.tar.gz -/php-nikic-php-parser4-4.1.0-d0230c5.tar.gz -/php-nikic-php-parser4-4.1.1-8aae5b5.tar.gz -/php-nikic-php-parser4-4.2.0-594bcae.tar.gz -/php-nikic-php-parser4-4.2.1-5221f49.tar.gz -/php-nikic-php-parser4-4.2.2-1bd73cc.tar.gz -/php-nikic-php-parser4-4.2.3-e612609.tar.gz -/php-nikic-php-parser4-4.2.4-97e59c7.tar.gz +clog +/php-nikic-php-parser4-4.2.5-b76bbc3.tgz diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..7d752c6 --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/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, Commit=$COMMIT\n" + +echo "Cloning..." +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-nikic-php-parser4.spec b/php-nikic-php-parser4.spec index 2b4037b..6ba4169 100644 --- a/php-nikic-php-parser4.spec +++ b/php-nikic-php-parser4.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 97e59c7a16464196a8b9c77c47df68e4a39a45c4 +%global gh_commit b76bbc3c51f22c570648de48e8c2d941ed5e2cf2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner nikic %global gh_project PHP-Parser @@ -21,13 +21,14 @@ %global major 4 Name: php-%{gh_owner}-%{pk_project}%{major} -Version: 4.2.4 +Version: 4.2.5 Release: 1%{?dist} Summary: A PHP parser written in PHP - version %{major} License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} -Source: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz +Source0: %{name}-%{version}-%{gh_short}.tgz +Source1: makesrc.sh # Autoloader Patch0: %{name}-rpm.patch @@ -43,7 +44,8 @@ BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-spl # From composer.json, "require-dev": { -# "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0" +# "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0", +# "ircmaxell/php-yacc": "0.0.4" %global phpunit %{_bindir}/phpunit8 BuildRequires: phpunit8 # Autoloader @@ -69,7 +71,7 @@ Provides: php-composer(%{gh_owner}/%{pk_project}) = %{version} %description -This is a PHP 5.2 to PHP 7.2 parser written in PHP. +This is a PHP 5.2 to PHP 7.4 parser written in PHP. Its purpose is to simplify static code analysis and manipulation. This package provides the library version %{major} and the php-parse%{major} command. @@ -121,6 +123,7 @@ require_once '%{buildroot}/%{php_home}/%{ns_project}%{major}/autoload.php'; AUTOLOAD : Upstream test suite +# ignore test failing on 32-bit (in koji) ret=0 for cmdarg in "php %{phpunit}" "php71 %{_bindir}/phpunit7" php72 php73 php74; do if which $cmdarg; then @@ -145,6 +148,10 @@ exit $ret %changelog +* Mon Oct 28 2019 Remi Collet - 4.2.5-1 +- update to 4.2.5 +- sources from git snapshot + * Mon Sep 2 2019 Remi Collet - 4.2.4-1 - update to 4.2.4 diff --git a/sources b/sources index 22cd820..3fa8689 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-nikic-php-parser4-4.2.4-97e59c7.tar.gz) = 5feedb3a891146729901e89d2e088f2a90007e21f6845a95d4a773d77c5db575eb93b2bc7424de2f862b91a113b6086334981b1c9e4ed039d366e74d0bc08c68 +SHA512 (php-nikic-php-parser4-4.2.5-b76bbc3.tgz) = de7b4a3cfdf1956de8111252f2254e70941ca45f398ad4a5501bba43cb9207cf085e74183196ac021c757bffe39b3a1cd0bc0e7751db6b422de1cdd6da2f4a20