Compare commits

..

1 commit

Author SHA1 Message Date
Remi Collet
b7d76a0c7f v5.2.8
(cherry picked from commit c6b358f378)
2019-01-15 08:37:45 +01:00
5 changed files with 36 additions and 107 deletions

7
.gitignore vendored
View file

@ -9,10 +9,3 @@ clog
/php-justinrainbow-json-schema5-5.2.6-d283e11.tgz
/php-justinrainbow-json-schema5-5.2.7-8560d43.tgz
/php-justinrainbow-json-schema5-5.2.8-dcb6e10.tgz
/php-justinrainbow-json-schema5-5.2.9-44c6787.tgz
/php-justinrainbow-json-schema5-5.2.10-2ba9c8c.tgz
/php-justinrainbow-json-schema5-5.2.11-2ab6744.tgz
/php-justinrainbow-json-schema5-5.2.12-ad87d5a.tgz
/php-justinrainbow-json-schema5-5.2.13-fbbe7e5.tgz
/php-justinrainbow-json-schema5-5.3.0-feb2ca6.tgz
/php-justinrainbow-json-schema5-5.3.1-b5a44b6.tgz

View file

@ -3,7 +3,9 @@
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)
MAJOR=$(sed -n '/^%global major/{s/.* //;p}' $NAME.spec)
MINOR=$(sed -n '/^%global minor/{s/.* //;p}' $NAME.spec)
VERSION=$MAJOR.$MINOR
COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec)
SHORT=${COMMIT:0:7}

View file

