summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-04-04 06:30:05 +0200
committerRemi Collet <remi@remirepo.net>2017-04-04 06:30:05 +0200
commit74aaf9daa01e4f0bf24bc6b73ac250e255574e09 (patch)
treea9954934e040f1e5efe7f129b94f7773246d0074
parentef6197c3058d48054373149eec688f049ce5d1bf (diff)
v1.1.6
-rw-r--r--.gitignore7
-rw-r--r--php-composer-spdx-licenses.spec20
2 files changed, 16 insertions, 11 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/php-composer-spdx-licenses.spec b/php-composer-spdx-licenses.spec
index 6947a44..8d54696 100644
--- a/php-composer-spdx-licenses.spec
+++ b/php-composer-spdx-licenses.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 96c6a07b05b716e89a44529d060bc7f5c263cb13
+%global gh_commit 2603a0d7ddc00a015deb576fa5297ca43dee6b1c
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20150717
%global gh_owner composer
@@ -15,8 +15,8 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-composer-spdx-licenses
-Version: 1.1.5
-Release: 2%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
+Version: 1.1.6
+Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
Summary: SPDX licenses list and validation library
Group: Development/Libraries
@@ -30,7 +30,6 @@ Source2: %{name}-autoload.php
# Resources path
Patch0: %{name}-rpm.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
%if %{with_tests}
# For tests
@@ -79,8 +78,6 @@ cp %{SOURCE2} src/autoload.php
%install
-rm -rf %{buildroot}
-
: Library
pushd src
for fic in *
@@ -97,6 +94,9 @@ cp -pr res %{buildroot}%{_datadir}/%{name}
%check
%if %{with_tests}
+# ignored as related class not installed
+rm tests/SpdxLicensesUpdaterTest.php
+
export BUILDROOT_SPDX=%{buildroot}
# remirepo:15
@@ -126,12 +126,7 @@ exit $ret
%endif
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc composer.json
@@ -142,6 +137,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Apr 4 2017 Remi Collet <remi@remirepo.net> - 1.1.6-1
+- Update to 1.1.6
+
* Thu Oct 20 2016 Remi Collet <remi@fedoraproject.org> - 1.1.5-2
- switch from symfony/class-loader to fedora/autoloader