diff options
| -rw-r--r-- | composer.json | 4 | ||||
| -rw-r--r-- | php-bartlett-umlwriter-autoload.php | 1 | ||||
| -rw-r--r-- | php-bartlett-umlwriter-rpm.patch | 2 | ||||
| -rw-r--r-- | php-bartlett-umlwriter.spec | 29 |
4 files changed, 23 insertions, 13 deletions
diff --git a/composer.json b/composer.json index 1dcf297..fd68fd9 100644 --- a/composer.json +++ b/composer.json @@ -11,11 +11,11 @@ }, "require": { "php": "^5.4|^7.0", - "symfony/console": "^2.5|^3.0", + "symfony/console": "^2.5|^3.0|^4.0", "sebastian/version": "^1.0|^2.0" }, "require-dev": { - "bartlett/php-reflect": "^4.0", + "bartlett/php-reflect": "^4.3", "andrewsville/php-token-reflection": "^1.4" }, "suggest": { diff --git a/php-bartlett-umlwriter-autoload.php b/php-bartlett-umlwriter-autoload.php index 603a388..4119ab8 100644 --- a/php-bartlett-umlwriter-autoload.php +++ b/php-bartlett-umlwriter-autoload.php @@ -9,6 +9,7 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Dependencies::required([ '/usr/share/php/Bartlett/Reflect/autoload.php', [ + '/usr/share/php/Symfony4/Component/autoload.php', '/usr/share/php/Symfony3/Component/autoload.php', '/usr/share/php/Symfony/Component/autoload.php', ], diff --git a/php-bartlett-umlwriter-rpm.patch b/php-bartlett-umlwriter-rpm.patch index e3bac8e..a32dd8b 100644 --- a/php-bartlett-umlwriter-rpm.patch +++ b/php-bartlett-umlwriter-rpm.patch @@ -26,6 +26,6 @@ diff -up ./bin/umlwriter.rpm ./bin/umlwriter + use Bartlett\UmlWriter\Console\Application; --$application = new Application($appName, '1.2'); +-$application = new Application($appName, '1.3'); +$application = new Application($appName, '@package_version@'); $application->run(); diff --git a/php-bartlett-umlwriter.spec b/php-bartlett-umlwriter.spec index 23d192d..44c86d9 100644 --- a/php-bartlett-umlwriter.spec +++ b/php-bartlett-umlwriter.spec @@ -6,8 +6,12 @@ # # Please, preserve the changelog entries # + +# For compatibility with SCL +%undefine __brp_mangle_shebangs + %global bootstrap 0 -%global gh_commit 7f0e8ac9bd38a075fad7bf4001eddfd2505e4afc +%global gh_commit 52248a8990522e88c91a2b7446406dbb43b3903e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20150331 %global gh_owner llaville @@ -20,7 +24,7 @@ %endif Name: php-bartlett-umlwriter -Version: 1.2.1 +Version: 1.3.0 %global specrel 1 Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Create UML class diagrams from your PHP source @@ -41,9 +45,9 @@ BuildRequires: php(language) >= 5.4.0 BuildRequires: %{_bindir}/phpunit # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(symfony/console) >= 2.5 with php-composer(symfony/console) < 4) +BuildRequires: (php-composer(symfony/console) >= 2.5 with php-composer(symfony/console) < 5) BuildRequires: (php-composer(sebastian/version) >= 1.0 with php-composer(sebastian/version) < 3) -BuildRequires: (php-composer(bartlett/php-reflect) >= 4.0 with php-composer(bartlett/php-reflect) < 5) +BuildRequires: (php-composer(bartlett/php-reflect) >= 4.3 with php-composer(bartlett/php-reflect) < 5) BuildRequires: (php-composer(andrewsville/php-token-reflection) >= 1.4 with php-composer(andrewsville/php-token-reflection) < 2) # remirepo:6 %else @@ -59,14 +63,14 @@ BuildRequires: php-composer(fedora/autoloader) # From composer.json # "require": { # "php": "^5.4|^7.0" -# "symfony/console": "^2.5|^3.0", +# "symfony/console": "^2.5|^3.0|^4.0", # "sebastian/version": "^1.0|^2.0" Requires: php(language) >= 5.4.0 Requires: php-cli Requires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(symfony/console) >= 2.5 with php-composer(symfony/console) < 4) +Requires: (php-composer(symfony/console) >= 2.5 with php-composer(symfony/console) < 5) Requires: (php-composer(sebastian/version) >= 1.0 with php-composer(sebastian/version) < 3) # remirepo:4 %else @@ -74,7 +78,7 @@ Requires: php-symfony-console >= 2.5 Requires: php-phpunit-Version >= 1.0 %endif # "require-dev": { -# "bartlett/php-reflect": "^4.0", +# "bartlett/php-reflect": "^4.3", # "andrewsville/php-token-reflection": "^1.4" # "suggest": { # "bartlett/php-reflect": "Reverse-engine, default solution", @@ -82,11 +86,11 @@ Requires: php-phpunit-Version >= 1.0 %if ! %{bootstrap} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(bartlett/php-reflect) >= 4.0 with php-composer(bartlett/php-reflect) < 5) +Requires: (php-composer(bartlett/php-reflect) >= 4.3 with php-composer(bartlett/php-reflect) < 5) Requires: (php-composer(andrewsville/php-token-reflection) >= 1.4 with php-composer(andrewsville/php-token-reflection) < 2) # remirepo:4 %else -Requires: php-bartlett-PHP-Reflect >= 4.0 +Requires: php-bartlett-PHP-Reflect >= 4.3 Requires: php-andrewsville-php-token-reflection >= 1.4 %endif %endif @@ -134,7 +138,7 @@ install -Dpm 644 bin/umlwriter.1 %{buildroot}%{_mandir}/man1/umlwriter.1 %check %if %{with_tests} ret=0 -for cmd in php php70 php71 php72; do +for cmd in php php70 php71 php72 php73; do if which $cmd; then $cmd %{_bindir}/phpunit --bootstrap %{buildroot}%{_datadir}/php/Bartlett/UmlWriter/autoload.php || ret=1 fi @@ -156,6 +160,11 @@ exit $ret %changelog +* Tue Nov 27 2018 Remi Collet <remi@remirepo.net> - 1.3.0-1 +- update to 1.3.0 +- raise dependency on bartlett/php-reflect 4.3 +- allow Symfony 4 + * Tue Mar 20 2018 Remi Collet <remi@remirepo.net> - 1.2.1-1 - update to 1.2.1 (no change) - use range dependencies on F27+ |