handle %%license and %%doc properly

libyui.spec

@@ -80,11 +80,11 @@ brief examples how to build a UI using %{name}.
 %build
 %{__mkdir} -p %{_cmake_build_subdir}
 pushd %{_cmake_build_subdir}
-%cmake							\
-	-DYPREFIX=%{_prefix}				\
-	-DLIB_DIR=%{_libdir}				\
-	-DCMAKE_BUILD_TYPE=RELEASE			\
-	-DRESPECT_FLAGS=ON				\
+%cmake								\
+	-DYPREFIX=%{_prefix}					\
+	-DLIB_DIR=%{_libdir}					\
+	-DCMAKE_BUILD_TYPE=RELEASE				\
+	-DRESPECT_FLAGS=ON					\
 	..
 
 %{__make} %{?_smp_mflags}
@@ -94,23 +94,21 @@ popd
 
 %install
 pushd %{_cmake_build_subdir}
-%{__mkdir} -p	%{buildroot}%{_libdir}/%{libsuffix}	\
+%{__mkdir} -p	%{buildroot}%{_libdir}/%{libsuffix}		\
 		%{buildroot}%{_datadir}/%{name}/theme
 
 %make_install
 
 # Delete obsolete files.
-%{__rm} -rf	%{buildroot}%{_defaultdocdir}		\
-		../examples/CMake*			\
-		doc/html/*.m*
+%{__rm} -rf	%{buildroot}%{_defaultdocdir}			\
+		../examples/CMake* doc/html/*.m*
 
 # Hard-link documentation.
 %{_sbindir}/hardlink -cv doc/html
 
 # Install documentation.
 %{__mkdir} -p	%{buildroot}%{?_pkgdocdir}
-%{__cp} -a	../ChangeLog ../COPYING*		\
-		../examples/ doc/html/			\
+%{__cp} -a	package/libyui.changes ../examples/ doc/html/	\
 		%{buildroot}%{?_pkgdocdir}
 popd
 
@@ -124,11 +122,12 @@ popd
 %dir %{_datadir}/%{name}/theme
 %dir %{_libdir}/%{libsuffix}
 %doc %dir %{?_pkgdocdir}
-%doc %{?_pkgdocdir}/COPYING*
+%license COPYING*
 %{_libdir}/%{name}.so.%{major_so_ver}*
 
 %files devel
-%doc %{?_pkgdocdir}/ChangeLog
+%doc %dir %{?_pkgdocdir}
+%doc %{?_pkgdocdir}/%{name}.changes
 %{_datadir}/%{name}/buildtools
 %{_includedir}/%{libsuffix}
 %{_libdir}/%{name}.so
@@ -136,6 +135,9 @@ popd
 %{_libdir}/cmake
 
 %files doc
+# Pickup license-files from main-pkg's license-dir
+# If there's no license-dir they are picked up by %%doc previously
+%{?_licensedir:%license %{_datadir}/licenses/%{name}*}
 %doc %{?_pkgdocdir}
 
 
@@ -144,6 +146,7 @@ popd
 - new upstream release
 - drop Patch1, applied in upstream tarball
 - keep nullptr-checks with GCC6
+- handle %%license and %%doc properly
 
 * Wed Feb 10 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 3.2.1-5
 - Add 0001-Fixed-a-compilation-error-in-YTableCell-with-GCC-6-b.patch