summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--[-rwxr-xr-x]composer.json0
-rw-r--r--phpcov.spec23
3 files changed, 25 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1ab5c4f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/composer.json b/composer.json
index 309130b..309130b 100755..100644
--- a/composer.json
+++ b/composer.json
diff --git a/phpcov.spec b/phpcov.spec
index dc112c0..0a1ecf7 100644
--- a/phpcov.spec
+++ b/phpcov.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 7deaf8868283d8f18b131093cd39211ad159b3ac
+%global gh_commit 8afb1e74ce354cc09374d81ef00a0c3d4b7eb7e9
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project phpcov
@@ -21,14 +21,14 @@
Name: %{pk_project}
-Version: 4.0.0
+Version: 4.0.1
Release: 1%{?dist}
Summary: CLI frontend for PHP_CodeCoverage
Group: Development/Libraries
License: BSD
URL: https://github.com/%{gh_owner}/%{gh_project}
-Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
+Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
# Fix autoload for RPM
Patch0: %{gh_project}-rpm.patch
@@ -46,6 +46,7 @@ BuildRequires: php-composer(sebastian/finder-facade) < 2
BuildRequires: php-composer(sebastian/finder-facade) >= 1.1
BuildRequires: php-composer(sebastian/version) < 3
BuildRequires: php-composer(sebastian/version) >= 2.0
+BuildRequires: php-composer(symfony/console) < 4
BuildRequires: php-composer(symfony/console) >= 2.8
BuildRequires: php-pecl(Xdebug)
%endif
@@ -80,7 +81,7 @@ Provides: php-phpunit-phpcov = %{version}
%else
Conflicts: php-phpunit-phpcov < 4
%endif
-Provides: php-composer(%{pk_vendoir}/%{pk_project}) = %{version}
+Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version}
%description
@@ -127,7 +128,12 @@ install -D -p -m 755 %{pk_project} %{buildroot}%{_bindir}/%{pk_project}
mkdir vendor
ln -s %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php vendor/autoload.php
-%{_bindir}/phpunit6 --verbose
+# 7.2: XDebug not yet available
+for cmd in php php70 php71; do
+ if which $cmd; then
+ $cmd %{_bindir}/phpunit6 --verbose
+ fi
+done
%else
: Test suite skipped
%endif
@@ -143,6 +149,13 @@ ln -s %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php vendor/aut
%changelog
+* Fri Apr 28 2017 Remi Collet <remi@remirepo.net> - 4.0.1-1
+- Update to 4.0.1
+
+* Mon Apr 24 2017 Remi Collet <remi@remirepo.net> - 4.0.0-2
+- fix composer provide (from review #1420384)
+- fix composer.json perm
+
* Wed Feb 8 2017 Remi Collet <remi@fedoraproject.org> - 4.0.0-1
- rename to phpcov
- update to 4.0.0