rpms/cmake/FC-6 cmake.spec, 1.13, 1.14 macros.cmake, 1.1, 1.2 cmake-2.4.6-soexe.patch, 1.1, NONE
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Wed Aug 22 03:54:57 UTC 2007
Author: orion
Update of /cvs/pkgs/rpms/cmake/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17466/FC-6
Modified Files:
cmake.spec macros.cmake
Removed Files:
cmake-2.4.6-soexe.patch
Log Message:
F-7/clog
Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/FC-6/cmake.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cmake.spec 27 Apr 2007 15:46:11 -0000 1.13
+++ cmake.spec 22 Aug 2007 03:54:25 -0000 1.14
@@ -1,6 +1,6 @@
Name: cmake
-Version: 2.4.6
-Release: 3%{?dist}
+Version: 2.4.7
+Release: 1%{?dist}
Summary: Cross-platform make system
Group: Development/Tools
@@ -11,7 +11,6 @@
Source2: macros.cmake
Patch0: cmake-2.4.2-fedora.patch
Patch1: cmake-2.4.5-xmlrpc.patch
-Patch2: cmake-2.4.6-soexe.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
@@ -31,7 +30,6 @@
%setup -q
%patch -p1 -b .fedora
%patch1 -p1 -b .xmlrpc
-%patch2 -p1 -b .soexe
%build
@@ -73,6 +71,13 @@
%changelog
+* Tue Aug 21 2007 Orion Poplawski <orion at cora.nwra.com> - 2.4.7-1
+- Update to 2.4.7
+
+* Tue Jul 24 2007 Orion Poplawski <orion at cora.nwra.com> - 2.4.6-4
+- Update macros.cmake to add CMAKE_INSTALL_LIBDIR, INCLUDE_INSTALL_DIR,
+ LIB_INSTALL_DIR, SYSCONF_INSTALL_DIR, and SHARE_INSTALL_PREFIX
+
* Mon Apr 16 2007 Orion Poplawski <orion at cora.nwra.com> - 2.4.6-3
- Apply patch from upstream CVS to fix .so install permissions (bug #235673)
Index: macros.cmake
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/FC-6/macros.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- macros.cmake 27 Apr 2007 15:46:11 -0000 1.1
+++ macros.cmake 22 Aug 2007 03:54:25 -0000 1.2
@@ -9,8 +9,13 @@
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
%__cmake \\\
+ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
+ -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
+ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
+ -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
+ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
+ -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
%if "%{?_lib}" == "lib64" \
%{?_cmake_lib_suffix64} \\\
%endif \
- -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
-DBUILD_SHARED_LIBS:BOOL=ON
--- cmake-2.4.6-soexe.patch DELETED ---
More information about the scm-commits
mailing list