diff --git a/cmake-gui.changes b/cmake-gui.changes index 438ef4b..09c9ba6 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 3 07:57:47 UTC 2014 - tchvatal@suse.com + +- Provide cmake-mans subpackage and use it to avoid buildcycle + ------------------------------------------------------------------- Wed Jul 2 13:04:33 UTC 2014 - tchvatal@suse.com diff --git a/cmake-gui.spec b/cmake-gui.spec index 0bebbc7..504b788 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -35,6 +35,7 @@ BuildRequires: update-desktop-files BuildRequires: zlib-devel BuildRequires: pkgconfig(bzip2) Requires: cmake +Recommends: cmake-man BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1320 BuildRequires: pkgconfig(Qt5Widgets) @@ -46,6 +47,13 @@ BuildRequires: libqt4-devel This is a Graphical User Interface for CMake, a cross-platform, open-source build system. +%package -n cmake-man +Summary: Cross-platform, open-source make system - manual pages +Group: Development/Tools/Building + +%description -n cmake-man +Manual pages for cmake, Cross-platform, open-source make system + %prep %setup -q -n cmake-%{version} @@ -81,8 +89,6 @@ rm -rf %{buildroot}%{_bindir}/{cpack,cmake,ctest} rm -rf %{buildroot}%{_datadir}/cmake rm -rf %{buildroot}%{_datadir}/aclocal/cmake.m4 rm -rf %{buildroot}%{_docdir}/cmake -rm -rf %{buildroot}%{_mandir}/man7/ -rm -rf %{buildroot}%{_mandir}/man1/{ccmake,cmake,cpack,ctest}.* %files %defattr(-,root,root) @@ -90,6 +96,10 @@ rm -rf %{buildroot}%{_mandir}/man1/{ccmake,cmake,cpack,ctest}.* %{_datadir}/applications/CMake.desktop %{_datadir}/mime/packages/cmakecache.xml %{_datadir}/pixmaps/CMakeSetup32.png -%{_mandir}/man1/cmake-gui.1.* + +%files -n cmake-man +%defattr(-,root,root) +%{_mandir}/man7/* +%{_mandir}/man1/* %changelog diff --git a/cmake.changes b/cmake.changes index e9fe1e6..2fbad5c 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 3 07:57:26 UTC 2014 - tchvatal@suse.com + +- Move manpages building to -gui part to avoid buildcycle. + ------------------------------------------------------------------- Wed Jul 2 13:03:54 UTC 2014 - tchvatal@suse.com diff --git a/cmake.spec b/cmake.spec index 4ae4a7f..227fe8e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -33,9 +33,9 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libexpat-devel BuildRequires: ncurses-devel -BuildRequires: python-sphinx BuildRequires: zlib-devel Requires: make +Recommends: cmake-mans BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1110 BuildRequires: libarchive-devel @@ -58,7 +58,6 @@ export CFLAGS="$CXXFLAGS" --datadir=/share/%{name} \ --docdir=/share/doc/packages/%{name} \ --mandir=/share/man \ - --sphinx-man \ --system-libs \ --no-system-curl \ %if 0%{?suse_version} <= 1110