summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-04-15 10:31:42 +0200
committerRemi Collet <remi@remirepo.net>2019-04-15 10:31:42 +0200
commitd7fa062ad0a2b29325ec0d407c9e47bddfb5d72b (patch)
treea2df12496e94efdd5550df914d4a546e3a966911
parent99c3a010408b9630c4846664be9d056e175fb786 (diff)
update to 5.0.0-beta1HEADmaster
-rw-r--r--php-bartlett-PHP-Reflect-rpm.patch2
-rw-r--r--php-bartlett-PHP-Reflect.spec16
2 files changed, 11 insertions, 7 deletions
diff --git a/php-bartlett-PHP-Reflect-rpm.patch b/php-bartlett-PHP-Reflect-rpm.patch
index fd17d4c..21a316f 100644
--- a/php-bartlett-PHP-Reflect-rpm.patch
+++ b/php-bartlett-PHP-Reflect-rpm.patch
@@ -71,7 +71,7 @@ diff -up ./src/Reflect/Presentation/Console/Application.php.rpm ./src/Reflect/Pr
- $version = 'UNKNOWN';
- }
- parent::__construct($name, $version);
-+ parent::__construct($name, @VERSION@);
++ parent::__construct($name, "@VERSION@");
$this->baseDir = dirname(dirname(dirname(dirname(__DIR__))));
}
diff --git a/php-bartlett-PHP-Reflect.spec b/php-bartlett-PHP-Reflect.spec
index b1e4b29..9abbf1f 100644
--- a/php-bartlett-PHP-Reflect.spec
+++ b/php-bartlett-PHP-Reflect.spec
@@ -7,13 +7,13 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 983763e11d1898965e2b8ccf4b163182a2c713b2
+%global gh_commit 54eef325e8d1c7d7384573d6a6dc2b28ea1b44f0
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20150331
%global gh_owner llaville
%global gh_project php-reflect
%global upstream_version 5.0.0
-%global upstream_prever alpha3
+%global upstream_prever beta1
%if %{bootstrap}
%global with_tests 0%{?_with_tests:1}
%else
@@ -205,9 +205,6 @@ sed -e 's/@VERSION@/%{upstream_version}%{?upstream_prever}/' \
cp %{SOURCE1} src/Reflect/autoload.php
-mv src/Reflect/Appplication src/Reflect/Application
-sed -e 's/Appplication/Application/' -i src/Reflect/Application/Command/Analyser*php
-
%build
# Nothing
@@ -226,12 +223,16 @@ install -D -p -m 644 bin/phpreflect.1 %{buildroot}%{_mandir}/man1/phpref
%if %{with_tests}
sed -e 's:@BUILDROOT@:%{buildroot}:' -i tests/bootstrap.php
+if [ -f /etc/phpreflect.json ]; then
+ : skip as getJsonConfigFilename
+ rm tests/EnvironmentTest.php
+fi
+
ret=0
for cmdarg in "php %{phpunit}" php71 php72 php73; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit7} \
- --include-path=%{buildroot}%{_datadir}/php \
--verbose || ret=1
fi
done
@@ -259,6 +260,9 @@ fi
%changelog
+* Mon Apr 15 2019 Remi Collet <remi@remirepo.net> - 5.0.0~beta1-1
+- update to 5.0.0-beta1
+
* Tue Apr 9 2019 Remi Collet <remi@remirepo.net> - 5.0.0~alpha3-1
- update to 5.0.0-alpha3
- add dependency on league/tactician