SHA256
3
0
forked from pool/cmake

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
This commit is contained in:
Martin Pluskal 2018-12-20 08:29:42 +00:00 committed by Git OBS Bridge
parent 073862dc6b
commit 46ec63cf44
4 changed files with 20 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Dec 19 16:25:45 UTC 2018 - Todd R <toddrme2178@gmail.com>
- Include license file as BSD license requires.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Dec 01 18:06:13 UTC 2018 - sean@suspend.net Sat Dec 01 18:06:13 UTC 2018 - sean@suspend.net

View File

@ -110,6 +110,7 @@ rm -rf %{buildroot}%{_datadir}/aclocal/cmake.m4
rm -rf %{buildroot}%{_docdir}/cmake rm -rf %{buildroot}%{_docdir}/cmake
%files %files
%license Copyright.txt
%{_bindir}/cmake-gui %{_bindir}/cmake-gui
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop
%{_datadir}/mime/packages/cmakecache.xml %{_datadir}/mime/packages/cmakecache.xml
@ -120,6 +121,7 @@ rm -rf %{buildroot}%{_docdir}/cmake
%{_datadir}/icons/hicolor/32x32/apps/CMakeSetup.png %{_datadir}/icons/hicolor/32x32/apps/CMakeSetup.png
%files -n cmake-man %files -n cmake-man
%license Copyright.txt
%{_mandir}/man7/* %{_mandir}/man7/*
%{_mandir}/man1/* %{_mandir}/man1/*

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Dec 19 16:19:24 UTC 2018 - Todd R <toddrme2178@gmail.com>
- 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 Sat Dec 01 18:03:13 UTC 2018 - sean@suspend.net

View File

@ -69,7 +69,7 @@ BuildRequires: pkgconfig(liblzma)
Requires: make Requires: make
# bnc#953842 - A python file is shipped so require python base so it can be run. # bnc#953842 - A python file is shipped so require python base so it can be run.
Requires: python3-base Requires: python3-base
Recommends: cmake-mans Recommends: cmake-man
%description %description
CMake is a cross-platform, open-source build system CMake is a cross-platform, open-source build system
@ -104,7 +104,7 @@ make VERBOSE=1 %{?_smp_mflags}
mkdir -p %{buildroot}%{_libdir}/cmake mkdir -p %{buildroot}%{_libdir}/cmake
find %{buildroot}%{_datadir}/cmake -type f -print0 | xargs -0 chmod 644 find %{buildroot}%{_datadir}/cmake -type f -print0 | xargs -0 chmod 644
# rpm macros # rpm macros
install -m644 %{SOURCE1} -D %{buildroot}%{_sysconfdir}/rpm/macros.cmake install -m644 %{SOURCE1} -D %{buildroot}%{_rpmconfigdir}/macros.d/macros.cmake
# RPM auto provides # RPM auto provides
install -p -m0644 -D %{SOURCE3} %{buildroot}%{_libexecdir}/rpm/fileattrs/cmake.attr 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)" -E "(TestUpload|SimpleInstall|SimpleInstall-Stage2|CPackComponentsForAll-RPM-(default|OnePackPerGroup|IgnoreGroup|AllInOne)|CPack_RPM)"
%files %files
%config %{_sysconfdir}/rpm/macros.cmake %license Copyright.txt
%doc README.rst
%config %{_rpmconfigdir}/macros.d/macros.cmake
%{_libexecdir}/rpm %{_libexecdir}/rpm
%{_bindir}/cpack %{_bindir}/cpack
%{_bindir}/cmake %{_bindir}/cmake