diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | installed.json | 75 | ||||
| -rw-r--r-- | php-bartlett-PHP-CompatInfo.spec | 36 | 
3 files changed, 65 insertions, 48 deletions
diff --git a/composer.json b/composer.json index bbc89e5..a26feb9 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@          "bartlett/sarif-php-sdk": "^1.0",          "composer-runtime-api": "^2.1",          "doctrine/collections": "^1.4", -        "nikic/php-parser": "^4.10", +        "nikic/php-parser": "^5.0",          "psr/log": "^3.0",          "ramsey/uuid": "^3.9 || ^4.0",          "symfony/config": "^5.4 || ^6.0 || ^7.0", diff --git a/installed.json b/installed.json index 003ae08..16c743d 100644 --- a/installed.json +++ b/installed.json @@ -94,27 +94,37 @@          },          {              "name": "bartlett/sarif-php-sdk", -            "version": "1.0.1", -            "version_normalized": "1.0.1.0", +            "version": "1.1.0", +            "version_normalized": "1.1.0.0",              "source": {                  "type": "git",                  "url": "https://github.com/llaville/sarif-php-sdk.git", -                "reference": "70aa23a16b36b49a040980ba1061123b88ee0a2c" +                "reference": "69dd282c789b5a8cec5c97340fbd4eb65efa00fb"              },              "dist": {                  "type": "zip", -                "url": "https://api.github.com/repos/llaville/sarif-php-sdk/zipball/70aa23a16b36b49a040980ba1061123b88ee0a2c", -                "reference": "70aa23a16b36b49a040980ba1061123b88ee0a2c", +                "url": "https://api.github.com/repos/llaville/sarif-php-sdk/zipball/69dd282c789b5a8cec5c97340fbd4eb65efa00fb", +                "reference": "69dd282c789b5a8cec5c97340fbd4eb65efa00fb",                  "shasum": ""              },              "require": {                  "ext-json": "*",                  "ext-pcre": "*",                  "ext-spl": "*", -                "php": "^7.1|^8.0" +                "php": "^7.4 || ^8.0"              }, -            "time": "2021-12-20T11:51:30+00:00", +            "require-dev": { +                "bamarni/composer-bin-plugin": "^1.8" +            }, +            "time": "2024-01-07T07:20:44+00:00",              "type": "library", +            "extra": { +                "bamarni-bin": { +                    "bin-links": true, +                    "target-directory": "vendor-bin", +                    "forward-command": true +                } +            },              "installation-source": "dist",              "autoload": {                  "psr-4": { @@ -128,7 +138,6 @@              "authors": [                  {                      "name": "Laurent Laville", -                    "email": "pear@laurent-laville.org",                      "homepage": "https://github.com/llaville",                      "role": "Lead"                  } @@ -810,17 +819,17 @@          },          {              "name": "doctrine/inflector", -            "version": "2.0.8", -            "version_normalized": "2.0.8.0", +            "version": "2.0.9", +            "version_normalized": "2.0.9.0",              "source": {                  "type": "git",                  "url": "https://github.com/doctrine/inflector.git", -                "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff" +                "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65"              },              "dist": {                  "type": "zip", -                "url": "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff", -                "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff", +                "url": "https://api.github.com/repos/doctrine/inflector/zipball/2930cd5ef353871c821d5c43ed030d39ac8cfe65", +                "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65",                  "shasum": ""              },              "require": { @@ -834,7 +843,7 @@                  "phpunit/phpunit": "^8.5 || ^9.5",                  "vimeo/psalm": "^4.25 || ^5.4"              }, -            "time": "2023-06-16T13:40:37+00:00", +            "time": "2024-01-15T18:05:13+00:00",              "type": "library",              "installation-source": "dist",              "autoload": { @@ -884,7 +893,7 @@              ],              "support": {                  "issues": "https://github.com/doctrine/inflector/issues", -                "source": "https://github.com/doctrine/inflector/tree/2.0.8" +                "source": "https://github.com/doctrine/inflector/tree/2.0.9"              },              "funding": [                  { @@ -1058,17 +1067,17 @@          },          {              "name": "doctrine/orm", -            "version": "2.17.2", -            "version_normalized": "2.17.2.0", +            "version": "2.17.3", +            "version_normalized": "2.17.3.0",              "source": {                  "type": "git",                  "url": "https://github.com/doctrine/orm.git", -                "reference": "393679a4795e49b0b3ac317dce84d0f8888f2b77" +                "reference": "398ab0547aaf90bdb352b560a94c24f44ff00670"              },              "dist": {                  "type": "zip", -                "url": "https://api.github.com/repos/doctrine/orm/zipball/393679a4795e49b0b3ac317dce84d0f8888f2b77", -                "reference": "393679a4795e49b0b3ac317dce84d0f8888f2b77", +                "url": "https://api.github.com/repos/doctrine/orm/zipball/398ab0547aaf90bdb352b560a94c24f44ff00670", +                "reference": "398ab0547aaf90bdb352b560a94c24f44ff00670",                  "shasum": ""              },              "require": { @@ -1111,7 +1120,7 @@                  "symfony/cache": "Provides cache support for Setup Tool with doctrine/cache 2.0",                  "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"              }, -            "time": "2023-12-20T21:47:52+00:00", +            "time": "2024-01-16T21:32:04+00:00",              "bin": [                  "bin/doctrine"              ], @@ -1156,7 +1165,7 @@              ],              "support": {                  "issues": "https://github.com/doctrine/orm/issues", -                "source": "https://github.com/doctrine/orm/tree/2.17.2" +                "source": "https://github.com/doctrine/orm/tree/2.17.3"              },              "install-path": "../doctrine/orm"          }, @@ -1263,35 +1272,37 @@          },          {              "name": "nikic/php-parser", -            "version": "v4.18.0", -            "version_normalized": "4.18.0.0", +            "version": "v5.0.0", +            "version_normalized": "5.0.0.0",              "source": {                  "type": "git",                  "url": "https://github.com/nikic/PHP-Parser.git", -                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" +                "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc"              },              "dist": {                  "type": "zip", -                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", -                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", +                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4a21235f7e56e713259a6f76bf4b5ea08502b9dc", +                "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc",                  "shasum": ""              },              "require": { +                "ext-ctype": "*", +                "ext-json": "*",                  "ext-tokenizer": "*", -                "php": ">=7.0" +                "php": ">=7.4"              },              "require-dev": {                  "ircmaxell/php-yacc": "^0.0.7", -                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" +                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"              }, -            "time": "2023-12-10T21:03:43+00:00", +            "time": "2024-01-07T17:17:35+00:00",              "bin": [                  "bin/php-parse"              ],              "type": "library",              "extra": {                  "branch-alias": { -                    "dev-master": "4.9-dev" +                    "dev-master": "5.0-dev"                  }              },              "installation-source": "dist", @@ -1316,7 +1327,7 @@              ],              "support": {                  "issues": "https://github.com/nikic/PHP-Parser/issues", -                "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" +                "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.0"              },              "install-path": "../nikic/php-parser"          }, diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 72ff061..ddfeb74 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -11,13 +11,13 @@  %undefine __brp_mangle_shebangs  %{!?php_version:  %global php_version  %(php -r 'echo PHP_VERSION;' 2>/dev/null)} -%global gh_commit    26b0219fde16933f67d991fdc3974d304eec3ead +%global gh_commit    d9504f525abfbdb8fc7d7850cbd58229471526ba  %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})  #global gh_date      20151005  %global gh_owner     llaville  %global gh_project   php-compatinfo -%global upstream_version  7.1.0 +%global upstream_version  7.1.1  #global upstream_prever   RC1  Name:           php-bartlett-PHP-CompatInfo @@ -58,9 +58,9 @@ Requires:       php-xmlreader  # Bundled libraries  # License BSD-3-Clause  Provides: bundled(php-bartlett-php-compatinfo-db) = 6.1.1 -Provides: bundled(php-nikic-php-parser) = v4.18.0 +Provides: bundled(php-nikic-php-parser) = v5.0.0  # License MIT -Provides: bundled(php-bartlett-sarif-php-sdk) = 1.0.1 +Provides: bundled(php-bartlett-sarif-php-sdk) = 1.1.0  Provides: bundled(php-brick-math) = 0.11.0  Provides: bundled(php-composer-semver) = 3.4.0  Provides: bundled(php-doctrine-cache) = 2.2.0 @@ -69,10 +69,10 @@ Provides: bundled(php-doctrine-common) = 3.4.3  Provides: bundled(php-doctrine-dbal) = 3.7.2  Provides: bundled(php-doctrine-deprecations) = 1.1.2  Provides: bundled(php-doctrine-event-manager) = 2.0.0 -Provides: bundled(php-doctrine-inflector) = 2.0.8 +Provides: bundled(php-doctrine-inflector) = 2.0.9  Provides: bundled(php-doctrine-instantiator) = 2.0.0  Provides: bundled(php-doctrine-lexer) = 2.1.0 -Provides: bundled(php-doctrine-orm) = 2.17.2 +Provides: bundled(php-doctrine-orm) = 2.17.3  Provides: bundled(php-doctrine-persistence) = 3.2.0  Provides: bundled(php-psr-cache) = 3.0.0  Provides: bundled(php-psr-clock) = 1.0.0 @@ -138,9 +138,6 @@ do      [ -f vendor/$vendor/$proj/LICENSE ] && mv vendor/$vendor/$proj/LICENSE ${vendor}_${proj}_LICENSE    done  done -rm -r tests -rm -r .github -rm -r .changes  rm -r vendor/bartlett/*/.github  rm -r vendor/bartlett/*/.changes @@ -169,18 +166,20 @@ php -r '  %install -mkdir -p %{buildroot}%{_datadir} -cp -pr . %{buildroot}%{_datadir}/%{name} -rm %{buildroot}%{_datadir}/%{name}/*LICENSE +mkdir -p %{buildroot}%{_datadir}/%{name} +for i in bin config data resources src vendor composer.* +do cp -pr $i %{buildroot}%{_datadir}/%{name}/$i +done  mkdir -p %{buildroot}%{_bindir}  ln -s ../share/%{name}/bin/phpcompatinfo %{buildroot}%{_bindir}/phpcompatinfo  mkdir -p %{buildroot}%{_mandir}/man1  mv %{buildroot}%{_datadir}/%{name}/bin/phpcompatinfo.1 \ -                                         %{buildroot}%{_mandir}/man1/phpcompatinfo.1 +   %{buildroot}%{_mandir}/man1/phpcompatinfo.1 -install -D -p -m 755 %{SOURCE1}          %{buildroot}%{_datadir}/%{name}/fedora-review-check +install -D -p -m 755 %{SOURCE1} \ +   %{buildroot}%{_datadir}/%{name}/fedora-review-check  %check @@ -191,7 +190,9 @@ install -D -p -m 755 %{SOURCE1}          %{buildroot}%{_datadir}/%{name}/fedora-  # remirepo:1  %{!?_licensedir:%global license %%doc}  %license *LICENSE -%doc README.* +%doc *md +%doc docs +%doc examples  %doc composer.json  %doc vendor/composer/installed.json  %{_bindir}/phpcompatinfo @@ -200,6 +201,11 @@ install -D -p -m 755 %{SOURCE1}          %{buildroot}%{_datadir}/%{name}/fedora-  %changelog +* Thu Jan 18 2024 Remi Collet <remi@remirepo.net> - 7.1.1-1 +- update to 7.1.1 +- cleanup installation tree +- move docs and examples in package documentation +  * Tue Jan  2 2024 Remi Collet <remi@remirepo.net> - 7.1.0-1  - update to 7.1.0  | 
