diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-06-09 09:11:15 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-06-09 09:11:15 +0200 |
| commit | 30bf0f11a28f5dff27d144d862e162bf0d7f4a4f (patch) | |
| tree | ab64a759c810b913e650504d5e0541158e2c76bd | |
| parent | af3df771350c7df0bab903e352b1ad37e68998fe (diff) | |
php-jsonlint: rawhide changes
| -rw-r--r-- | php-jsonlint.spec | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/php-jsonlint.spec b/php-jsonlint.spec index 65c3342..870809d 100644 --- a/php-jsonlint.spec +++ b/php-jsonlint.spec @@ -7,7 +7,7 @@ Name: php-%{github_name} Version: %{github_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: JSON Lint for PHP Group: Development/Libraries @@ -15,11 +15,14 @@ License: MIT URL: https://github.com/%{github_owner}/%{github_name} Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz +# Upstream +Patch0: %{github_name}-phpunit.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # For tests BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-pear(pear.phpunit.de/PHPUnit) +BuildRequires: php-phpunit-PHPUnit # For tests: phpcompatinfo BuildRequires: php-pcre @@ -27,6 +30,9 @@ Requires: php(language) >= %{php_min_ver} # phpcompatinfo Requires: php-pcre +Provides: php-composer(seld/jsonlint) = %{version} + + %description %{summary}. @@ -37,6 +43,8 @@ This library is a port of the JavaScript jsonlint %prep %setup -q -n %{github_name}-%{github_commit} +%patch0 -p1 + # Create PSR-0 autoloader for tests ( cat <<'AUTOLOAD' <?php @@ -59,7 +67,7 @@ cp -rp src/Seld/JsonLint %{buildroot}%{_datadir}/php/Seld/ %check %{_bindir}/phpunit --bootstrap=./autoload.php \ - -d include_path="./src:./tests:.:%{pear_phpdir}" . + --include-path=./src:./tests . %files @@ -70,6 +78,11 @@ cp -rp src/Seld/JsonLint %{buildroot}%{_datadir}/php/Seld/ %changelog +* Mon Jun 9 2014 Remi Collet <remi@fedoraproject.org> - 1.1.2-2 +- fix FTBFS, include path during test +- upstream patch for latest PHPUnit +- provides php-composer(seld/jsonlint) + * Sat Nov 16 2013 Remi Collet <RPMS@FamilleCollet.com> - 1.1.2-1 - backport 1.1.2 for remi repo |