diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-phpunit-php-code-coverage6.spec | 28 |
2 files changed, 8 insertions, 22 deletions
diff --git a/composer.json b/composer.json index cf24606..6fad054 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ }, "extra": { "branch-alias": { - "dev-master": "6.0-dev" + "dev-master": "6.1-dev" } } } diff --git a/php-phpunit-php-code-coverage6.spec b/php-phpunit-php-code-coverage6.spec index 80e1205..1655886 100644 --- a/php-phpunit-php-code-coverage6.spec +++ b/php-phpunit-php-code-coverage6.spec @@ -9,7 +9,7 @@ %global bootstrap 0 # Github -%global gh_commit 848f78b3309780fef7ec8c4666b7ab4e6b09b22f +%global gh_commit 0685fb6a43aed1b2e09804d1aaf17144c82861f8 #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -22,8 +22,8 @@ %global ns_project CodeCoverage %global php_home %{_datadir}/php %global ver_major 6 -%global ver_minor 0 -%global ver_patch 8 +%global ver_minor 1 +%global ver_patch 0 %global specrel 1 %if %{bootstrap} %global with_tests 0%{?_with_tests:1} @@ -44,9 +44,6 @@ License: BSD and MIT and ASL 2.0 URL: https://github.com/%{gh_vendor}/%{gh_project} Source0: https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz -# RPM specific changes: use system .ttf file -Patch0: %{name}-fonts.patch - BuildArch: noarch BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with_tests} @@ -131,15 +128,6 @@ Provides: bundled(js-html5shiv) = 3.7.3 Provides: bundled(js-jquery) = 3.1.1 Provides: bundled(js-nvd3) = 1.8.1 Provides: bundled(js-respond) = 1.1.2 -# remirepo:1 -%if 0%{?fedora} >= 19 -%global with_glyphicons 1 -Requires: glyphicons-halflings-fonts -# remirepo:4 -%else -%global with_glyphicons 0 -Provides: bundled(glyphicons-halflings-fonts) = unknown -%endif %description @@ -152,12 +140,6 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%if %{with_glyphicons} -%patch0 -p0 -b .rpm -find src -name \*.rpm -delete -print -rm src/Report/Html/Renderer/Template/fonts/glyphicons-halflings-regular.ttf -%endif - %build %{_bindir}/phpab \ @@ -221,6 +203,10 @@ exit $ret %changelog +* Tue Oct 16 2018 Remi Collet <remi@remirepo.net> - 6.1.0-1 +- update to 6.1.0 +- drop dependency on glyphicons-halflings-fonts + * Thu Oct 4 2018 Remi Collet <remi@remirepo.net> - 6.0.8-1 - update to 6.0.8 |