[cmake/el5/master] Update to 2.6.4

Tue Aug 17 20:25:26 UTC 2010

commit e008b31674e8c8b6c7dbb514a9f62a8c7315d157
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Aug 17 14:25:18 2010 -0600

    Update to 2.6.4

 .gitignore               |    2 +-
 cmake-2.4.2-fedora.patch |   36 ---------
 cmake-2.4.5-xmlrpc.patch |   23 ------
 cmake-2.6.4-vtk64.patch  |   16 ++++
 cmake-ppc64-awtdir.patch |   11 +++
 cmake.spec               |  185 +++++++++++++++++++++++++++++++++++++++++-----
 macros.cmake             |    6 +-
 sources                  |    2 +-
 8 files changed, 199 insertions(+), 82 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index dcdb5f8..d8a0347 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-cmake-2.4.8.tar.gz
+cmake-2.6.4.tar.gz
diff --git a/cmake-2.6.4-vtk64.patch b/cmake-2.6.4-vtk64.patch
new file mode 100644
index 0000000..9bee3da
--- /dev/null
+++ b/cmake-2.6.4-vtk64.patch
@@ -0,0 +1,16 @@
+--- cmake-2.6.4/Modules/FindVTK.cmake.vtk64	2009-04-28 14:22:59.000000000 -0600
++++ cmake-2.6.4/Modules/FindVTK.cmake	2009-06-03 10:01:25.580512670 -0600
+@@ -45,9 +45,13 @@
+   SET(VTK_DIR_SEARCH "")
+   FOREACH(dir ${VTK_DIR_SEARCH2})
+     SET(VTK_DIR_SEARCH ${VTK_DIR_SEARCH}
++      ${dir}/../lib64/vtk-5.2
+       ${dir}/../lib/vtk-5.2
++      ${dir}/../lib64/vtk-5.1
+       ${dir}/../lib/vtk-5.1
++      ${dir}/../lib64/vtk-5.0
+       ${dir}/../lib/vtk-5.0
++      ${dir}/../lib64/vtk
+       ${dir}/../lib/vtk
+       )
+   ENDFOREACH(dir)
diff --git a/cmake-ppc64-awtdir.patch b/cmake-ppc64-awtdir.patch
new file mode 100644
index 0000000..b14b933
--- /dev/null
+++ b/cmake-ppc64-awtdir.patch
@@ -0,0 +1,11 @@
+diff -rupN cmake-2.6.4.old/Modules/FindJNI.cmake cmake-2.6.4/Modules/FindJNI.cmake
+--- cmake-2.6.4.old/Modules/FindJNI.cmake	2009-04-28 16:22:59.000000000 -0400
++++ cmake-2.6.4/Modules/FindJNI.cmake	2009-11-15 03:26:13.000000000 -0500
+@@ -22,6 +22,7 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES
+   $ENV{JAVA_HOME}/jre/lib/i386
+   $ENV{JAVA_HOME}/jre/lib/amd64
+   $ENV{JAVA_HOME}/jre/lib/ppc
++  $ENV{JAVA_HOME}/jre/lib/ppc64
+   /usr/lib
+   /usr/local/lib
+   /usr/lib/jvm/java/lib
diff --git a/cmake.spec b/cmake.spec
index a5ca8ac..e9ad87d 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -1,23 +1,38 @@
 # Set to bcond_without or use --with bootstrap if bootstrapping a new release
 # or architecture
 %bcond_without bootstrap
-
-Name:		cmake
-Version:	2.4.8
-Release:	3%{?dist}
-Summary:	Cross-platform make system
-
-Group:		Development/Tools
-License:	BSD
-URL:		http://www.cmake.org
-Source0:	http://www.cmake.org/files/v2.4/cmake-%{version}.tar.gz
+# Set to bcond_with or use --without gui to disable qt4 gui build
+%bcond_with gui
+# Set to RC version if building RC, else %{nil}
+%define rcver %{nil}
+
+Name:           cmake
+Version:        2.6.4
+Release:        5%{?dist}.1
+Summary:        Cross-platform make system
+
+Group:          Development/Tools
+License:        BSD
+URL:            http://www.cmake.org
+Source0:        http://www.cmake.org/files/v2.6/cmake-%{version}%{rcver}.tar.gz
 Source2:        macros.cmake
