Merge 65c1cac into 2a7c738

yast · Aug 21, 2018 · a5d4715 · a5d4715
2 parents 2a7c738 + 65c1cac
commit a5d4715
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/package/yast2-storage-ng.changes b/package/yast2-storage-ng.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Aug 21 11:08:45 CEST 2018 - schubi@suse.de
+
+- Changed dir of COPYING file.
+
 -------------------------------------------------------------------
 Fri Aug 17 08:47:53 UTC 2018 - ancor@suse.com
 

diff --git a/package/yast2-storage-ng.spec b/package/yast2-storage-ng.spec
@@ -77,6 +77,11 @@ rake test:unit
 %install
 rake install DESTDIR="%{buildroot}"
 
+# Remove the license from the /usr/share/doc/packages directory,
+# it is also included in the /usr/share/licenses directory by using
+# the %license tag.
+rm $RPM_BUILD_ROOT/%{yast_docdir}/COPYING
+
 %post
 %ifarch s390 s390x
 %{fillup_only -ans storage %{name}.s390}
@@ -95,7 +100,7 @@ rake install DESTDIR="%{buildroot}"
 # agents-scr
 %{yast_scrconfdir}/*.scr
 
-%doc COPYING
+%license COPYING
 %doc README.md
 %doc CONTRIBUTING.md