diff --git a/libyui.spec b/libyui.spec index 692e38b..1856229 100644 --- a/libyui.spec +++ b/libyui.spec @@ -12,9 +12,10 @@ # CMake-builds go out-of-tree. %global _cmake_build_subdir build-%{_target_platform} + Name: lib%{libsuffix} Version: 3.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI-abstraction library License: (LGPLv2 or LGPLv3) and MIT @@ -91,14 +92,15 @@ pushd %{_cmake_build_subdir} %{__cat} << EOF > %{buildroot}/%{macrosdir}/macros.%{name} %_%{name}_major_so_ver %{major_so_ver} %_%{name}_datadir %%{_datadir}/%{name} -%_%{name}_includedir %%{_includedir}/%{name} +%_%{name}_includedir %%{_includedir}/%{libsuffix} %_%{name}_plugindir %%{_libdir}/%{libsuffix} %_%{name}_themedir %%{_datadir}/%{name}/theme EOF # Delete obsolete files. %{__rm} -rf %{buildroot}%{_defaultdocdir} \ - ../examples/CMake* doc/html/*.m* + ../examples/{CMake*,.gitignore} \ + doc/html/*.m* # Install documentation. %{__mkdir} -p %{buildroot}%{?_pkgdocdir} @@ -112,6 +114,8 @@ popd %post -p /sbin/ldconfig + + %postun -p /sbin/ldconfig @@ -124,6 +128,7 @@ popd %license COPYING* %{_libdir}/%{name}.so.%{major_so_ver}* + %files devel %doc %dir %{?_pkgdocdir} %doc %{?_pkgdocdir}/%{name}.changes @@ -134,6 +139,7 @@ popd %{_libdir}/cmake %{macrosdir}/macros.%{name} + %files doc # Pickup license-files from main-pkg's license-dir # If there's no license-dir they are picked up by %%doc previously @@ -142,6 +148,9 @@ popd %changelog +* Sun Apr 23 2017 Björn Esser - 3.3.2-2 +- Fix macros-file + * Tue Apr 18 2017 Björn Esser - 3.3.2-1 - New upstream release - Drop patches, merged upstream