-Patch0:         cmake-2.4.2-fedora.patch
-Patch1:         cmake-2.4.5-xmlrpc.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#Find UseVTK.cmake in /usr/lib64/vtk-* on 64-bit machines
+#http://public.kitware.com/mantis/view.php?id=9105
+Patch0:         cmake-2.6.4-vtk64.patch
+#Add ppc64 to FindJNI.cmake
+Patch1:         cmake-ppc64-awtdir.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires:  ncurses-devel, libX11-devel
 BuildRequires:  curl-devel, expat-devel, zlib-devel
-%{?!with_bootstrap:BuildRequires: xmlrpc-c-devel}
+%if %{without bootstrap}
+BuildRequires: xmlrpc-c-devel
+%endif
+%if %{with gui}
+BuildRequires: qt4-devel >= 4.3.0
+BuildRequires: desktop-file-utils
+%define qt_gui --qt-gui
+%endif
 Requires:       rpm
 
 
@@ -30,10 +45,21 @@ to support complex environments requiring system configuration, pre-processor
 generation, code generation, and template instantiation.
 
 
+%package        gui
+Summary:        Qt GUI for %{name}
+Group:          Development/Tools
+Requires:       %{name} = %{version}-%{release}
+
+%description    gui
+The %{name}-gui package contains the Qt based GUI for CMake.
+
+
 %prep
-%setup -q
-%patch -p1 -b .fedora
-%patch1 -p1 -b .xmlrpc
+%setup -q -n %{name}-%{version}%{rcver}
+%patch0 -p1 -b .vtk64
+%patch1 -p1 -b .ppc64
+# Fixup permissions
+find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
 
 %build
@@ -41,7 +67,9 @@ export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
 ./bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \
             --docdir=/share/doc/%{name}-%{version} --mandir=/share/man \
-            --%{?with_bootstrap:no-}system-libs
+            --%{?with_bootstrap:no-}system-libs \
+            --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \
+            %{?qt_gui}
 make VERBOSE=1 %{?_smp_mflags}
 
 
@@ -53,19 +81,38 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
 cp -a Example $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/
 install -m 0644 Docs/cmake-mode.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
 # RPM macros
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
+install -p -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.cmake
+sed -i -e "s|@@CMAKE_VERSION@@|%{version}|" $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.cmake
+touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.cmake
+
+%if %{with gui}
+# Desktop file
+desktop-file-install --delete-original \
+  --dir=%{buildroot}%{_datadir}/applications \
+  %{buildroot}/%{_datadir}/applications/CMake.desktop
+%endif
 
 
 %check
-# Exclude curl test which tries to make network connections
-bin/ctest -V -E curl
+unset DISPLAY
+bin/ctest -V
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%if %{with gui}
+%post gui
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+
+%postun gui
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+%endif
+
+
 %files
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/rpm/macros.cmake
@@ -78,8 +125,106 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*.1*
 %{_datadir}/emacs/
 
+%if %{with gui}
+%files gui
+%defattr(-,root,root,-)
+%{_bindir}/cmake-gui
+%{_datadir}/applications/CMake.desktop
+%{_datadir}/mime/packages/cmakecache.xml
+%{_datadir}/pixmaps/CMakeSetup.png
+%endif
+
 
 %changelog
