rpms/cmake/F-9 cmake-2.6.1-parens.patch, NONE, 1.1 cmake.spec, 1.30, 1.31 sources, 1.14, 1.15 cmake-2.4.2-fedora.patch, 1.3, NONE cmake-2.4.5-xmlrpc.patch, 1.2, NONE

Tue Sep 2 21:57:39 UTC 2008

Author: orion

Update of /cvs/pkgs/rpms/cmake/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7336

Modified Files:
	cmake.spec sources 
Added Files:
	cmake-2.6.1-parens.patch 
Removed Files:
	cmake-2.4.2-fedora.patch cmake-2.4.5-xmlrpc.patch 
Log Message:
Update to 2.6.1 from current devel branch.


cmake-2.6.1-parens.patch:

--- NEW FILE cmake-2.6.1-parens.patch ---
diff -up cmake-2.6.1/Source/cmELF.cxx.parens cmake-2.6.1/Source/cmELF.cxx
--- cmake-2.6.1/Source/cmELF.cxx.parens	2008-08-01 10:34:52.000000000 -0500
+++ cmake-2.6.1/Source/cmELF.cxx	2008-08-26 14:58:23.000000000 -0500
@@ -884,8 +884,8 @@ cmELF::StringEntry const* cmELF::GetSONa
 cmELF::StringEntry const* cmELF::GetRPath()
 {
   if(this->Valid() &&
-     this->Internal->GetFileType() == cmELF::FileTypeExecutable ||
-     this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary)
+     (this->Internal->GetFileType() == cmELF::FileTypeExecutable ||
+     this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary) )
     {
     return this->Internal->GetRPath();
     }
@@ -899,8 +899,8 @@ cmELF::StringEntry const* cmELF::GetRPat
 cmELF::StringEntry const* cmELF::GetRunPath()
 {
   if(this->Valid() &&
-     this->Internal->GetFileType() == cmELF::FileTypeExecutable ||
-     this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary)
+     (this->Internal->GetFileType() == cmELF::FileTypeExecutable ||
+     this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary) )
     {
     return this->Internal->GetRunPath();
     }


Index: cmake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-9/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	2 Sep 2008 21:57:09 -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.1
+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.6/cmake-%{version}.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)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#See http://public.kitware.com/Bug/view.php?id=7392
+Patch1:         cmake-2.6.1-parens.patch   
+
 BuildRequires:  ncurses-devel, libX11-devel
+BuildRequires:  qt4-devel, desktop-file-utils
 BuildRequires:  curl-devel, expat-devel, zlib-devel
 %{?!with_bootstrap:BuildRequires: xmlrpc-c-devel}
 Requires:       rpm
@@ -30,18 +32,30 @@
 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}
+%patch1 -p1 -b .parens
+# Fixup permissions
+find -name \*.h -o -name \*.cxx -print0 | xargs -0 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 +69,30 @@
 # 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
+unset DISPLAY
+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 +105,47 @@
 %{_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
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cmake/F-9/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	2 Sep 2008 21:57:09 -0000	1.15
@@ -1 +1 @@
-f5dd061c31765a49dc17ae8bdc986779  cmake-2.4.8.tar.gz
+6717f4bc3cfcced4172ad98660ce7599  cmake-2.6.1.tar.gz


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


--- cmake-2.4.5-xmlrpc.patch DELETED ---


