From c7af005d808b83b8b0e26ae3fa43d19f717650ba Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Dec 18 2006 23:37:24 +0000 Subject: Use system libraries (bootstrap --system-libs) --- diff --git a/cmake-2.4.5-xmlrpc.patch b/cmake-2.4.5-xmlrpc.patch new file mode 100644 index 0000000..c0955b3 --- /dev/null +++ b/cmake-2.4.5-xmlrpc.patch @@ -0,0 +1,10 @@ +--- cmake-2.4.5/Modules//FindXMLRPC.cmake.xmlrpc 2006-12-18 16:37:09.000000000 -0700 ++++ cmake-2.4.5/Modules//FindXMLRPC.cmake 2006-12-18 16:37:16.000000000 -0700 +@@ -102,7 +102,6 @@ + FIND_LIBRARY(XMLRPC_${name}_LIBRARY + NAMES ${name} + PATHS ${XMLRPC_LIBRARY_DIRS} +- NO_DEFAULT_PATH + ) + MARK_AS_ADVANCED(XMLRPC_${name}_LIBRARY) + diff --git a/cmake.spec b/cmake.spec index 7ebc9f3..0f60192 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,6 +1,6 @@ Name: cmake Version: 2.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -9,8 +9,11 @@ URL: http://www.cmake.org Source0: http://www.cmake.org/files/v2.4/cmake-%{version}.tar.gz Source1: cmake-init-fedora Patch0: cmake-2.4.2-fedora.patch +Patch1: cmake-2.4.5-xmlrpc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, libX11-devel +BuildRequires: curl-devel, expat-devel, xmlrpc-c-devel, zlib-devel + %description CMake is used to control the software compilation process using simple @@ -24,13 +27,15 @@ generation, code generation, and template instantiation. %prep %setup -q %patch -p1 -b .fedora +%patch1 -p1 -b .xmlrpc %build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" ./bootstrap --init=%SOURCE1 --prefix=%{_prefix} --datadir=/share/%{name} \ - --docdir=/share/doc/%{name}-%{version} --mandir=/share/man + --docdir=/share/doc/%{name}-%{version} --mandir=/share/man \ + --system-libs make %{?_smp_mflags} @@ -60,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Dec 18 2006 Orion Poplawski - 2.4.5-2 +- Use system libraries (bootstrap --system-libs) + * Tue Dec 5 2006 Orion Poplawski - 2.4.5-1 - Update to 2.4.5