summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore8
-rw-r--r--php-composer-semver.spec47
2 files changed, 24 insertions, 31 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fc9aa8c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/php-composer-semver.spec b/php-composer-semver.spec
index a713e5a..61499aa 100644
--- a/php-composer-semver.spec
+++ b/php-composer-semver.spec
@@ -1,12 +1,12 @@
# remirepo/fedora spec file for php-composer-semver
#
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2019 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
-%global gh_commit c7cb9a2095a074d131b65a8a0cd294479d785573
+%global gh_commit 46d9139568ccb8d9e7cdd4539cab7347568a5e2e
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20150717
%global gh_owner composer
@@ -15,11 +15,10 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-composer-semver
-Version: 1.4.2
-Release: 2%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
+Version: 1.5.0
+Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
Summary: Semver library that offers utilities, version constraint parsing and validation
-Group: Development/Libraries
License: MIT
URL: https://github.com/%{gh_owner}/%{gh_project}
# git snapshot to get upstream test suite
@@ -27,12 +26,10 @@ Source0: %{name}-%{version}-%{gh_short}.tgz
Source1: makesrc.sh
Source2: %{name}-autoload.php
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
%if %{with_tests}
# For tests
BuildRequires: php(language) >= 5.3.2
-BuildRequires: php-json
BuildRequires: php-pcre
BuildRequires: php-spl
# From composer.json, "require-dev": {
@@ -47,7 +44,7 @@ BuildRequires: php-composer(fedora/autoloader)
# From composer.json, "require": {
# "php": "^5.3.2 || ^7.0",
Requires: php(language) >= 5.3.2
-# From phpcompatinfo report for version 1.0.0 (SpdxLicenses.php only)
+# From phpcompatinfo report for version 1.5.0
Requires: php-pcre
Requires: php-spl
# Autoloader
@@ -78,8 +75,6 @@ cp %{SOURCE2} src/autoload.php
%install
-rm -rf %{buildroot}
-
: Library
mkdir -p %{buildroot}%{php_home}/Composer/
cp -pr src %{buildroot}%{php_home}/Composer/Semver
@@ -87,35 +82,22 @@ cp -pr src %{buildroot}%{php_home}/Composer/Semver
%check
%if %{with_tests}
-# remirepo:11
-run=0
ret=0
-if which php56; then
- php56 %{_bindir}/phpunit --bootstrap %{buildroot}%{php_home}/Composer/Semver/autoload.php
- run=1
-fi
-if which php71; then
- php71 %{_bindir}/phpunit --bootstrap %{buildroot}%{php_home}/Composer/Semver/autoload.php
- run=1
-fi
-if [ $run -eq 0 ]; then
-%{_bindir}/phpunit \
- --bootstrap %{buildroot}%{php_home}/Composer/Semver/autoload.php \
- --verbose
-# remirepo:2
-fi
+for cmd in php php70 php71 php72 php73; do
+ if which $cmd; then
+ $cmd %{_bindir}/phpunit \
+ --bootstrap %{buildroot}%{php_home}/Composer/Semver/autoload.php \
+ --verbose || ret=1
+ fi
+done
+
exit $ret
%else
: Test suite disabled
%endif
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc composer.json
@@ -125,6 +107,9 @@ rm -rf %{buildroot}
%changelog
+* Wed Mar 20 2019 Remi Collet <remi@remirepo.net> - 1.5.0-1
+- update to 1.5.0
+
* Thu Oct 20 2016 Remi Collet <remi@fedoraproject.org> - 1.4.2-2
- switch from symfony/class-loader to fedora/autoloader