rpms/cmake/FC-5 cmake-2.4.5-xmlrpc.patch, NONE, 1.1 cmake.spec, 1.7, 1.8
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Tue Dec 19 17:11:42 UTC 2006
Author: orion
Update of /cvs/extras/rpms/cmake/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12579/FC-5
Modified Files:
cmake.spec
Added Files:
cmake-2.4.5-xmlrpc.patch
Log Message:
Use system libraries (bootstrap --system-libs)
cmake-2.4.5-xmlrpc.patch:
--- NEW FILE cmake-2.4.5-xmlrpc.patch ---
--- 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)
--- cmake-2.4.5/Utilities/cm_xmlrpc.h.xmlrpc 2006-12-04 09:04:06.000000000 -0700
+++ cmake-2.4.5/Utilities/cm_xmlrpc.h 2006-12-18 17:00:01.000000000 -0700
@@ -20,8 +20,8 @@
/* Use the xmlrpc library configured for CMake. */
#include "cmThirdParty.h"
#ifdef CMAKE_USE_SYSTEM_XMLRPC
-# include <xmlrpc.h>
-# include <xmlrpc_client.h>
+# include <xmlrpc-c/base.h>
+# include <xmlrpc-c/client.h>
#else
# include <cmxmlrpc/xmlrpc.h>
# include <cmxmlrpc/xmlrpc_client.h>
Index: cmake.spec
===================================================================
RCS file: /cvs/extras/rpms/cmake/FC-5/cmake.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cmake.spec 5 Dec 2006 16:52:15 -0000 1.7
+++ cmake.spec 19 Dec 2006 17:11:11 -0000 1.8
@@ -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 @@
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 @@
%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 @@
%changelog
+* Mon Dec 18 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.5-2
+- Use system libraries (bootstrap --system-libs)
+
* Tue Dec 5 2006 Orion Poplawski <orion at cora.nwra.com> - 2.4.5-1
- Update to 2.4.5
More information about the fedora-extras-commits
mailing list