summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-04-04 14:22:35 +0200
committerRemi Collet <fedora@famillecollet.com>2015-04-04 14:22:35 +0200
commit14aef1f6199226af39eabbe1d8d8ee61b39264e1 (patch)
treeb12a4cb40bbdaab39efd4e722b10f9987846455d
parentdf1f0642aeaa3299775f63becb19e19e651d0c11 (diff)
php-bartlett-PHP-CompatInfo: cleanups
-rw-r--r--php-bartlett-PHP-CompatInfo-dev.spec451
-rw-r--r--php-bartlett-PHP-CompatInfo-rpm.patch99
-rw-r--r--php-bartlett-PHP-CompatInfo.spec95
3 files changed, 78 insertions, 567 deletions
diff --git a/php-bartlett-PHP-CompatInfo-dev.spec b/php-bartlett-PHP-CompatInfo-dev.spec
deleted file mode 100644
index e4f44b8..0000000
--- a/php-bartlett-PHP-CompatInfo-dev.spec
+++ /dev/null
@@ -1,451 +0,0 @@
-# spec file for php-bartlett-PHP-CompatInfo
-#
-# Copyright (c) 2011-2015 Remi Collet
-# License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/3.0/
-#
-# Please, preserve the changelog entries
-#
-%global gh_commit 0f0cdbcff50b4f7514a9da7be0c7b45a75084ebe
-%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-#global gh_date 20150303
-%global gh_owner llaville
-%global gh_project php-compat-info
-#global prever RC2
-%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
-
-Name: php-bartlett-PHP-CompatInfo
-Version: 4.0.0
-%global specrel 1
-Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
-Summary: Find out version and the extensions required for a piece of code to run
-
-Group: Development/Libraries
-License: BSD
-URL: http://php5.laurent-laville.org/compatinfo/
-Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz
-# Script for fedora-review
-Source1: fedora-review-check
-
-# Autoloader for RPM - die composer !
-# and sqlite database path
-Patch0: %{name}-4.0.0-rpm.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-BuildRequires: php(language) >= 5.3.0
-BuildRequires: php-pdo_sqlite
-BuildRequires: php-composer(bartlett/php-reflect) >= 3.0.0
-%if %{with_tests}
-# to run test suite
-BuildRequires: %{_bindir}/phpunit
-%endif
-
-# From composer.json, "require"
-# "php": ">=5.3.2",
-# "ext-libxml": "*",
-# "ext-pcre": "*",
-# "ext-spl": "*",
-# "ext-json": "*",
-# "ext-pdo_sqlite": "*",
-# "symfony/console": "~2.5",
-# "bartlett/php-reflect": "~3.0",
-Requires: php(language) >= 5.3.0
-Requires: php-json
-Requires: php-libxml
-Requires: php-pcre
-Requires: php-pdo_sqlite
-Requires: php-spl
-Requires: php-composer(bartlett/php-reflect) >= 3.0.0
-Requires: php-composer(bartlett/php-reflect) < 4
-Requires: php-composer(symfony/console) >= 2.5
-Requires: php-composer(symfony/console) < 3
-# From composer.json, "suggest"
-# "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2"
-# "bartlett/umlwriter": "Allow writing UML class diagrams (Graphviz or PlantUML)"
-Requires: php-composer(doctrine/cache)
-Requires: php-composer(bartlett/umlwriter)
-# Required by autoloader
-Requires: php-composer(nikic/php-parser)
-BuildRequires: php-composer(doctrine/collections)
-Requires: php-composer(symfony/class-loader)
-Requires: php-composer(symfony/event-dispatcher)
-Requires: php-composer(symfony/finder)
-BuildRequires: php-composer(symfony/stopwatch)
-BuildRequires: php-composer(symfony/dependency-injection)
-BuildRequires: php-composer(phpdocumentor/reflection-docblock)
-Requires: php-composer(seld/jsonlint)
-Requires: php-composer(sebastian/version)
-Requires: php-composer(justinrainbow/json-schema)
-
-Provides: phpcompatinfo = %{version}
-Provides: php-composer(bartlett/php-compatinfo) = %{version}
-
-
-%description
-PHP_CompatInfo will parse a file/folder/array to find out the minimum
-version and extensions required for it to run. CLI version has many reports
-(extension, interface, class, function, constant) to display and ability to
-show content of dictionary references.
-
-Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/
-
-
-%prep
-%setup -q -n %{gh_project}-%{gh_commit}
-#setup -q -n %{gh_project}-%{version}
-
-%patch0 -p1 -b .rpm
-
-# Cleanup patched files
-find src -name \*rpm -delete -print
-
-# Set package version
-sed -e 's/@package_version@/%{version}%{?prever}/' \
- -i $(find src -name \*.php) bin/phpcompatinfo
-
-
-%build
-: Generate the references database
-%{_bindir}/php data/handleDB.php db:init
-
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_datadir}/php
-cp -pr src/Bartlett %{buildroot}%{_datadir}/php/Bartlett
-
-install -D -p -m 755 bin/phpcompatinfo %{buildroot}%{_bindir}/phpcompatinfo
-install -D -p -m 644 bin/phpcompatinfo.json.dist %{buildroot}%{_sysconfdir}/phpcompatinfo.json
-install -D -p -m 644 bin/phpcompatinfo.1 %{buildroot}%{_mandir}/man1/phpcompatinfo.1
-install -D -p -m 644 data/compatinfo.sqlite %{buildroot}%{_datadir}/%{name}/compatinfo.sqlite
-
-install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora-review-check
-
-
-%if %{with_tests}
-%check
-%{_bindir}/phpunit \
- --include-path src \
- -d memory_limit=-1 \
-%if 0%{?fedora} < 21
- || exit 0
-%endif
-%endif
-
-
-%post
-if [ -x %{_bindir}/pear ]; then
- %{_bindir}/pear uninstall --nodeps --ignore-errors --register-only \
- bartlett.laurent-laville.org/PHP_CompatInfo >/dev/null || :
-fi
-
-
-%files
-%defattr(-,root,root,-)
-%{!?_licensedir:%global license %%doc}
-%license LICENSE
-%doc composer.json README.*
-%config(noreplace) %{_sysconfdir}/phpcompatinfo.json
-%{_bindir}/phpcompatinfo
-%{_datadir}/php/Bartlett/CompatInfo
-%{_mandir}/man1/phpcompatinfo.1*
-%{_datadir}/%{name}
-
-
-%changelog
-* Sat Apr 4 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-1
-- update to 4.0.0
-
-* Thu Mar 26 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.9.RC2
-- update to 4.0.0 RC2
-- add dependency on bartlett/umlwriter
-
-* Thu Mar 12 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.8.RC1
-- update to 4.0.0 RC1
-
-* Fri Feb 27 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.7.20150227git4966955
-- don't display xdebug message when not on a tty
-- add fedora-review-check script
-- handle --without tests option to skip test suite during build
-
-* Fri Feb 27 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.6.20150227git4966955
-- update to 4.0.0beta3
-
-* Sun Feb 22 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.5.20150220git442d25d
-- fix reported version
-
-* Sun Feb 22 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.4.20150220git442d25d
-- update to 4.0.0beta2
-
-* Wed Feb 4 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.3.20150204git6cd2777
-- update to 4.0.0beta1
-
-* Tue Jan 20 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.2.20150116gitd900ea4
-- add patch for DB path (pr #163)
-- take care of test suite results only in f21 for now
-
-* Mon Jan 19 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.1.20150116gitd900ea4
-- 4.0.0 snapshot
-
-* Mon Jan 5 2015 Remi Collet <remi@fedoraproject.org> - 3.7.2-1
-- Update to 3.7.2
-- open https://github.com/llaville/php-compat-info/pull/157
-
-* Fri Dec 19 2014 Remi Collet <remi@fedoraproject.org> - 3.7.1-1
-- Update to 3.7.1
-
-* Fri Dec 12 2014 Remi Collet <remi@fedoraproject.org> - 3.7.0-1
-- Update to 3.7.0
-
-* Thu Nov 20 2014 Remi Collet <remi@fedoraproject.org> - 3.6.1-1
-- Update to 3.6.1
-
-* Thu Nov 13 2014 Remi Collet <remi@fedoraproject.org> - 3.6.0-1
-- Update to 3.6.0
-- add dependency on justinrainbow/json-schema
-- raise dependency on bartlett/php-reflect 2.6
-
-* Thu Oct 16 2014 Remi Collet <remi@fedoraproject.org> - 3.5.0-1
-- Update to 3.5.0
-- add dependency on sebastian/version
-- raise dependency on bartlett/php-reflect 2.5
-
-* Thu Sep 25 2014 Remi Collet <remi@fedoraproject.org> - 3.4.0-1
-- Update to 3.4.0
-- raise dependency on bartlett/php-reflect 2.4
-
-* Wed Sep 24 2014 Remi Collet <remi@fedoraproject.org> - 3.4.0-0.1.ded22dc
-- Test build of upcoming 3.4.0
-
-* Fri Aug 22 2014 Remi Collet <remi@fedoraproject.org> - 3.3.0-1
-- Update to 3.2.0
-- add dependency on seld/jsonlint
-- raise dependency on bartlett/php-reflect 2.3
-- enable the cache plugin in default configuration
-
-* Fri Jul 25 2014 Remi Collet <remi@fedoraproject.org> - 3.2.0-3
-- cleanup pear registration
-
-* Thu Jul 24 2014 Remi Collet <remi@fedoraproject.org> - 3.2.0-2
-- add upstream patch for SNMP extension
-
-* Thu Jul 24 2014 Remi Collet <remi@fedoraproject.org> - 3.2.0-1
-- Update to 3.2.0
-
-* Wed Jul 23 2014 Remi Collet <remi@fedoraproject.org> - 3.2.0-0.1.970d967
-- Test build of upcoming 3.2.0
-- add manpage
-
-* Mon May 26 2014 Remi Collet <remi@fedoraproject.org> - 3.1.0-2
-- fix dependencies
-
-* Mon May 12 2014 Remi Collet <remi@fedoraproject.org> - 3.1.0-1
-- update to 3.1.0
-- sources from github
-- patch autoloader to not rely on composer
-- drop documentation (link to online doc in description)
-
-* Fri Dec 13 2013 Remi Collet <remi@fedoraproject.org> - 2.26.0-1
-- Update to 2.26.0 (stable)
-
-* Thu Nov 14 2013 Remi Collet <remi@fedoraproject.org> - 2.25.0-1
-- Update to 2.25.0
-- remove phpci temporary compat command
-
-* Fri Oct 18 2013 Remi Collet <remi@fedoraproject.org> - 2.24.0-1
-- update to 2.24.0
-- raise dependency, PHP_Reflect 1.9.0
-
-* Sat Oct 12 2013 Remi Collet <remi@fedoraproject.org> - 2.24.0-0.1
-- 2.24.0 test (not released)
-
-* Mon Sep 23 2013 Remi Collet <remi@fedoraproject.org> - 2.23.1-1
-- Update to 2.23.1
-
-* Fri Sep 20 2013 Remi Collet <remi@fedoraproject.org> - 2.23.0-1
-- Update to 2.23.0
-- raise dependencies: PHP 5.3.0, PHP_Reflect 1.8.0 (and < 2)
-- add patch for new constants in jsonc 1.3.2
-
-* Fri Aug 23 2013 Remi Collet <remi@fedoraproject.org> - 2.22.0-1
-- Update to 2.22.0
-
-* Tue Aug 20 2013 Remi Collet <remi@fedoraproject.org> - 2.21.0-1
-- Update to 2.21.0
-- patch for https://github.com/llaville/php-compat-info/issues/99
-
-* Thu Jul 25 2013 Remi Collet <remi@fedoraproject.org> - 2.20.0-1
-- Update to 2.20.0
-- patch from https://github.com/llaville/php-compat-info/pull/98
-
-* Fri Jul 12 2013 Remi Collet <remi@fedoraproject.org> - 2.19.0-1
-- Update to 2.19.0
-- add module and install to fileExtensions in default configuration
- for drupal packages, #979830
-- patch from https://github.com/llaville/php-compat-info/pull/95
-
-* Wed Jun 26 2013 Remi Collet <remi@fedoraproject.org> - 2.18.0-1
-- Update to 2.18.0
-- raise dependencies, PHP_Reflect 1.7.0
-- drop PHP 5.5 patches, applied upstream
-- add patch for windows only constants
-
-* Fri Jun 07 2013 Remi Collet <remi@fedoraproject.org> - 2.17.0-2
-- keep phpci command for now
-
-* Fri Jun 07 2013 Remi Collet <remi@fedoraproject.org> - 2.17.0-1
-- Update to 2.17.0
-- phpci command renamed to phpcompatinfo
-
-* Fri May 10 2013 Remi Collet <remi@fedoraproject.org> - 2.16.0-1
-- Update to 2.16.0
-
-* Fri Apr 12 2013 Remi Collet <remi@fedoraproject.org> - 2.15.0-2
-- add upstream man page (from github)
-
-* Fri Apr 12 2013 Remi Collet <remi@fedoraproject.org> - 2.15.0-1
-- Update to 2.15.0
-- raise dependencies, PHP_Reflect 1.6.2
-- add more patches for PHP 5.5 reference
-
-* Tue Apr 02 2013 Remi Collet <remi@fedoraproject.org> - 2.14.1-1
-- Update to 2.14.1
-- make cache path user dependent
-
-* Mon Mar 18 2013 Remi Collet <remi@fedoraproject.org> - 2.14.0-3
-- add patch for broken extension report
- https://github.com/llaville/php-compat-info/issues/76
-
-* Mon Mar 18 2013 Remi Collet <remi@fedoraproject.org> - 2.14.0-2
-- provides phpci
-- cleanups
-
-* Mon Mar 18 2013 Remi Collet <remi@fedoraproject.org> - 2.14.0-1
-- Update to 2.14.0
-
-* Tue Feb 26 2013 Remi Collet <remi@fedoraproject.org> - 2.13.2-1
-- Update to 2.13.2
-
-* Tue Feb 26 2013 Remi Collet <remi@fedoraproject.org> - 2.13.1-1
-- Update to 2.13.1
-- raise dependencies, PHP_Reflect 1.6.1
-
-* Fri Feb 22 2013 Remi Collet <remi@fedoraproject.org> - 2.13.0-1
-- Update to 2.13.0
-- raise dependencies, PHP_Reflect 1.6.0
-
-* Fri Jan 18 2013 Remi Collet <remi@fedoraproject.org> - 2.12.1-1
-- update to Version 2.12.1
-- fix path to documentation in description
-
-* Thu Jan 17 2013 Remi Collet <remi@fedoraproject.org> - 2.12.0-1
-- update to Version 2.12.0
-- drop dependency on eZ components
-- raise PHPUnit dependency to 3.6.0
-- update References for PHP 5.5 (non yet merged by upstream)
-
-* Fri Dec 21 2012 Remi Collet <remi@fedoraproject.org> - 2.11.0-1
-- update to Version 2.11.0
-- html documentation is now provided by upstream
-
-* Mon Nov 26 2012 Remi Collet <remi@fedoraproject.org> - 2.10.0-2
-- generate documentation using asciidoc, without phing
-
-* Mon Nov 26 2012 Remi Collet <remi@fedoraproject.org> - 2.10.0-1
-- Version 2.10.0 (stable) - API 2.10.0 (stable)
-- raise dependencies, PHP_Reflect 1.5.0
-- drop documentation build
-
-* Tue Oct 30 2012 Remi Collet <remi@fedoraproject.org> - 2.9.0-1
-- Version 2.9.0 (stable) - API 2.9.0 (stable)
-- raise dependencies, PHP_Reflect 1.4.3, Console_CommandLine 1.2.0
-
-* Sat Sep 29 2012 Remi Collet <remi@fedoraproject.org> - 2.8.1-1
-- Version 2.8.1 (stable) - API 2.8.0 (stable)
-
-* Mon Sep 17 2012 Remi Collet <remi@fedoraproject.org> - 2.8.0-1
-- Version 2.8.0 (stable) - API 2.8.0 (stable)
-- new extensions : amqp, geoip, inclued, xcache
-
-* Mon Sep 3 2012 Remi Collet <remi@fedoraproject.org> - 2.7.0-1
-- Version 2.7.0 (stable) - API 2.7.0 (stable)
-
-* Sun Aug 19 2012 Remi Collet <remi@fedoraproject.org> - 2.6.0-3
-- rebuilt for new pear_datadir
-
-* Tue Aug 14 2012 Remi Collet <remi@fedoraproject.org> - 2.6.0-2
-- rebuildt for new pear_testdir
-
-* Wed Aug 01 2012 Remi Collet <remi@fedoraproject.org> - 2.6.0-1
-- Version 2.6.0 (stable) - API 2.6.0 (stable)
-- raise dependencies: PHPUnit 3.6.0, PHP_Reflect 1.4.2
-
-* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.0-2.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sun Jul 8 2012 Remi Collet <remi@fedoraproject.org> - 2.5.0-1.1
-- drop XslTest in EL-6
-
-* Fri Jun 22 2012 Remi Collet <remi@fedoraproject.org> - 2.5.0-1
-- Version 2.5.0 (stable) - API 2.5.0 (stable)
-- use reference="ALL" in provided config
-
-* Fri May 11 2012 Remi Collet <remi@fedoraproject.org> - 2.4.0-1.1
-- add patch for old libxml
-
-* Fri May 11 2012 Remi Collet <remi@fedoraproject.org> - 2.4.0-1
-- Version 2.4.0 (stable) - API 2.3.0 (stable)
-
-* Mon Mar 05 2012 Remi Collet <remi@fedoraproject.org> - 2.3.0-1
-- Version 2.3.0 (stable) - API 2.3.0 (stable)
-
-* Sat Feb 25 2012 Remi Collet <remi@fedoraproject.org> - 2.2.5-1
-- Version 2.2.5 (stable) - API 2.2.0 (stable)
-
-* Fri Feb 17 2012 Remi Collet <remi@fedoraproject.org> - 2.2.4-1
-- Version 2.2.4 (stable) - API 2.2.0 (stable)
-
-* Tue Feb 14 2012 Remi Collet <remi@fedoraproject.org> - 2.2.3-1
-- Version 2.2.3 (stable) - API 2.2.0 (stable)
-
-* Thu Feb 09 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-1
-- Version 2.2.2 (stable) - API 2.2.0 (stable)
-
-* Sun Feb 05 2012 Remi Collet <remi@fedoraproject.org> - 2.2.1-1
-- Version 2.2.1 (stable) - API 2.2.0 (stable)
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Sat Sep 24 2011 Remi Collet <remi@fedoraproject.org> - 2.1.0-3.1
-- no html doc on EL6
-
-* Wed Sep 21 2011 Remi Collet <remi@fedoraproject.org> - 2.1.0-3
-- remove all files with licensing issue
- don't use it during test, don't install it
- can keep it in sources are this files are still under free license
-
-* Tue Sep 20 2011 Remi Collet <remi@fedoraproject.org> - 2.1.0-2
-- comments from review #693204
-- remove ascii*js (not used)
-- add MIT to license for bundled jquery
-
-* Thu Aug 25 2011 Remi Collet <Fedora@FamilleCollet.com> - 2.1.0-1
-- Version 2.1.0 (stable) - API 2.1.0 (stable)
-- fix documentation for asciidoc 8.4
-
-* Sat Jun 04 2011 Remi Collet <Fedora@FamilleCollet.com> - 2.0.0-1
-- Version 2.0.0 (stable) - API 2.0.0 (stable)
-- add HTML documentation
-
-* Tue Apr 26 2011 Remi Collet <Fedora@FamilleCollet.com> - 2.0.0-0.3.RC4
-- Version 2.0.0RC4 (beta) - API 2.0.0 (beta)
-
-* Fri Mar 25 2011 Remi Collet <Fedora@FamilleCollet.com> - 2.0.0-0.2.RC3
-- Version 2.0.0RC3
-
-* Wed Feb 23 2011 Remi Collet <Fedora@FamilleCollet.com> - 2.0.0-0.1.RC2
-- Version 2.0.0RC2
-- Initial Release
-
diff --git a/php-bartlett-PHP-CompatInfo-rpm.patch b/php-bartlett-PHP-CompatInfo-rpm.patch
deleted file mode 100644
index 87bbfe0..0000000
--- a/php-bartlett-PHP-CompatInfo-rpm.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist
---- ./bin/phpcompatinfo.json.dist.rpm 2014-08-22 08:17:40.045281815 +0200
-+++ ./bin/phpcompatinfo.json.dist 2014-08-22 08:17:46.784308376 +0200
-@@ -9,6 +9,19 @@
- {
- "name": "Analyser",
- "class": "Bartlett\\Reflect\\Plugin\\Analyser\\AnalyserPlugin"
-+ },
-+ {
-+ "name": "Cache",
-+ "class": "Bartlett\\Reflect\\Plugin\\Cache\\CachePlugin",
-+ "options": {
-+ "adapter": "DoctrineCacheAdapter",
-+ "backend": {
-+ "class": "Doctrine\\Common\\Cache\\FilesystemCache",
-+ "args": [
-+ "%{HOME}/.cache/phpreflect"
-+ ]
-+ }
-+ }
- }
- ],
- "analysers" : [
-diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo
---- ./bin/phpcompatinfo.rpm 2014-11-13 15:57:07.000000000 +0100
-+++ ./bin/phpcompatinfo 2014-11-13 17:57:48.174914678 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env php
-+#!/usr/bin/php
- <?php
- ini_set('memory_limit', -1);
-
-@@ -27,8 +27,28 @@ if (\Phar::running()) {
- }
- }
- }
--$loader = require_once $vendorDir . '/autoload.php';
--$loader->setUseIncludePath(true);
-+$vendorDir = '/usr/share/php';
-+require_once $vendorDir . '/PhpParser/Autoloader.php';
-+PhpParser\Autoloader::register();
-+
-+require_once $vendorDir . '/PHP/Timer.php';
-+require_once $vendorDir . '/SebastianBergmann/Version/Version.php';
-+
-+require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
-+use Symfony\Component\ClassLoader\UniversalClassLoader;
-+
-+$loader = new UniversalClassLoader();
-+$loader->registerNamespaces(array(
-+ 'Doctrine\\Common\\Cache' => $vendorDir,
-+ 'Symfony\\Component\\Finder' => $vendorDir,
-+ 'Symfony\\Component\\EventDispatcher' => $vendorDir,
-+ 'Symfony\\Component\\Console' => $vendorDir,
-+ 'Symfony\\Component\\ClassLoader' => $vendorDir,
-+ 'Seld\\JsonLint' => $vendorDir,
-+ 'JsonSchema' => $vendorDir,
-+ 'Bartlett' => $vendorDir,
-+));
-+$loader->register();
-
- if (PHP_SAPI !== 'cli') {
- return;
-diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
---- ./tests/bootstrap.php.rpm 2014-08-21 21:09:22.000000000 +0200
-+++ ./tests/bootstrap.php 2014-08-22 08:30:12.203270207 +0200
-@@ -1,8 +1,30 @@
- <?php
-
- $baseDir = dirname(__DIR__);
--$vendorDir = $baseDir . '/vendor';
-+$vendorDir = '/usr/share/php';
-
--require_once $vendorDir . '/autoload.php';
-+require_once $vendorDir . '/PhpParser/Autoloader.php';
-+PhpParser\Autoloader::register();
-
-+require_once $vendorDir . '/PHP/Timer.php';
-+require_once $vendorDir . '/SebastianBergmann/Version/Version.php';
-+
-+require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
-+use Symfony\Component\ClassLoader\UniversalClassLoader;
-+
-+$loader = new UniversalClassLoader();
-+$loader->registerNamespaces(array(
-+ 'Symfony\\Component\\Finder' => $vendorDir,
-+ 'Symfony\\Component\\EventDispatcher' => $vendorDir,
-+ 'Symfony\\Component\\Console' => $vendorDir,
-+ 'Symfony\\Component\\ClassLoader' => $vendorDir,
-+ 'Bartlett\\Reflect' => $vendorDir,
-+ 'Bartlett\\Tests\\CompatInfo' => $baseDir . '/tests',
-+ 'Bartlett' => $baseDir . '/src',
-+ ));
-+
-+$loader->register();
-+
-+# Class not catched by autoloader
-+require $vendorDir . '/Bartlett/Reflect.php';
- require __DIR__ . '/Reference/GenericTest.php';
diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec
index 649348e..f9f8a56 100644
--- a/php-bartlett-PHP-CompatInfo.spec
+++ b/php-bartlett-PHP-CompatInfo.spec
@@ -6,58 +6,74 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit e84e2b60281f1f97b886208d6d06efa4d7701236
-#global gh_short %(c=%{gh_commit}; echo ${c:0:7})
+%global gh_commit 0f0cdbcff50b4f7514a9da7be0c7b45a75084ebe
+%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
+#global gh_date 20150303
%global gh_owner llaville
%global gh_project php-compat-info
+#global prever RC2
+%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
Name: php-bartlett-PHP-CompatInfo
-Version: 3.7.3
+Version: 4.0.0
%global specrel 1
-Release: %{?gh_short:0.%{specrel}.git%{gh_short}}%{!?gh_short:%{specrel}}%{?dist}
+Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
Summary: Find out version and the extensions required for a piece of code to run
Group: Development/Libraries
License: BSD
URL: http://php5.laurent-laville.org/compatinfo/
-Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?gh_short:-%{gh_short}}.tar.gz
+Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz
+# Script for fedora-review
+Source1: fedora-review-check
# Autoloader for RPM - die composer !
-Patch0: %{name}-rpm.patch
+# and sqlite database path
+Patch0: %{name}-4.0.0-rpm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: php(language) >= 5.3.0
+BuildRequires: php-pdo_sqlite
+BuildRequires: php-composer(bartlett/php-reflect) >= 3.0.0
+%if %{with_tests}
# to run test suite
BuildRequires: %{_bindir}/phpunit
-BuildRequires: php-composer(bartlett/php-reflect) >= 2.6.2
+%endif
# From composer.json, "require"
-# "php": ">=5.3.0",
+# "php": ">=5.3.2",
# "ext-libxml": "*",
# "ext-pcre": "*",
# "ext-spl": "*",
# "ext-json": "*",
+# "ext-pdo_sqlite": "*",
# "symfony/console": "~2.5",
-# "bartlett/php-reflect": "^2.6.2",
+# "bartlett/php-reflect": "~3.0",
Requires: php(language) >= 5.3.0
Requires: php-json
Requires: php-libxml
Requires: php-pcre
+Requires: php-pdo_sqlite
Requires: php-spl
-Requires: php-composer(bartlett/php-reflect) >= 2.6.2
-Requires: php-composer(bartlett/php-reflect) < 3
+Requires: php-composer(bartlett/php-reflect) >= 3.0.0
+Requires: php-composer(bartlett/php-reflect) < 4
Requires: php-composer(symfony/console) >= 2.5
Requires: php-composer(symfony/console) < 3
# From composer.json, "suggest"
# "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2"
+# "bartlett/umlwriter": "Allow writing UML class diagrams (Graphviz or PlantUML)"
Requires: php-composer(doctrine/cache)
+Requires: php-composer(bartlett/umlwriter)
# Required by autoloader
-Requires: php-composer(phpunit/php-timer)
Requires: php-composer(nikic/php-parser)
+BuildRequires: php-composer(doctrine/collections)
Requires: php-composer(symfony/class-loader)
Requires: php-composer(symfony/event-dispatcher)
Requires: php-composer(symfony/finder)
+BuildRequires: php-composer(symfony/stopwatch)
+BuildRequires: php-composer(symfony/dependency-injection)
+BuildRequires: php-composer(phpdocumentor/reflection-docblock)
Requires: php-composer(seld/jsonlint)
Requires: php-composer(sebastian/version)
Requires: php-composer(justinrainbow/json-schema)
@@ -81,12 +97,17 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/
%patch0 -p1 -b .rpm
-sed -e 's/@package_version@/%{version}/' \
- -i $(find src -name \*.php)
+# Cleanup patched files
+find src -name \*rpm -delete -print
+
+# Set package version
+sed -e 's/@package_version@/%{version}%{?prever}/' \
+ -i $(find src -name \*.php) bin/phpcompatinfo
%build
-# Nothing
+: Generate the references database
+%{_bindir}/php data/handleDB.php db:init
%install
@@ -97,14 +118,20 @@ cp -pr src/Bartlett %{buildroot}%{_datadir}/php/Bartlett
install -D -p -m 755 bin/phpcompatinfo %{buildroot}%{_bindir}/phpcompatinfo
install -D -p -m 644 bin/phpcompatinfo.json.dist %{buildroot}%{_sysconfdir}/phpcompatinfo.json
install -D -p -m 644 bin/phpcompatinfo.1 %{buildroot}%{_mandir}/man1/phpcompatinfo.1
+install -D -p -m 644 data/compatinfo.sqlite %{buildroot}%{_datadir}/%{name}/compatinfo.sqlite
+install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora-review-check
+
+%if %{with_tests}
%check
%{_bindir}/phpunit \
+ --include-path src \
-d memory_limit=-1 \
-%if 0%{?rhel} < 6 && 0%{?fedora} < 8
+%if 0%{?fedora} < 21
|| exit 0
%endif
+%endif
%post
@@ -122,14 +149,48 @@ fi
%config(noreplace) %{_sysconfdir}/phpcompatinfo.json
%{_bindir}/phpcompatinfo
%{_datadir}/php/Bartlett/CompatInfo
-%{_datadir}/php/Bartlett/CompatInfo.php
%{_mandir}/man1/phpcompatinfo.1*
+%{_datadir}/%{name}
%changelog
+* Sat Apr 4 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-1
+- update to 4.0.0
+
+* Thu Mar 26 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.9.RC2
+- update to 4.0.0 RC2
+- add dependency on bartlett/umlwriter
+
+* Thu Mar 12 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.8.RC1
+- update to 4.0.0 RC1
+
+* Fri Feb 27 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.7.20150227git4966955
+- don't display xdebug message when not on a tty
+- add fedora-review-check script
+- handle --without tests option to skip test suite during build
+
+* Fri Feb 27 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.6.20150227git4966955
+- update to 4.0.0beta3
+
+* Sun Feb 22 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.5.20150220git442d25d
+- fix reported version
+
+* Sun Feb 22 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.4.20150220git442d25d
+- update to 4.0.0beta2
+
+* Wed Feb 4 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.3.20150204git6cd2777
+- update to 4.0.0beta1
+
* Mon Feb 2 2015 Remi Collet <remi@fedoraproject.org> - 3.7.3-1
- Update to 3.7.3
+* Tue Jan 20 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.2.20150116gitd900ea4
+- add patch for DB path (pr #163)
+- take care of test suite results only in f21 for now
+
+* Mon Jan 19 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.1.20150116gitd900ea4
+- 4.0.0 snapshot
+
* Mon Jan 5 2015 Remi Collet <remi@fedoraproject.org> - 3.7.2-1
- Update to 3.7.2
- open https://github.com/llaville/php-compat-info/pull/157