diff --git a/cmake-2.8.1.tar.bz2 b/cmake-2.8.1.tar.bz2 deleted file mode 100644 index 03abbba..0000000 --- a/cmake-2.8.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04b606adc208b8619aa08449ef05783933e48a57234f6975df20d909bde61384 -size 2746713 diff --git a/cmake-2.8.2.tar.bz2 b/cmake-2.8.2.tar.bz2 new file mode 100644 index 0000000..6038dea --- /dev/null +++ b/cmake-2.8.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1a54476bf25d8c61a1f5f2eb708e12a3a7487dfe04ad4a5ab91c0d110f39a9a +size 4153648 diff --git a/cmake-disable-builtin-chrpath.diff b/cmake-disable-builtin-chrpath.diff index 9dfb4ed..93b12ac 100644 --- a/cmake-disable-builtin-chrpath.diff +++ b/cmake-disable-builtin-chrpath.diff @@ -1,8 +1,8 @@ Index: Source/cmTarget.cxx =================================================================== ---- Source/cmTarget.cxx.orig 2009-11-13 19:32:58.000000000 +0100 -+++ Source/cmTarget.cxx 2009-11-26 10:41:29.000000000 +0100 -@@ -3679,7 +3679,7 @@ bool cmTarget::IsChrpathUsed(const char* +--- Source/cmTarget.cxx.orig 2010-06-28 17:15:59.000000000 +0200 ++++ Source/cmTarget.cxx 2010-07-20 22:27:13.000000000 +0200 +@@ -3785,7 +3785,7 @@ bool cmTarget::IsChrpathUsed(const char* } // Allow the user to disable builtin chrpath explicitly. diff --git a/cmake-gui.changes b/cmake-gui.changes index 294fc99..0743391 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 20 20:37:51 UTC 2010 - puzel@novell.com + +- update to cmake-gui-2.8.2 + - cmake-gui: Add simple grouped view + - cmake-gui: Support build tree under symlink (#9975) + ------------------------------------------------------------------- Tue May 25 14:12:51 UTC 2010 - puzel@novell.com diff --git a/cmake-gui.spec b/cmake-gui.spec index 3997aeb..0211ed7 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -1,5 +1,5 @@ # -# spec file for package cmake-gui (Version 2.8.1) +# spec file for package cmake-gui (Version 2.8.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cmake-gui -Version: 2.8.1 -Release: 2 +Version: 2.8.2 +Release: 3 License: BSD3c Group: Development/Tools/Building Url: http://www.cmake.org/ diff --git a/cmake.changes b/cmake.changes index 39e90c8..4ebd82d 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Tue Jul 20 20:33:49 UTC 2010 - puzel@novell.com + +- update to cmake-2.8.2 + - notable changes: + - CPack: Add native BZip2 support + - ExternalProject: Support .zip and .bz2 archives, MD5 verification + - GetPrerequisites: Provide an override hook + - Recognize ARM ABI/EABI with GNU compilers + - Recognize Clang compiler + - Search basic directories on "Generic" platform + - Support compression with 'cmake -E tar' + - a lot of bugfixes + +------------------------------------------------------------------- +Thu Jun 10 16:24:47 UTC 2010 - dimstar@opensuse.org + +- Fix build on Fedora, by not using defaultdocdir. It does not + match the forced installation path on configure. + +------------------------------------------------------------------- +Thu Jun 3 16:03:36 UTC 2010 - dimstar@opensuse.org + +- No fdupes on non-suse platforms and SLE10. + ------------------------------------------------------------------- Tue May 18 12:17:02 UTC 2010 - puzel@novell.com diff --git a/cmake.spec b/cmake.spec index 53eecd7..6a11116 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,5 +1,5 @@ # -# spec file for package cmake (Version 2.8.1) +# spec file for package cmake (Version 2.8.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: cmake -Version: 2.8.1 -Release: 2 +Version: 2.8.2 +Release: 3 License: BSD3c Group: Development/Tools/Building Url: http://www.cmake.org/ @@ -29,7 +29,9 @@ Patch4: cmake-disable-builtin-chrpath.diff Patch5: fortify-buffer-overflows.diff Summary: Cross-platform, open-source make system BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1110 BuildRequires: fdupes +%endif BuildRequires: curl-devel BuildRequires: gcc-c++ BuildRequires: libexpat-devel @@ -67,8 +69,10 @@ make VERBOSE=1 %{?jobs:-j %jobs} make DESTDIR=%{buildroot} install mkdir -p %{buildroot}%{_libdir}/cmake find %{buildroot}/usr/share/cmake -type f -print0 | xargs -0 chmod 644 -cp ChangeLog.manual %{buildroot}/usr/share/doc/packages/%{name}/Changelog +cp ChangeLog.manual %{buildroot}/usr/share/doc/packages/%{name}/Changelog +%if 0%{?suse_version} > 1110 %fdupes %buildroot/usr/share/cmake +%endif %clean rm -rf %{buildroot} @@ -80,8 +84,8 @@ rm -rf %{buildroot} %{_bindir}/ctest %{_bindir}/ccmake %{_datadir}/cmake -%_libdir/cmake -%doc %{_defaultdocdir}/%{name} +%{_libdir}/cmake +%doc %{_datadir}/doc/packages/%{name} %doc %{_mandir}/man1/cmakepolicies.1.* %doc %{_mandir}/man1/cmake.1.* %doc %{_mandir}/man1/ctest.1.* diff --git a/fortify-buffer-overflows.diff b/fortify-buffer-overflows.diff index e329848..6ff1bf5 100644 --- a/fortify-buffer-overflows.diff +++ b/fortify-buffer-overflows.diff @@ -1,6 +1,8 @@ ---- Source/kwsys/SystemInformation.cxx -+++ Source/kwsys/SystemInformation.cxx -@@ -152,7 +152,7 @@ +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) @@ -9,17 +11,3 @@ #define SERIALNUMBER_STRING_LENGTH (29 + 1) typedef struct tagID ---- Utilities/cmtar/encode.c -+++ Utilities/cmtar/encode.c -@@ -32,7 +32,10 @@ - int i, sum = 0; - - if (t->options & TAR_GNU) -- strncpy(t->th_buf.magic, "ustar ", 8); -+ { -+ strncpy(t->th_buf.version, " ", TVERSLEN); -+ strncpy(t->th_buf.magic, "ustar", TMAGLEN); -+ } - else - { - strncpy(t->th_buf.version, TVERSION, TVERSLEN);