From 7c768aab573343a1072a37d6a5b9b94cc40adefaff164801b9495d9287cf12c7 Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Thu, 4 Nov 2010 14:02:01 +0000 Subject: [PATCH 1/2] update to 2.8.3 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=70 --- cmake-2.8.2.tar.bz2 | 3 --- cmake-2.8.3.tar.bz2 | 3 +++ cmake-FindGTK2-gdk-pixbuf.patch | 22 ---------------------- cmake-gui.spec | 6 ++++-- cmake-no-system-libarchive.patch | 13 +++++++++++++ cmake-support-new-python.diff | 26 -------------------------- cmake.changes | 9 +++++++++ cmake.spec | 10 ++++------ 8 files changed, 33 insertions(+), 59 deletions(-) delete mode 100644 cmake-2.8.2.tar.bz2 create mode 100644 cmake-2.8.3.tar.bz2 delete mode 100644 cmake-FindGTK2-gdk-pixbuf.patch create mode 100644 cmake-no-system-libarchive.patch delete mode 100644 cmake-support-new-python.diff diff --git a/cmake-2.8.2.tar.bz2 b/cmake-2.8.2.tar.bz2 deleted file mode 100644 index 6038dea..0000000 --- a/cmake-2.8.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1a54476bf25d8c61a1f5f2eb708e12a3a7487dfe04ad4a5ab91c0d110f39a9a -size 4153648 diff --git a/cmake-2.8.3.tar.bz2 b/cmake-2.8.3.tar.bz2 new file mode 100644 index 0000000..70353ee --- /dev/null +++ b/cmake-2.8.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b4fe2c354015b1b5caa135f2854b5b2d5b092af4acc61e699d344545937d327 +size 4155865 diff --git a/cmake-FindGTK2-gdk-pixbuf.patch b/cmake-FindGTK2-gdk-pixbuf.patch deleted file mode 100644 index 4768011..0000000 --- a/cmake-FindGTK2-gdk-pixbuf.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: cmake-2.8.2/Modules/FindGTK2.cmake -=================================================================== ---- cmake-2.8.2.orig/Modules/FindGTK2.cmake -+++ cmake-2.8.2/Modules/FindGTK2.cmake -@@ -138,6 +138,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hd - atkmm-1.6 - cairo - cairomm-1.0 -+ gdk-pixbuf-2.0 - gdkmm-2.4 - giomm-2.4 - gtk-2.0 -@@ -399,6 +400,9 @@ foreach(_GTK2_component ${GTK2_FIND_COMP - _GTK2_FIND_INCLUDE_DIR(GTK2_GOBJECT_INCLUDE_DIR gobject/gobject.h) - _GTK2_FIND_LIBRARY (GTK2_GOBJECT_LIBRARY gobject false true) - -+ _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_PIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h) -+ _GTK2_FIND_LIBRARY (GTK2_GDK_PIXBUF_LIBRARY gdk_pixbuf false true) -+ - _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_INCLUDE_DIR gdk/gdk.h) - _GTK2_FIND_INCLUDE_DIR(GTK2_GDKCONFIG_INCLUDE_DIR gdkconfig.h) - _GTK2_FIND_LIBRARY (GTK2_GDK_LIBRARY gdk-x11 false true) diff --git a/cmake-gui.spec b/cmake-gui.spec index b3d1e6a..78071b8 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -1,5 +1,5 @@ # -# spec file for package cmake-gui (Version 2.8.2) +# spec file for package cmake-gui (Version 2.8.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: cmake-gui -Version: 2.8.2 +Version: 2.8.3 Release: 3 License: BSD3c Group: Development/Tools/Building @@ -27,6 +27,7 @@ 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} @@ -58,6 +59,7 @@ 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 new file mode 100644 index 0000000..3904586 --- /dev/null +++ b/cmake-no-system-libarchive.patch @@ -0,0 +1,13 @@ +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-support-new-python.diff b/cmake-support-new-python.diff deleted file mode 100644 index b0efbd1..0000000 --- a/cmake-support-new-python.diff +++ /dev/null @@ -1,26 +0,0 @@ -Index: cmake-2.8.2/Modules/FindPythonInterp.cmake -=================================================================== ---- cmake-2.8.2.orig/Modules/FindPythonInterp.cmake 2010-06-28 17:15:57.000000000 +0200 -+++ cmake-2.8.2/Modules/FindPythonInterp.cmake 2010-09-07 10:56:37.825385191 +0200 -@@ -20,7 +20,7 @@ - # License text for the above reference.) - - FIND_PROGRAM(PYTHON_EXECUTABLE -- NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python -+ NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python - PATHS - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath] - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] -Index: cmake-2.8.2/Modules/FindPythonLibs.cmake -=================================================================== ---- cmake-2.8.2.orig/Modules/FindPythonLibs.cmake 2010-06-28 17:15:57.000000000 +0200 -+++ cmake-2.8.2/Modules/FindPythonLibs.cmake 2010-09-07 11:48:34.313260226 +0200 -@@ -27,7 +27,7 @@ INCLUDE(CMakeFindFrameworks) - # Search for the python framework on Apple. - CMAKE_FIND_FRAMEWORKS(Python) - --FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) -+FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) - STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) - IF(WIN32) - FIND_LIBRARY(PYTHON_DEBUG_LIBRARY diff --git a/cmake.changes b/cmake.changes index 5a78c6b..1376165 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Nov 4 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 cdc1839..206f6a8 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,5 +1,5 @@ # -# spec file for package cmake (Version 2.8.2) +# spec file for package cmake (Version 2.8.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: cmake -Version: 2.8.2 +Version: 2.8.3 Release: 3 License: BSD3c Group: Development/Tools/Building @@ -27,9 +27,8 @@ Url: http://www.cmake.org/ Source0: %{name}-%{version}.tar.bz2 Patch4: cmake-disable-builtin-chrpath.diff Patch5: fortify-buffer-overflows.diff -Patch6: cmake-support-new-python.diff +Patch6: cmake-no-system-libarchive.patch # Should appear in cmake-2.8.3 -Patch7: cmake-FindGTK2-gdk-pixbuf.patch Summary: Cross-platform, open-source make system BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} @@ -58,8 +57,7 @@ Authors: %setup -q -n %{name}-%{version} %patch4 %patch5 -%patch6 -p1 -%patch7 -p1 +%patch6 -p1 %build export CXXFLAGS="$RPM_OPT_FLAGS" From f9669df140bf5e7ef82f2f9ceff7ce41e9197cc9b11d546a93ff9e98d73f4d80 Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Thu, 11 Nov 2010 14:08:11 +0000 Subject: [PATCH 2/2] use system libarchive OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=71 --- cmake-gui.changes | 8 ++++++++ cmake-gui.spec | 3 +-- cmake-no-system-libarchive.patch | 13 ------------- cmake.changes | 3 +-- cmake.spec | 5 ++--- 5 files changed, 12 insertions(+), 20 deletions(-) delete mode 100644 cmake-no-system-libarchive.patch 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"