rpms/cmake/devel cmake-2.6.0-jni.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 cmake.spec, 1.30, 1.31 sources, 1.14, 1.15 cmake-2.4.2-fedora.patch, 1.3, NONE

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/cmake/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8939

Modified Files:
	.cvsignore cmake.spec sources 
Added Files:
	cmake-2.6.0-jni.patch 
Removed Files:
	cmake-2.4.2-fedora.patch 
Log Message:
* 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


cmake-2.6.0-jni.patch:

--- NEW FILE cmake-2.6.0-jni.patch ---
--- cmake-2.4.3/Modules/FindJNI.cmake.orig	2006-10-31 16:07:57.000000000 -0700
+++ cmake-2.4.3/Modules/FindJNI.cmake	2006-10-31 16:09:36.000000000 -0700
@@ -14,6 +14,7 @@
   $ENV{JAVA_HOME}/jre/lib/i386
   $ENV{JAVA_HOME}/jre/lib/amd64
   /usr/lib
+  /usr/lib/jvm/java/lib
   /usr/local/lib
   /usr/lib/java/jre/lib/i386
   /usr/local/lib/java/jre/lib/i386
@@ -27,6 +28,7 @@
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
   $ENV{JAVA_HOME}/include
   /usr/include 
+  /usr/lib/jvm/java/include
   /usr/local/include
   /usr/lib/java/include
   /usr/local/lib/java/include


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	22 Jan 2008 22:47:30 -0000	1.14
+++ .cvsignore	28 Mar 2008 19:32:24 -0000	1.15
@@ -1 +1 @@
-cmake-2.4.8.tar.gz
+cmake-2.6.0-RC-5.tar.gz


Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/cmake.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cmake.spec	28 Mar 2008 15:11:31 -0000	1.30
+++ cmake.spec	28 Mar 2008 19:32:24 -0000	1.31
@@ -2,20 +2,22 @@
 # or architecture
 %bcond_with 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
+Name:           cmake
+Version:        2.6.0
+Release:        0.rc5.1%{?dist}
+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}-RC-5.tar.gz
 Source2:        macros.cmake
-Patch0:         cmake-2.4.2-fedora.patch
+Patch0:         cmake-2.6.0-jni.patch
 Patch1:         cmake-2.4.5-xmlrpc.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch2:         cmake-2.6.0-systemlibs.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel, libX11-devel
+BuildRequires:  qt-devel, desktop-file-utils
 BuildRequires:  curl-devel, expat-devel, zlib-devel
 %{?!with_bootstrap:BuildRequires: xmlrpc-c-devel}
 Requires:       rpm
@@ -30,18 +32,32 @@
 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
+%setup -q -n %{name}-%{version}-RC-5
+%patch -p1 -b .jni
 %patch1 -p1 -b .xmlrpc
+%patch2 -p1 -b .systemlibs
+# Fixup permissions
+find -name \*.h -o -name \*.cxx | xargs chmod -x
 
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
-./bootstrap --init=%SOURCE1 --prefix=%{_prefix} --datadir=/share/%{name} \
+./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}
 
 
@@ -55,16 +71,29 @@
 # RPM macros
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
+# Desktop file
+desktop-file-install --delete-original \
+  --dir=%{buildroot}%{_datadir}/applications \
+  %{buildroot}/%{_datadir}/applications/CMake.desktop
 
 
 %check
-ctest -V
+bin/ctest -V
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%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 || :
+
+
 %files
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/rpm/macros.cmake
@@ -77,8 +106,19 @@
 %{_mandir}/man1/*.1*
 %{_datadir}/emacs/
 
+%files gui
+%defattr(-,root,root,-)
+%{_bindir}/cmake-gui
+%{_datadir}/applications/CMake.desktop
+%{_datadir}/mime/packages/cmakecache.xml
+%{_datadir}/pixmaps/CMakeSetup.png
+
 
 %changelog
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Jan 2008 22:47:30 -0000	1.14
+++ sources	28 Mar 2008 19:32:24 -0000	1.15
@@ -1 +1 @@
-f5dd061c31765a49dc17ae8bdc986779  cmake-2.4.8.tar.gz
+4c7961db5afd732506abafdbcfa904eb  cmake-2.6.0-RC-5.tar.gz


--- cmake-2.4.2-fedora.patch DELETED ---