From 2a4cb8f55ff9aefd394a67efc5565083efd4939e Mon Sep 17 00:00:00 2001 From: Shawn Iwinski Date: Fri, 16 May 2014 12:09:00 -0400 Subject: [PATCH] Updated to 1.0.0-beta1 (BZ #1096697) --- .gitignore | 1 + php-PHPParser.spec | 47 ++++++++++++++++++++++++++-------------------- sources | 1 + 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index d60fe47..1907de1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /v0.9.3.tar.gz /php-PHPParser-0.9.4-1e5e280ae88a27effa2ae4aa2bd088494ed8594f.tar.gz +/php-PHPParser-1.0.0-a6d46c17b10d89f35a92fa4b8fb5071615bfb36c.tar.gz diff --git a/php-PHPParser.spec b/php-PHPParser.spec index f261cf0..1049a1e 100644 --- a/php-PHPParser.spec +++ b/php-PHPParser.spec @@ -1,15 +1,17 @@ %global github_owner nikic %global github_name PHP-Parser -%global github_version 0.9.4 -%global github_commit 1e5e280ae88a27effa2ae4aa2bd088494ed8594f +%global github_version 1.0.0 +%global github_commit a6d46c17b10d89f35a92fa4b8fb5071615bfb36c +%global github_release .beta1 -%global lib_name PHPParser +%global lib_name PhpParser +%global lib_name_old PHPParser -%global php_min_ver 5.2.0 +%global php_min_ver 5.3 -Name: php-%{lib_name} +Name: php-%{lib_name_old} Version: %{github_version} -Release: 1%{?dist} +Release: 0.1%{?github_release}%{?dist} Summary: A PHP parser written in PHP Group: Development/Libraries @@ -20,27 +22,23 @@ Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{githu BuildArch: noarch # For tests BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-pear(pear.phpunit.de/PHPUnit) -# For tests: phpcompatinfo + +BuildRequires: %{_bindir}/phpunit +# For tests: phpcompatinfo (computed from version 1.0.0-beta1) BuildRequires: php-ctype BuildRequires: php-filter BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-tokenizer -BuildRequires: php-xmlreader -BuildRequires: php-xmlwriter +# composer.json Requires: php(language) >= %{php_min_ver} -# phpcompatinfo requires +Requires: php-tokenizer +# phpcompatinfo (computed from version 1.0.0-beta1) Requires: php-ctype Requires: php-filter Requires: php-pcre Requires: php-spl -Requires: php-tokenizer -Requires: php-xmlreader -Requires: php-xmlwriter - -Obsoletes: %{name}-test %description A PHP parser written in PHP to simplify static analysis and code manipulation. @@ -58,6 +56,11 @@ A PHP parser written in PHP to simplify static analysis and code manipulation. mkdir -p -m 755 %{buildroot}%{_datadir}/php cp -rp lib/%{lib_name} %{buildroot}%{_datadir}/php/ +# Compat with old version (< 1.0.0) +mkdir -p -m 755 %{buildroot}%{_datadir}/php/%{lib_name_old} +ln -s ../%{lib_name}/Autoloader.php \ + %{buildroot}%{_datadir}/php/%{lib_name_old}/Autoloader.php + %check %{_bindir}/phpunit @@ -65,12 +68,16 @@ cp -rp lib/%{lib_name} %{buildroot}%{_datadir}/php/ %files %doc LICENSE *.md doc grammar composer.json +%{_datadir}/php/%{lib_name_old} %{_datadir}/php/%{lib_name} %changelog -* Fri Nov 15 2013 Shawn Iwinski 0.9.4-1 -- Updated to 0.9.4 +* Fri May 16 2014 Shawn Iwinski - 1.0.0-0.1.beta1 +- Updated to 1.0.0-beta1 (BZ #1096697) + +* Fri Nov 15 2013 Shawn Iwinski - 0.9.4-1 +- Updated to 0.9.4 (BZ #1001126) - Spec cleanup * Sun Aug 04 2013 Fedora Release Engineering - 0.9.3-4 @@ -79,9 +86,9 @@ cp -rp lib/%{lib_name} %{buildroot}%{_datadir}/php/ * Thu Feb 14 2013 Fedora Release Engineering - 0.9.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild -* Mon Dec 31 2012 Shawn Iwinski 0.9.3-2 +* Mon Dec 31 2012 Shawn Iwinski - 0.9.3-2 - Added php_min_ver - Fixed requires for php_min_ver and non-Fedora -* Thu Dec 20 2012 Shawn Iwinski 0.9.3-1 +* Thu Dec 20 2012 Shawn Iwinski - 0.9.3-1 - Initial package diff --git a/sources b/sources index 4a689ef..dcc8e4f 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 9823c79433a2d6dccb0d4a27c6d19829 v0.9.3.tar.gz bf1d7c80e57d97ae4ddfc26dd2f6d3aa php-PHPParser-0.9.4-1e5e280ae88a27effa2ae4aa2bd088494ed8594f.tar.gz +4113bcd5a1836d97eedff0a8f589e03b php-PHPParser-1.0.0-a6d46c17b10d89f35a92fa4b8fb5071615bfb36c.tar.gz