diff --git a/cni-plugins.changes b/cni-plugins.changes index 56f5439..4d54c67 100644 --- a/cni-plugins.changes +++ b/cni-plugins.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 4 13:40:36 UTC 2018 - dcassany@suse.com + +- Make use of %license macro + ------------------------------------------------------------------- Tue Dec 19 13:08:33 UTC 2017 - alvaro.saurin@suse.com diff --git a/cni-plugins.spec b/cni-plugins.spec index fb1acca..56ba9d5 100644 --- a/cni-plugins.spec +++ b/cni-plugins.spec @@ -1,7 +1,7 @@ # # spec file for package cni-plugins # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define cni_bin_dir %{_libexecdir}/cni %define cni_doc_dir %{_docdir}/cni-plugins @@ -63,12 +64,10 @@ cp bin/* "%{buildroot}%{cni_bin_dir}/" # documentation install -m 755 -d "%{buildroot}%{cni_doc_dir}" -cp CONTRIBUTING.md README.md LICENSE %{buildroot}%{cni_doc_dir}/ -install -m 755 -d "%{buildroot}%{cni_doc_dir}" # TODO: copy the READMEs #for i in plugins/main/*/README.md ; do -# cp Documentation/* %{buildroot}%{cni_doc_dir}/plugins/ +# cp Documentation/* %{buildroot}%{cni_doc_dir}/plugins/ #done %post @@ -76,13 +75,16 @@ install -m 755 -d "%{buildroot}%{cni_doc_dir}" %files %defattr(-,root,root) -%doc %{cni_doc_dir}/CONTRIBUTING.md -%doc %{cni_doc_dir}/README.md -%doc %{cni_doc_dir}/LICENSE -%dir %{cni_bin_dir} %dir %{cni_doc_dir} +%doc CONTRIBUTING.md +%doc README.md +%if 0%{?suse_version} < 1500 +%doc LICENSE +%else +%license LICENSE +%endif +%dir %{cni_bin_dir} %{cni_bin_dir}/* # %{cni_doc_dir}/plugins/* - %changelog