diff --git a/cmake-gui.changes b/cmake-gui.changes index 3ba8931..99bb20e 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Nov 11 11:09:03 UTC 2010 - puzel@novell.com + +- update to cmake-2.8.3 + - see /usr/share/doc/packages/cmake/Changelog for changes +- drop cmake-FindGTK2-gdk-pixbuf.patch (fixed upstream) +- drop cmake-support-new-python.diff (fixed upstream) + ------------------------------------------------------------------- Mon Sep 13 18:09:02 UTC 2010 - kkaempf@novell.com diff --git a/cmake-gui.spec b/cmake-gui.spec index 78071b8..92ff69b 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -27,7 +27,6 @@ Url: http://www.cmake.org/ Source0: cmake-%{version}.tar.bz2 Patch4: cmake-disable-builtin-chrpath.diff Patch5: fortify-buffer-overflows.diff -Patch6: cmake-no-system-libarchive.patch Summary: CMake graphical user interface BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} @@ -41,6 +40,7 @@ BuildRequires: expat-devel BuildRequires: curl-devel BuildRequires: gcc-c++ BuildRequires: libqt4-devel +BuildRequires: libarchive-devel BuildRequires: openssl-devel BuildRequires: update-desktop-files BuildRequires: zlib-devel @@ -59,7 +59,6 @@ Authors: %setup -q -n cmake-%{version} %patch4 %patch5 -%patch6 -p1 %build EXTRA_FLAGS="--qt-gui" diff --git a/cmake-no-system-libarchive.patch b/cmake-no-system-libarchive.patch deleted file mode 100644 index 3904586..0000000 --- a/cmake-no-system-libarchive.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: cmake-2.8.3/CMakeLists.txt -=================================================================== ---- cmake-2.8.3.orig/CMakeLists.txt -+++ cmake-2.8.3/CMakeLists.txt -@@ -71,7 +71,7 @@ MACRO(CMAKE_HANDLE_SYSTEM_LIBRARIES) - CACHE BOOL "Use system-installed zlib" FORCE) - SET(CMAKE_USE_SYSTEM_BZIP2 "${CMAKE_USE_SYSTEM_LIBRARIES}" - CACHE BOOL "Use system-installed bzip2" FORCE) -- SET(CMAKE_USE_SYSTEM_LIBARCHIVE "${CMAKE_USE_SYSTEM_LIBRARIES}" -+ SET(CMAKE_USE_SYSTEM_LIBARCHIVE "OFF" - CACHE BOOL "Use system-installed libarchive" FORCE) - ENDIF(CMAKE_USE_SYSTEM_LIBRARIES_USER) - diff --git a/cmake.changes b/cmake.changes index 1376165..b890a6c 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,11 +1,10 @@ ------------------------------------------------------------------- -Thu Nov 4 11:09:03 UTC 2010 - puzel@novell.com +Thu Nov 11 11:09:03 UTC 2010 - puzel@novell.com - update to cmake-2.8.3 - see /usr/share/doc/packages/cmake/Changelog for changes - drop cmake-FindGTK2-gdk-pixbuf.patch (fixed upstream) - drop cmake-support-new-python.diff (fixed upstream) -- add cmake-no-system-libarchive.patch ------------------------------------------------------------------- Tue Sep 14 12:39:36 UTC 2010 - puzel@novell.com diff --git a/cmake.spec b/cmake.spec index 206f6a8..c45164e 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. @@ -27,7 +27,6 @@ Url: http://www.cmake.org/ Source0: %{name}-%{version}.tar.bz2 Patch4: cmake-disable-builtin-chrpath.diff Patch5: fortify-buffer-overflows.diff -Patch6: cmake-no-system-libarchive.patch # Should appear in cmake-2.8.3 Summary: Cross-platform, open-source make system BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,6 +40,7 @@ BuildRequires: expat-devel %endif BuildRequires: curl-devel BuildRequires: gcc-c++ +BuildRequires: libarchive-devel BuildRequires: ncurses-devel BuildRequires: openssl-devel BuildRequires: zlib-devel @@ -57,7 +57,6 @@ Authors: %setup -q -n %{name}-%{version} %patch4 %patch5 -%patch6 -p1 %build export CXXFLAGS="$RPM_OPT_FLAGS"