From 43df0fcfd52ebe95f4132f2cb3e6b3e82a9ea407dc5d02705eea19c630a73bc4 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 15 Nov 2010 16:50:50 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/cmake revision 44.0 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=a8150accd3b5c0c00bfb2571e66d36ab --- cmake-gui.spec | 2 +- cmake.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake-gui.spec b/cmake-gui.spec index 92ff69b..10a4f77 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -20,7 +20,7 @@ Name: cmake-gui Version: 2.8.3 -Release: 3 +Release: 1 License: BSD3c Group: Development/Tools/Building Url: http://www.cmake.org/ diff --git a/cmake.spec b/cmake.spec index c45164e..71782d9 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,4 +1,4 @@ - +# # spec file for package cmake (Version 2.8.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. @@ -20,7 +20,7 @@ Name: cmake Version: 2.8.3 -Release: 3 +Release: 1 License: BSD3c Group: Development/Tools/Building Url: http://www.cmake.org/ From 49040b3facacba09e35d35a9e3d0a2c7eced0d35f4deb1d8a421ded8cba37815 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 20 Jan 2011 21:11:06 +0000 Subject: [PATCH 2/3] - udpate to 2.8.4-rc1: - see /usr/share/doc/packages/cmake/Changelog for changes - remove fortify patch OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=73 --- cmake-2.8.3.tar.bz2 | 3 --- cmake-2.8.4-rc1.tar.bz2 | 3 +++ cmake-gui.spec | 10 ++++------ cmake.changes | 7 +++++++ cmake.spec | 9 ++++----- fortify-buffer-overflows.diff | 13 ------------- 6 files changed, 18 insertions(+), 27 deletions(-) delete mode 100644 cmake-2.8.3.tar.bz2 create mode 100644 cmake-2.8.4-rc1.tar.bz2 delete mode 100644 fortify-buffer-overflows.diff diff --git a/cmake-2.8.3.tar.bz2 b/cmake-2.8.3.tar.bz2 deleted file mode 100644 index 70353ee..0000000 --- a/cmake-2.8.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b4fe2c354015b1b5caa135f2854b5b2d5b092af4acc61e699d344545937d327 -size 4155865 diff --git a/cmake-2.8.4-rc1.tar.bz2 b/cmake-2.8.4-rc1.tar.bz2 new file mode 100644 index 0000000..4000088 --- /dev/null +++ b/cmake-2.8.4-rc1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95ac6f0db68c449d946a722b46abcccf0cb9c3437c5c452a45a6fa087192a248 +size 4165720 diff --git a/cmake-gui.spec b/cmake-gui.spec index 10a4f77..8bc0b4d 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -20,13 +20,13 @@ Name: cmake-gui Version: 2.8.3 -Release: 1 +%define rversion 2.8.4-rc1 +Release: 2.8.4_rc1.1 License: BSD3c Group: Development/Tools/Building Url: http://www.cmake.org/ -Source0: cmake-%{version}.tar.bz2 +Source0: cmake-%{rversion}.tar.bz2 Patch4: cmake-disable-builtin-chrpath.diff -Patch5: fortify-buffer-overflows.diff Summary: CMake graphical user interface BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} @@ -56,10 +56,8 @@ Authors: %prep -%setup -q -n cmake-%{version} +%setup -q -n cmake-%{rversion} %patch4 -%patch5 - %build EXTRA_FLAGS="--qt-gui" export CXXFLAGS="$RPM_OPT_FLAGS" diff --git a/cmake.changes b/cmake.changes index b890a6c..4353901 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 20 22:08:01 CET 2011 - dmueller@suse.de + +- udpate to 2.8.4-rc1: + - see /usr/share/doc/packages/cmake/Changelog for changes +- remove fortify patch + ------------------------------------------------------------------- Thu Nov 11 11:09:03 UTC 2010 - puzel@novell.com diff --git a/cmake.spec b/cmake.spec index 71782d9..b0dbdfc 100644 --- a/cmake.spec +++ b/cmake.spec @@ -20,13 +20,13 @@ Name: cmake Version: 2.8.3 -Release: 1 +%define rver 2.8.4-rc1 +Release: 2.8.4rc1.1 License: BSD3c Group: Development/Tools/Building Url: http://www.cmake.org/ -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{rver}.tar.bz2 Patch4: cmake-disable-builtin-chrpath.diff -Patch5: fortify-buffer-overflows.diff # Should appear in cmake-2.8.3 Summary: Cross-platform, open-source make system BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -54,9 +54,8 @@ Authors: Kitware, Inc., Insight Consortium %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{rver} %patch4 -%patch5 %build export CXXFLAGS="$RPM_OPT_FLAGS" diff --git a/fortify-buffer-overflows.diff b/fortify-buffer-overflows.diff deleted file mode 100644 index 6ff1bf5..0000000 --- a/fortify-buffer-overflows.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: Source/kwsys/SystemInformation.cxx -=================================================================== ---- Source/kwsys/SystemInformation.cxx.orig 2010-06-28 17:16:00.000000000 +0200 -+++ Source/kwsys/SystemInformation.cxx 2010-07-21 14:13:20.000000000 +0200 -@@ -152,7 +152,7 @@ public: - - public: - #define VENDOR_STRING_LENGTH (12 + 1) --#define CHIPNAME_STRING_LENGTH (48 + 1) -+#define CHIPNAME_STRING_LENGTH (70 + 1) - #define SERIALNUMBER_STRING_LENGTH (29 + 1) - - typedef struct tagID From 96f80169ffc05ce0a0dd404537ffd6e32fd85a0a5ad12675bab252bc82cc1e1d Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Mon, 4 Apr 2011 14:49:26 +0000 Subject: [PATCH 3/3] update to 2.8.4 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=74 --- cmake-2.8.4-rc1.tar.bz2 | 3 --- cmake-2.8.4.tar.bz2 | 3 +++ cmake-gui.spec | 11 +++++------ cmake.changes | 6 ++++++ cmake.spec | 11 +++++------ 5 files changed, 19 insertions(+), 15 deletions(-) delete mode 100644 cmake-2.8.4-rc1.tar.bz2 create mode 100644 cmake-2.8.4.tar.bz2 diff --git a/cmake-2.8.4-rc1.tar.bz2 b/cmake-2.8.4-rc1.tar.bz2 deleted file mode 100644 index 4000088..0000000 --- a/cmake-2.8.4-rc1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95ac6f0db68c449d946a722b46abcccf0cb9c3437c5c452a45a6fa087192a248 -size 4165720 diff --git a/cmake-2.8.4.tar.bz2 b/cmake-2.8.4.tar.bz2 new file mode 100644 index 0000000..2f6e2aa --- /dev/null +++ b/cmake-2.8.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5465a243dce5a6e140a5ce49bf2b5bb07e78eee10310597abac0669c638c053f +size 4181332 diff --git a/cmake-gui.spec b/cmake-gui.spec index 8bc0b4d..28e9a51 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -1,5 +1,5 @@ # -# spec file for package cmake-gui (Version 2.8.3) +# spec file for package cmake-gui (Version 2.8.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,13 +19,12 @@ Name: cmake-gui -Version: 2.8.3 -%define rversion 2.8.4-rc1 -Release: 2.8.4_rc1.1 +Version: 2.8.4 +Release: 1 License: BSD3c Group: Development/Tools/Building Url: http://www.cmake.org/ -Source0: cmake-%{rversion}.tar.bz2 +Source0: cmake-%{version}.tar.bz2 Patch4: cmake-disable-builtin-chrpath.diff Summary: CMake graphical user interface BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -56,7 +55,7 @@ Authors: %prep -%setup -q -n cmake-%{rversion} +%setup -q -n cmake-%{version} %patch4 %build EXTRA_FLAGS="--qt-gui" diff --git a/cmake.changes b/cmake.changes index 4353901..74f4956 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 4 14:17:43 UTC 2011 - puzel@novell.com + +- update to 2.8.4 + - see /usr/share/doc/packages/cmake/Changelog for changes + ------------------------------------------------------------------- Thu Jan 20 22:08:01 CET 2011 - dmueller@suse.de diff --git a/cmake.spec b/cmake.spec index b0dbdfc..7d8d5b2 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,5 +1,5 @@ # -# spec file for package cmake (Version 2.8.3) +# spec file for package cmake (Version 2.8.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,13 +19,12 @@ Name: cmake -Version: 2.8.3 -%define rver 2.8.4-rc1 -Release: 2.8.4rc1.1 +Version: 2.8.4 +Release: 1 License: BSD3c Group: Development/Tools/Building Url: http://www.cmake.org/ -Source0: %{name}-%{rver}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 Patch4: cmake-disable-builtin-chrpath.diff # Should appear in cmake-2.8.3 Summary: Cross-platform, open-source make system @@ -54,7 +53,7 @@ Authors: Kitware, Inc., Insight Consortium %prep -%setup -q -n %{name}-%{rver} +%setup -q %patch4 %build