From 46ec63cf44ae13a3b32ad1b82e246c7fb28f0821744094078e152bab1b2485a0 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 20 Dec 2018 08:29:42 +0000 Subject: [PATCH] Accepting request 660111 from home:TheBlackCat:branches:devel:tools:building - Include license file as BSD license requires. - Use upstream-recommended %{_rpmconfigdir}/macros.d directory for the rpm macros. - Include license file as BSD license requires. - Correct cmake-mans recommends, should be cmake-man OBS-URL: https://build.opensuse.org/request/show/660111 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=340 --- cmake-gui.changes | 5 +++++ cmake-gui.spec | 2 ++ cmake.changes | 8 ++++++++ cmake.spec | 8 +++++--- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/cmake-gui.changes b/cmake-gui.changes index b74ab03..2778de8 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 19 16:25:45 UTC 2018 - Todd R + +- Include license file as BSD license requires. + ------------------------------------------------------------------- Sat Dec 01 18:06:13 UTC 2018 - sean@suspend.net diff --git a/cmake-gui.spec b/cmake-gui.spec index 7abdc50..2961c3e 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -110,6 +110,7 @@ rm -rf %{buildroot}%{_datadir}/aclocal/cmake.m4 rm -rf %{buildroot}%{_docdir}/cmake %files +%license Copyright.txt %{_bindir}/cmake-gui %{_datadir}/applications/%{name}.desktop %{_datadir}/mime/packages/cmakecache.xml @@ -120,6 +121,7 @@ rm -rf %{buildroot}%{_docdir}/cmake %{_datadir}/icons/hicolor/32x32/apps/CMakeSetup.png %files -n cmake-man +%license Copyright.txt %{_mandir}/man7/* %{_mandir}/man1/* diff --git a/cmake.changes b/cmake.changes index 2db78fb..90e9d1b 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 19 16:19:24 UTC 2018 - Todd R + +- Use upstream-recommended %{_rpmconfigdir}/macros.d directory + for the rpm macros. +- Include license file as BSD license requires. +- Correct cmake-mans recommends, should be cmake-man + ------------------------------------------------------------------- Sat Dec 01 18:03:13 UTC 2018 - sean@suspend.net diff --git a/cmake.spec b/cmake.spec index 2b079d2..31feb1b 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,7 +69,7 @@ BuildRequires: pkgconfig(liblzma) Requires: make # bnc#953842 - A python file is shipped so require python base so it can be run. Requires: python3-base -Recommends: cmake-mans +Recommends: cmake-man %description CMake is a cross-platform, open-source build system @@ -104,7 +104,7 @@ make VERBOSE=1 %{?_smp_mflags} mkdir -p %{buildroot}%{_libdir}/cmake find %{buildroot}%{_datadir}/cmake -type f -print0 | xargs -0 chmod 644 # rpm macros -install -m644 %{SOURCE1} -D %{buildroot}%{_sysconfdir}/rpm/macros.cmake +install -m644 %{SOURCE1} -D %{buildroot}%{_rpmconfigdir}/macros.d/macros.cmake # RPM auto provides install -p -m0644 -D %{SOURCE3} %{buildroot}%{_libexecdir}/rpm/fileattrs/cmake.attr @@ -129,7 +129,9 @@ done -E "(TestUpload|SimpleInstall|SimpleInstall-Stage2|CPackComponentsForAll-RPM-(default|OnePackPerGroup|IgnoreGroup|AllInOne)|CPack_RPM)" %files -%config %{_sysconfdir}/rpm/macros.cmake +%license Copyright.txt +%doc README.rst +%config %{_rpmconfigdir}/macros.d/macros.cmake %{_libexecdir}/rpm %{_bindir}/cpack %{_bindir}/cmake