rpms
/
cmake
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- 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
This commit is contained in:
Orion Poplawski 2007-06-27 17:00:25 +00:00
parent 8c3a36702e
commit a1819c2ef4
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
cmake-2.4.7-RC-10.tar.gz
cmake-2.4.6.tar.gz

9
cmake.spec
View File

@ -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 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Jun 06 2007 Orion Poplawski <orion@cora.nwra.com> - 2.4.7-0.rc10
- Update to 2.4.7-RC-10
* Wed Jun 27 2007 Orion Poplawski <orion@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@cora.nwra.com> - 2.4.6-3
- Apply patch from upstream CVS to fix .so install permissions (bug #235673)

7
macros.cmake
View File

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

2
sources
View File

@ -1 +1 @@
90aba1e8b8e44c45c06540a37ef68d0b cmake-2.4.7-RC-10.tar.gz
c99c747ad8e9bfb3bef9cca875a52129 cmake-2.4.6.tar.gz