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