[php-jsonlint] Updated to 1.2.0 (BZ #1124228)
Shawn Iwinski
siwinski at fedoraproject.org
Wed Aug 20 16:37:54 UTC 2014
commit 2e7c2d723a6844f87e72f4dfb82816d89eb1d9b8
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date: Wed Aug 20 12:37:36 2014 -0400
Updated to 1.2.0 (BZ #1124228)
- Added option to build without tests ("--without tests")
- Added bin
.gitignore | 1 +
jsonlint-phpunit.patch | 40 ---------
php-jsonlint-bin-without-composer-autoloader.patch | 35 ++++++++
php-jsonlint.spec | 88 ++++++++++++++------
sources | 1 +
5 files changed, 98 insertions(+), 67 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f15ade3..fd7c394 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/1.1.0.tar.gz
/php-jsonlint-1.1.1-2b5b57008ec93148fa46110d42c7a201a6677fe0.tar.gz
/php-jsonlint-1.1.2-7cd4c4965e17e6e4c07f26d566619a4c76f8c672.tar.gz
+/php-jsonlint-1.2.0-9cae56dbe34f4392e7d0f559474df33749a39f8d.tar.gz
diff --git a/php-jsonlint-bin-without-composer-autoloader.patch b/php-jsonlint-bin-without-composer-autoloader.patch
new file mode 100644
index 0000000..fdad739
--- /dev/null
+++ b/php-jsonlint-bin-without-composer-autoloader.patch
@@ -0,0 +1,35 @@
+diff --git a/bin/jsonlint b/bin/jsonlint
+index 1b9272a..c15cfa6 100755
+--- a/bin/jsonlint
++++ b/bin/jsonlint
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+
+ /*
+@@ -10,20 +10,10 @@
+ * file that was distributed with this source code.
+ */
+
+-function includeIfExists($file)
+-{
+- if (file_exists($file)) {
+- return include $file;
+- }
+-}
+-
+-if ((!$loader = includeIfExists(__DIR__.'/../vendor/autoload.php')) && (!$loader = includeIfExists(__DIR__.'/../../../autoload.php'))) {
+- $msg = 'You must set up the project dependencies, run the following commands:'.PHP_EOL.
+- 'curl -sS https://getcomposer.org/installer | php'.PHP_EOL.
+- 'php composer.phar install'.PHP_EOL;
+- fwrite(STDERR, $msg);
+- exit(1);
+-}
++spl_autoload_register(function ($class) {
++ $src = str_replace('\\', '/', $class).'.php';
++ @include_once $src;
++});
+
+ use Seld\JsonLint\JsonParser;
+
diff --git a/php-jsonlint.spec b/php-jsonlint.spec
index 824b75d..bafee47 100644
--- a/php-jsonlint.spec
+++ b/php-jsonlint.spec
@@ -1,13 +1,29 @@
+#
+# RPM spec file for php-jsonlint
+#
+# Copyright (c) 2013-2014 Shawn Iwinski <shawn.iwinski at gmail.com>
+# Remi Collet <remi at fedoraproject.org>
+#
+# License: MIT
+# http://opensource.org/licenses/MIT
+#
+# Please preserve changelog entries
+#
+
%global github_owner Seldaek
%global github_name jsonlint
-%global github_version 1.1.2
-%global github_commit 7cd4c4965e17e6e4c07f26d566619a4c76f8c672
+%global github_version 1.2.0
+%global github_commit 9cae56dbe34f4392e7d0f559474df33749a39f8d
+# "php": ">=5.3.0"
%global php_min_ver 5.3.0
+# Build using "--without tests" to disable tests
+%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
+
Name: php-%{github_name}
Version: %{github_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: JSON Lint for PHP
Group: Development/Libraries
@@ -15,18 +31,20 @@ 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
+# Bin usage without Composer autoloader
+Patch0: %{name}-bin-without-composer-autoloader.patch
BuildArch: noarch
-# For tests
+%if %{with_tests}
+# For tests: composer.json
BuildRequires: php(language) >= %{php_min_ver}
BuildRequires: php-phpunit-PHPUnit
-# For tests: phpcompatinfo
+# For tests: phpcompatinfo (computed from version 1.2.0)
BuildRequires: php-pcre
+%endif
Requires: php(language) >= %{php_min_ver}
-# phpcompatinfo
+# phpcompatinfo (computed from version 1.2.0)
Requires: php-pcre
Provides: php-composer(seld/jsonlint) = %{version}
@@ -44,39 +62,55 @@ This library is a port of the JavaScript jsonlint
%patch0 -p1
-# Create PSR-0 autoloader for tests
-( cat <<'AUTOLOAD'
-<?php
-spl_autoload_register(function ($class) {
- $src = str_replace('\\', '/', $class).'.php';
- require_once $src;
-});
-AUTOLOAD
-) > autoload.php
-
%build
# Empty build section, nothing to build
%install
-mkdir -p -m 755 %{buildroot}%{_datadir}/php/Seld
+# Lib
+mkdir -p %{buildroot}%{_datadir}/php/Seld
cp -rp src/Seld/JsonLint %{buildroot}%{_datadir}/php/Seld/
+# Bin
+mkdir -p %{buildroot}%{_bindir}
+install -pm 0755 bin/jsonlint %{buildroot}%{_bindir}/
+
%check
-%{_bindir}/phpunit --bootstrap=./autoload.php \
- --include-path=./src:./tests .
+%if %{with_tests}
+# Create autoloader
+cat > autoload.php <<'AUTOLOAD'
+<?php
+spl_autoload_register(function ($class) {
+ $src = str_replace('\\', '/', $class).'.php';
+ @include_once $src;
+});
+AUTOLOAD
+
+# Create PHPUnit config w/ colors turned off
+sed 's/colors\s*=\s*"true"/colors="false"/' phpunit.xml.dist > phpunit.xml
+
+%{_bindir}/phpunit --bootstrap=./autoload.php --include-path=./src:./tests .
+%else
+: Tests skipped
+%endif
%files
%doc LICENSE *.mdown composer.json
%dir %{_datadir}/php/Seld
%{_datadir}/php/Seld/JsonLint
+%{_bindir}/jsonlint
%changelog
-* Mon Jun 9 2014 Remi Collet <remi at fedoraproject.org> - 1.1.2-2
+* Wed Aug 20 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.2.0-1
+- Updated to 1.2.0 (BZ #1124228)
+- Added option to build without tests ("--without tests")
+- Added bin
+
+* Mon Jun 09 2014 Remi Collet <remi at fedoraproject.org> - 1.1.2-2
- fix FTBFS, include path during test
- upstream patch for latest PHPUnit
- provides php-composer(seld/jsonlint)
@@ -84,16 +118,16 @@ cp -rp src/Seld/JsonLint %{buildroot}%{_datadir}/php/Seld/
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-* Fri Nov 15 2013 Shawn Iwinski <shawn.iwinski at gmail.com> 1.1.2-1
-- Updated to upstream version 1.1.2
+* Fri Nov 15 2013 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.1.2-1
+- Updated to upstream version 1.1.2 (BZ #1026717)
- php-common => php(language)
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-* Tue Feb 12 2013 Shawn Iwinski <shawn.iwinski at gmail.com> 1.1.1-1
-- Updated to upstream version 1.1.1
+* Tue Feb 12 2013 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.1.1-1
+- Updated to upstream version 1.1.1 (BZ #910280)
- Updates per new Fedora packaging guidelines for Git repos
-* Mon Jan 07 2013 Shawn Iwinski <shawn.iwinski at gmail.com> 1.1.0-1
+* Mon Jan 07 2013 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.1.0-1
- Initial package
diff --git a/sources b/sources
index 4327971..a70bf00 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
289af78b879b8bb138c17a615c5fc0bf 1.1.0.tar.gz
9fa04f4aa8b8abe168baec157eab7c7d php-jsonlint-1.1.1-2b5b57008ec93148fa46110d42c7a201a6677fe0.tar.gz
314e59b61549d1dcc3cb0df33f1a8fbd php-jsonlint-1.1.2-7cd4c4965e17e6e4c07f26d566619a4c76f8c672.tar.gz
+63cce53af438776a34080106f16e45dc php-jsonlint-1.2.0-9cae56dbe34f4392e7d0f559474df33749a39f8d.tar.gz
More information about the scm-commits
mailing list