diff --git a/libyui.spec b/libyui.spec index 4c85c07..576f301 100644 --- a/libyui.spec +++ b/libyui.spec @@ -1,3 +1,5 @@ +%undefine __cmake_in_source_build + %global major_so_ver 8 # Place rpm-macros into proper location. @@ -9,9 +11,6 @@ # Define libsuffix. %global libsuffix yui -# CMake-builds go out-of-tree. -%global _cmake_build_subdir build-%{_target_platform} - Name: lib%{libsuffix} Version: 3.3.3 @@ -69,31 +68,27 @@ 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 \ -DSKIP_LATEX=ON \ - .. + %{nil} -%make_build -%make_build docs -popd +%cmake_build +%cmake_build --target docs %install -pushd %{_cmake_build_subdir} -%{__mkdir} -p %{buildroot}%{_libdir}/%{libsuffix} \ +mkdir -p %{buildroot}%{_libdir}/%{libsuffix} \ %{buildroot}%{_datadir}/%{name}/theme -%make_install +%cmake_install # Create a macro for use in other spec-files. -%{__mkdir} -p %{buildroot}/%{macrosdir} -%{__cat} << EOF > %{buildroot}/%{macrosdir}/macros.%{name} +mkdir -p %{buildroot}/%{macrosdir} +cat << EOF > %{buildroot}/%{macrosdir}/macros.%{name} %_%{name}_major_so_ver %{major_so_ver} %_%{name}_datadir %%{_datadir}/%{name} %_%{name}_includedir %%{_includedir}/%{libsuffix} @@ -102,19 +97,18 @@ pushd %{_cmake_build_subdir} EOF # Delete obsolete files. -%{__rm} -rf %{buildroot}%{_defaultdocdir} \ - ../examples/{CMake*,.gitignore} \ - doc/html/*.m* +rm -rf %{buildroot}%{_defaultdocdir} \ + examples/{CMake*,.gitignore} \ + %{_vpath_builddir}/doc/html/*.m* # Install documentation. -%{__mkdir} -p %{buildroot}%{?_pkgdocdir} -%{__cp} -a ../README.md ../package/libyui.changes \ - ../examples/ doc/html/ \ +mkdir -p %{buildroot}%{?_pkgdocdir} +cp -a README.md package/libyui.changes \ + examples/ %{_vpath_builddir}/doc/html/ \ %{buildroot}%{?_pkgdocdir} # Hard-link documentation. %{_bindir}/hardlink -cv %{buildroot}%{?_pkgdocdir}/html -popd %ldconfig_scriptlets