@ -1,6 +1,6 @@
diff -up ./bin/validate-json.rpm ./bin/validate-json
--- ./bin/validate-json.rpm 2019-09-26 09:03:49.371018279 +0200
+++ ./bin/validate-json 2019-09-26 09:06:21.033483985 +0200
--- ./bin/validate-json.rpm 2019-01-15 07:24:47.000000000 +0100
+++ ./bin/validate-json 2019-01-15 07:25:27.730125985 +0100
@@ -6,32 +6,7 @@
* @author Christian Weiske <christian.weiske@netresearch.de>
*/
@ -12,7 +12,7 @@ diff -up ./bin/validate-json.rpm ./bin/validate-json
- *
- * @return void
- */
-spl_autoload_register(function ($className)
-function __autoload($className)
-{
- $className = ltrim($className, '\\');
- $fileName = '';
@ -25,7 +25,7 @@ diff -up ./bin/validate-json.rpm ./bin/validate-json
- if (stream_resolve_include_path($fileName)) {
- require_once $fileName;
- }
-});
-}
-
-// support running this tool from git checkout
-if (is_dir(__DIR__ . '/../src/JsonSchema')) {
@ -36,8 +36,8 @@ diff -up ./bin/validate-json.rpm ./bin/validate-json
$arOptions = array();
$arArgs = array();
diff -up ./src/JsonSchema/Uri/UriRetriever.php.rpm ./src/JsonSchema/Uri/UriRetriever.php
--- ./src/JsonSchema/Uri/UriRetriever.php.rpm 2019-09-26 09:03:13.000000000 +0200
+++ ./src/JsonSchema/Uri/UriRetriever.php 2019-09-26 09:03:49.371018279 +0200
--- ./src/JsonSchema/Uri/UriRetriever.php.rpm 2019-01-15 07:24:47.000000000 +0100
+++ ./src/JsonSchema/Uri/UriRetriever.php 2019-01-15 07:25:27.731125991 +0100
@@ -342,7 +342,8 @@ class UriRetriever implements BaseUriRet
}
@ -49,8 +49,8 @@ diff -up ./src/JsonSchema/Uri/UriRetriever.php.rpm ./src/JsonSchema/Uri/UriRetri
return $uri;
}
diff -up ./tests/Uri/UriRetrieverTest.php.rpm ./tests/Uri/UriRetrieverTest.php
--- ./tests/Uri/UriRetrieverTest.php.rpm 2019-09-26 09:03:13.000000000 +0200
+++ ./tests/Uri/UriRetrieverTest.php 2019-09-26 09:03:49.372018275 +0200
--- ./tests/Uri/UriRetrieverTest.php.rpm 2019-01-15 07:24:47.000000000 +0100
+++ ./tests/Uri/UriRetrieverTest.php 2019-01-15 07:26:27.403439007 +0100
@@ -296,7 +296,8 @@ EOF;
public function testPackageURITranslation()
{

View file

@ -1,25 +1,19 @@
# remirepo/fedora spec file for php-justinrainbow-json-schema5
#
# SPDX-FileCopyrightText: Copyright 2016-2025 Remi Collet
# SPDX-License-Identifier: CECILL-2.1
# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
# Copyright (c) 2016-2019 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
%if 0%{?fedora} >= 39 || 0%{?rhel} >= 10
# disable test suite until recent phpunit is supported
%bcond_with tests
%else
%bcond_without tests
%endif
%global gh_commit b5a44b6391a3bbb75c9f2b73e1ef03d6045e1e20
%global gh_commit dcb6e1006bb5fd1e392b4daa68932880f37550d4
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner justinrainbow
%global gh_project json-schema
%global php_home %{_datadir}/php
%global with_tests 0%{!?_without_tests:1}
%global major 5
%global minor 2.8
# Some sample files, only used for tests
@ -34,7 +28,7 @@
%global eolv2 0
Name: php-%{gh_owner}-%{gh_project}%{major}
Version: 5.3.1
Version: %{major}.%{minor}
Release: 1%{?dist}
Summary: A library to validate a json schema
License: MIT
@ -50,14 +44,18 @@ Source3: %{name}-makesrc.sh
Patch0: %{name}-rpm.patch
BuildArch: noarch
%if %{with tests}
%if %{with_tests}
# For tests
BuildRequires: php(language) >= 7.1
BuildRequires: php(language) >= 5.3.3
BuildRequires: php-curl
BuildRequires: php-date
BuildRequires: php-filter
BuildRequires: php-json
BuildRequires: php-mbstring
BuildRequires: php-pcre
BuildRequires: php-spl
# From composer.json, "require-dev": {
# "json-schema/json-schema-test-suite": "1.2.0",
# "json-schema/JSON-Schema-Test-Suite": "1.2.0",
# "friendsofphp/php-cs-fixer": "^2.1",
# "phpunit/phpunit": "^4.8.35"
BuildRequires: php-composer(phpunit/phpunit) >= 4.8.35
@ -68,12 +66,16 @@ BuildRequires: composer
%endif
# From composer.json, "require": {
# "php": ">=7.1"
Requires: php(language) >= 7.1
# "php": ">=5.3.3"
Requires: php(language) >= 5.3.3
# From phpcompatinfo report for version 4.0.1
Requires: php-curl
Requires: php-date
Requires: php-filter
Requires: php-json
Requires: php-mbstring
Requires: php-pcre
Requires: php-spl
# Autoloader
Requires: php-composer(fedora/autoloader)
%if %{eolv1}
@ -100,7 +102,7 @@ Autoloader: %{php_home}/JsonSchema%{major}/autoload.php
%prep
%setup -q -n %{gh_project}-%{gh_commit} -a 1
%patch -P0 -p1 -b .rpm
%patch0 -p1 -b .rpm
find src -name \*.rpm -delete -print
cp %{SOURCE2} src/JsonSchema/autoload.php
@ -136,7 +138,7 @@ install -Dpm 0755 bin/validate-json %{buildroot}%{_bindir}/validate-json%{major}
%check
%if %{with tests}
%if %{with_tests}
: Test suite autoloader
cat << 'EOF' | tee vendor/autoload.php
<?php
@ -155,7 +157,7 @@ php bin/validate-json-test \
: Upstream test suite
ret=0
for cmd in php php81 php82 php83 php84 php85; do
for cmd in php php70 php71 php72 php73; do
if which $cmd; then
$cmd -d memory_limit=1G %{_bindir}/phpunit -d memory_limit=1G --verbose || ret=1
fi
@ -167,6 +169,7 @@ exit $ret
%files
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc composer.json
%doc *.md
@ -176,78 +179,9 @@ exit $ret
%changelog
* Fri Dec 12 2025 Remi Collet <remi@remirepo.net> - 5.3.1-1
- update to 5.3.1
- re-license spec file to CECILL-2.1
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Jul 8 2024 Remi Collet <remi@remirepo.net> - 5.3.0-1
- update to 5.3.0
- raise dependency on PHP 7.1
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.13-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.13-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Sep 28 2023 Remi Collet <remi@remirepo.net> - 5.2.13-1
- update to 5.2.13
- disable test suite
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.12-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Apr 13 2022 Remi Collet <remi@remirepo.net> - 5.2.12-1
- update to 5.2.12
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Remi Collet <remi@remirepo.net> - 5.2.11-1
- update to 5.2.11
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu May 28 2020 Remi Collet <remi@remirepo.net> - 5.2.10-1
- update to 5.2.10
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Sep 26 2019 Remi Collet <remi@remirepo.net> - 5.2.9-1
- update to 5.2.9
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jan 15 2019 Remi Collet <remi@remirepo.net> - 5.2.8-1
- update to 5.2.8
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 15 2018 Remi Collet <remi@remirepo.net> - 5.2.7-1
- Update to 5.2.7

View file

@ -1,2 +1,2 @@
SHA512 (JSON-Schema-Test-Suite-1.2.0-f3d5aeb.tar.gz) = 6b917a0a0b02d5b2be6457403fba0ae4d3789634da911ebbdc56986b99ae285ed8a7bc696abc668f2a95b55e33d7bfbf8709162fc0995d76ab2f0d05494a2d02
SHA512 (php-justinrainbow-json-schema5-5.3.1-b5a44b6.tgz) = bf183d685d7410c09da2c24d6aeac86fe6f804bd79f15bc573d9e52f7437817437e975d34ce79e56f824fa6d9deb57cc7df531977e745a66c0a0c54eafeacb8c
SHA512 (php-justinrainbow-json-schema5-5.2.8-dcb6e10.tgz) = c875486dfe9c1e244e84a1edeb86280e0a1e626fa77eee26cca2524928b0d1e8883dba5dcee69b1a4013d6b07eefb91c8314631f46e76ddd6297c4d7eaa941d8