+* Tue Aug 17 2010 Orion Poplawski <orion at cora.nwra.com> - 2.6.4-5.1
+- Build bootstrap - EL5 doesn't have xmlrpc-c yet
+- Don't build qui - qt is too old
+
+* Tue Nov 24 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.4-5
+- Add patch to find JNI on ppc64 (bug #537628)
+
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.4-4
+- macro.cmake: prefixes cmake with the package being builts bindir (#523878)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 3 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.4-2
+- Add patch to find VTK on 64-bit machines (bug #503945)
+
+* Wed Apr 29 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.4-1
+- Update to 2.6.4
+- Drop patch for bug #475876 fixed upstream
+
+* Mon Mar 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.3-3
+- macros.cmake: +%%_cmake_version
+
+* Mon Mar 09 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.6.3-2
+- Fix crash during kdepimlibs build (#475876)
+
+* Mon Feb 23 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-1
+- Update to 2.6.3 final
+
+* Tue Feb 17 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-0.4.rc13
+- Update to 2.6.3-RC-13
+
+* Tue Jan 13 2009 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-0.3.rc8
+- Update to 2.6.3-RC-8
+
+* Sun Jan 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.6.3-0.2.rc5
+- macros.cmake: add -DCMAKE_SKIP_RPATH:BOOL=ON
+- fix Release tag
+
+* Wed Dec 10 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.3-0.rc5.1
+- Update to 2.6.3-RC-5
+
+* Tue Dec 2 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.6.2-3
+- Add -DCMAKE_VERBOSE_MAKEFILE=ON to %%cmake (#474053)
+- preserve timestamp of macros.cmake
+- cosmetics
+
+* Tue Oct 21 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-2
+- Allow conditional build of gui
+
+* Mon Sep 29 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-1
+- Update to 2.6.2
+
+* Mon Sep 8 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.2-0.rc3.1
+- Update to 2.6.2-RC-2
+- Drop parens patch fixed upstream
+
+* Tue Sep 2 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.1-3
+- Drop jni patch, applied upstream.
+
+* Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.6.1-2
+- attempt to patch logic error, crasher
+
+* Tue Aug 5 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.1-1
+- Update to 2.6.1
+
+* Mon Jul 14 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.1-0.rc8.1
+- Update to 2.6.1-RC-8
+- Drop xmlrpc patch fixed upstream
+
+* Tue May 6 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-1
+- Update to 2.6.0
+
+* Mon May 5 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-0.rc10.1
+- Update to 2.6.0-RC-10
+
+* Thu Apr 24 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-0.rc9.1
+- Update to 2.6.0-RC-9
+
+* Fri Apr 11 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-0.rc8.1
+- Update to 2.6.0-RC-8
+
+* Thu Apr 3 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-0.rc6.1
+- Update to 2.6.0-RC-6
+
+* Fri Mar 28 2008 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-0.rc5.1
+- Update to 2.6.0-RC-5
+- Add gui sub-package for Qt frontend
+
 * Fri Mar 7 2008 Orion Poplawski <orion at cora.nwra.com> - 2.4.8-3
 - Add macro for bootstrapping new release/architecture
 - Add %%check section
diff --git a/macros.cmake b/macros.cmake
index 6d31bf1..e5f066e 100644
--- a/macros.cmake
+++ b/macros.cmake
@@ -2,13 +2,16 @@
 # Macros for cmake
 #
 %_cmake_lib_suffix64 -DLIB_SUFFIX=64
-%__cmake %{_bindir}/cmake
+%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
+%_cmake_version @@CMAKE_VERSION@@
+%__cmake /usr/bin/cmake
 
 %cmake \
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
   %__cmake \\\
+        -DCMAKE_VERBOSE_MAKEFILE=ON \\\
         -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
         -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
         -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
@@ -18,4 +21,5 @@
 %if "%{?_lib}" == "lib64" \
         %{?_cmake_lib_suffix64} \\\
 %endif \
+        %{?_cmake_skip_rpath} \\\
         -DBUILD_SHARED_LIBS:BOOL=ON
diff --git a/sources b/sources
index c69a3f3..804ecf1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f5dd061c31765a49dc17ae8bdc986779  cmake-2.4.8.tar.gz
+50f387d0436696c4a68b5512a72c9cde  cmake-2.6.4.tar.gz
