From 0f8f8d5921e2509e5921645e7d55e5e0e3eea7bd2a066563a3c16ac93edfa862 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 19 Sep 2011 19:29:30 +0000 Subject: [PATCH 1/2] Accepting request 83104 from home:jengelh:bl-c - Remove redundant tags/sections from specfile - Use %_smp_mflags for parallel build OBS-URL: https://build.opensuse.org/request/show/83104 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=79 --- cmake-gui.changes | 6 ++++++ cmake-gui.spec | 11 +---------- cmake.changes | 6 ++++++ cmake.spec | 10 +--------- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/cmake-gui.changes b/cmake-gui.changes index 24c52c3..339d777 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Sep 17 23:11:42 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + ------------------------------------------------------------------- Fri Jul 29 16:19:45 UTC 2011 - puzel@novell.com diff --git a/cmake-gui.spec b/cmake-gui.spec index b678395..fe7e4e0 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: cmake-gui @@ -51,11 +50,6 @@ Requires: cmake This is a Graphical User Interface for CMake, a cross-platform, open-source make system. -Authors: --------- - Kitware, Inc., Insight Consortium - - %prep %setup -q -n cmake-%{version} %patch4 @@ -80,7 +74,7 @@ export CFLAGS="$CXXFLAGS" %endif --parallel=0%jobs \ --qt-gui -make VERBOSE=1 %{?jobs:-j %jobs} +make VERBOSE=1 %{?_smp_mflags} %install make DESTDIR=%{buildroot} install @@ -93,9 +87,6 @@ rm -rf %{buildroot}/usr/share/doc/packages/cmake rm -rf %{buildroot}/usr/share/man/man1/{cmake,cmakecommands,cmakecompat}.1 rm -rf %{buildroot}/usr/share/man/man1/{cmakemodules,cmakepolicies,cmakeprops,cmakevars,cpack,ctest}.1 -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %{_bindir}/cmake-gui diff --git a/cmake.changes b/cmake.changes index 7b5398f..f4fef83 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Sep 17 23:11:46 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + ------------------------------------------------------------------- Fri Jul 29 16:19:27 UTC 2011 - puzel@novell.com diff --git a/cmake.spec b/cmake.spec index d152366..74c3603 100644 --- a/cmake.spec +++ b/cmake.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: cmake @@ -50,10 +49,6 @@ Requires: make %description CMake is a cross-platform, open-source make system -Authors: --------- - Kitware, Inc., Insight Consortium - %prep %setup -q %patch4 @@ -77,7 +72,7 @@ export CFLAGS="$CXXFLAGS" %endif --parallel=0%jobs \ --no-qt-gui -make VERBOSE=1 %{?jobs:-j %jobs} +make VERBOSE=1 %{?_smp_mflags} %install make DESTDIR=%{buildroot} install @@ -88,9 +83,6 @@ cp ChangeLog.manual %{buildroot}/usr/share/doc/packages/%{name}/Changelog %fdupes %buildroot/usr/share/cmake %endif -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %{_bindir}/cpack From 6268cc45cad7cd25234c1fc1988d4c9d02fbd5036ff1c8fa2ae2837d049b9d47 Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Fri, 14 Oct 2011 12:45:21 +0000 Subject: [PATCH 2/2] update to 2.8.6 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=80 --- cmake-2.8.5.tar.gz | 3 --- cmake-2.8.6.tar.gz | 3 +++ cmake-gui.changes | 6 ++++++ cmake-gui.spec | 3 ++- cmake.changes | 6 ++++++ cmake.spec | 3 ++- 6 files changed, 19 insertions(+), 5 deletions(-) delete mode 100644 cmake-2.8.5.tar.gz create mode 100644 cmake-2.8.6.tar.gz diff --git a/cmake-2.8.5.tar.gz b/cmake-2.8.5.tar.gz deleted file mode 100644 index 5afeb90..0000000 --- a/cmake-2.8.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e18bff75f01656c64f553412a8905527e1b85efaf3163c6fb81ea5aaced0b91 -size 5517977 diff --git a/cmake-2.8.6.tar.gz b/cmake-2.8.6.tar.gz new file mode 100644 index 0000000..07ee9d5 --- /dev/null +++ b/cmake-2.8.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6999b81ac367d85ffb0f69b6c4a0ef96f95dc154efd3592f9cfebacdf75728e +size 5583905 diff --git a/cmake-gui.changes b/cmake-gui.changes index 339d777..021304d 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 14 12:31:49 UTC 2011 - puzel@suse.com + +- update to 2.8.6 + - see /usr/share/doc/packages/cmake/Changelog for changes + ------------------------------------------------------------------- Sat Sep 17 23:11:42 UTC 2011 - jengelh@medozas.de diff --git a/cmake-gui.spec b/cmake-gui.spec index fe7e4e0..b459832 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -18,7 +18,7 @@ Name: cmake-gui -Version: 2.8.5 +Version: 2.8.6 Release: 1 License: BSD3c Group: Development/Tools/Building @@ -83,6 +83,7 @@ mkdir -p %{buildroot}%{_libdir}/cmake # delete files that belong to the 'cmake' package rm -rf %{buildroot}/usr/bin/{cpack,cmake,ctest} rm -rf %{buildroot}/usr/share/cmake +rm -rf %{buildroot}/usr/share/aclocal/cmake.m4 rm -rf %{buildroot}/usr/share/doc/packages/cmake rm -rf %{buildroot}/usr/share/man/man1/{cmake,cmakecommands,cmakecompat}.1 rm -rf %{buildroot}/usr/share/man/man1/{cmakemodules,cmakepolicies,cmakeprops,cmakevars,cpack,ctest}.1 diff --git a/cmake.changes b/cmake.changes index f4fef83..be2d3b8 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 14 12:30:48 UTC 2011 - puzel@suse.com + +- update to 2.8.6 + - see /usr/share/doc/packages/cmake/Changelog for changes + ------------------------------------------------------------------- Sat Sep 17 23:11:46 UTC 2011 - jengelh@medozas.de diff --git a/cmake.spec b/cmake.spec index 74c3603..6b13023 100644 --- a/cmake.spec +++ b/cmake.spec @@ -18,7 +18,7 @@ Name: cmake -Version: 2.8.5 +Version: 2.8.6 Release: 1 License: BSD3c Group: Development/Tools/Building @@ -91,6 +91,7 @@ cp ChangeLog.manual %{buildroot}/usr/share/doc/packages/%{name}/Changelog %{_bindir}/ccmake %{_datadir}/cmake %{_libdir}/cmake +%{_datadir}/aclocal/cmake.m4 %doc %{_datadir}/doc/packages/%{name} %doc %{_mandir}/man1/cmakepolicies.1.* %doc %{_mandir}/man1/cmake.1.*