testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

use system libarchive

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=71
This commit is contained in:
Petr Uzel 2010-11-11 14:08:11 +00:00 committed by Git OBS Bridge
parent 7c768aab57
commit f9669df140
5 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake-gui.changes
View File

@ -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 Mon Sep 13 18:09:02 UTC 2010 - kkaempf@novell.com

3
cmake-gui.spec
View File

@ -27,7 +27,6 @@ Url: http://www.cmake.org/
Source0: cmake-%{version}.tar.bz2 Source0: cmake-%{version}.tar.bz2
Patch4: cmake-disable-builtin-chrpath.diff Patch4: cmake-disable-builtin-chrpath.diff
Patch5: fortify-buffer-overflows.diff Patch5: fortify-buffer-overflows.diff
Patch6: cmake-no-system-libarchive.patch
Summary: CMake graphical user interface Summary: CMake graphical user interface
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} %if 0%{?suse_version}
@ -41,6 +40,7 @@ BuildRequires: expat-devel
BuildRequires: curl-devel BuildRequires: curl-devel
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libqt4-devel BuildRequires: libqt4-devel
BuildRequires: libarchive-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: zlib-devel BuildRequires: zlib-devel
@ -59,7 +59,6 @@ Authors:
%setup -q -n cmake-%{version} %setup -q -n cmake-%{version}
%patch4 %patch4
%patch5 %patch5
%patch6 -p1
%build %build
EXTRA_FLAGS="--qt-gui" EXTRA_FLAGS="--qt-gui"

13
cmake-no-system-libarchive.patch
View File

@ -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)

3
cmake.changes
View File

@ -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 - update to cmake-2.8.3
- see /usr/share/doc/packages/cmake/Changelog for changes - see /usr/share/doc/packages/cmake/Changelog for changes
- drop cmake-FindGTK2-gdk-pixbuf.patch (fixed upstream) - drop cmake-FindGTK2-gdk-pixbuf.patch (fixed upstream)
- drop cmake-support-new-python.diff (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 Tue Sep 14 12:39:36 UTC 2010 - puzel@novell.com

5
cmake.spec
View File

@ -1,4 +1,4 @@
#
# spec file for package cmake (Version 2.8.3) # spec file for package cmake (Version 2.8.3)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
@ -27,7 +27,6 @@ Url: http://www.cmake.org/
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
Patch4: cmake-disable-builtin-chrpath.diff Patch4: cmake-disable-builtin-chrpath.diff
Patch5: fortify-buffer-overflows.diff Patch5: fortify-buffer-overflows.diff
Patch6: cmake-no-system-libarchive.patch
# Should appear in cmake-2.8.3 # Should appear in cmake-2.8.3
Summary: Cross-platform, open-source make system Summary: Cross-platform, open-source make system
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -41,6 +40,7 @@ BuildRequires: expat-devel
%endif %endif
BuildRequires: curl-devel BuildRequires: curl-devel
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libarchive-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
@ -57,7 +57,6 @@ Authors:
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch4 %patch4
%patch5 %patch5
%patch6 -p1
%build %build
export CXXFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS"