rpms/cmake/devel .cvsignore, 1.8, 1.9 cmake.spec, 1.16, 1.17 macros.cmake, 1.1, 1.2 sources, 1.8, 1.9
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Wed Jun 27 17:01:03 UTC 2007
Author: orion
Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12786
Modified Files:
.cvsignore cmake.spec macros.cmake sources
Log Message:
- Revert to 2.4.6 (2.4.7 was hosed and never built)
- Update macros.cmake to add CMAKE_INSTALL_LIBDIR, INCLUDE_INSTALL_DIR,
LIB_INSTALL_DIR, SYSCONF_INSTALL_DIR, and SHARE_INSTALL_PREFIX
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 6 Jun 2007 18:36:54 -0000 1.8
+++ .cvsignore 27 Jun 2007 17:00:25 -0000 1.9
@@ -1 +1 @@
-cmake-2.4.7-RC-10.tar.gz
+cmake-2.4.6.tar.gz
Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cmake.spec 6 Jun 2007 18:36:55 -0000 1.16
+++ cmake.spec 27 Jun 2007 17:00:25 -0000 1.17
@@ -1,6 +1,6 @@
Name: cmake
-Version: 2.4.7
-Release: 0.rc10%{?dist}
+Version: 2.4.6
+Release: 4%{?dist}
Summary: Cross-platform make system
Group: Development/Tools
@@ -73,8 +73,9 @@
%changelog
-* Wed Jun 06 2007 Orion Poplawski <orion at cora.nwra.com> - 2.4.7-0.rc10
-- Update to 2.4.7-RC-10
+* Wed Jun 27 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/devel/macros.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- macros.cmake 6 Apr 2007 16:56:30 -0000 1.1
+++ macros.cmake 27 Jun 2007 17:00: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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 6 Jun 2007 18:36:55 -0000 1.8
+++ sources 27 Jun 2007 17:00:25 -0000 1.9
@@ -1 +1 @@
-90aba1e8b8e44c45c06540a37ef68d0b cmake-2.4.7-RC-10.tar.gz
+c99c747ad8e9bfb3bef9cca875a52129 cmake-2.4.6.tar.gz
More information about the scm-commits
mailing list