Update to 2.6.1 from current devel branch.
This commit is contained in:
Orion Poplawski
parent
0e29c853b8
commit
b99ba5c72e
|
|
@ -1,36 +0,0 @@
|
|||
--- cmake-2.4.2/Modules/FindSWIG.cmake.fedora 2006-07-11 10:21:11.000000000 -0600
|
||||
+++ cmake-2.4.2/Modules/FindSWIG.cmake 2006-07-11 10:22:47.000000000 -0600
|
||||
@@ -7,13 +7,11 @@
|
||||
SET(SWIG_FOUND FOOBAR)
|
||||
FIND_PATH(SWIG_DIR
|
||||
SWIGConfig.cmake
|
||||
- /usr/share/swig1.3
|
||||
- /usr/lib/swig1.3
|
||||
+ /usr/share/swig/*
|
||||
/usr/local/share/swig1.3)
|
||||
FIND_PATH(SWIG_DIR
|
||||
swig.swg
|
||||
- /usr/share/swig1.3
|
||||
- /usr/lib/swig1.3
|
||||
+ /usr/share/swig/*
|
||||
/usr/local/share/swig1.3)
|
||||
IF(EXISTS ${SWIG_DIR})
|
||||
IF("x${SWIG_DIR}x" STREQUAL "x${CMAKE_ROOT}/Modulesx")
|
||||
--- 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
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
--- cmake-2.4.5/Modules//FindXMLRPC.cmake.xmlrpc 2006-12-18 16:37:09.000000000 -0700
|
||||
+++ cmake-2.4.5/Modules//FindXMLRPC.cmake 2006-12-18 16:37:16.000000000 -0700
|
||||
@@ -102,7 +102,6 @@
|
||||
FIND_LIBRARY(XMLRPC_${name}_LIBRARY
|
||||
NAMES ${name}
|
||||
PATHS ${XMLRPC_LIBRARY_DIRS}
|
||||
- NO_DEFAULT_PATH
|
||||
)
|
||||
MARK_AS_ADVANCED(XMLRPC_${name}_LIBRARY)
|
||||
|
||||
--- cmake-2.4.5/Utilities/cm_xmlrpc.h.xmlrpc 2006-12-04 09:04:06.000000000 -0700
|
||||
+++ cmake-2.4.5/Utilities/cm_xmlrpc.h 2006-12-18 17:00:01.000000000 -0700
|
||||
@@ -20,8 +20,8 @@
|
||||
/* Use the xmlrpc library configured for CMake. */
|
||||
#include "cmThirdParty.h"
|
||||
#ifdef CMAKE_USE_SYSTEM_XMLRPC
|
||||
-# include <xmlrpc.h>
|
||||
-# include <xmlrpc_client.h>
|
||||
+# include <xmlrpc-c/base.h>
|
||||
+# include <xmlrpc-c/client.h>
|
||||
#else
|
||||
# include <cmxmlrpc/xmlrpc.h>
|
||||
# include <cmxmlrpc/xmlrpc_client.h>
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
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();
|
||||
}
|
||||
101
cmake.spec
101
cmake.spec
|
|
@ -2,20 +2,22 @@
|
|||
# or architecture
|
||||
%bcond_with bootstrap
|
||||
|
||||
Name: cmake
|
||||
Version: 2.4.8
|
||||
Release: 3%{?dist}
|
||||
Summary: Cross-platform make system
|
||||
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.4/cmake-%{version}.tar.gz
|
||||
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 @@ 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}
|
||||
%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 @@ 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/
|
||||
# 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 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{_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@cora.nwra.com> - 2.6.1-3
|
||||
- Drop jni patch, applied upstream.
|
||||
|
||||
* Tue Aug 26 2008 Rex Dieter <rdieter@fedoraproject.org> - 2.6.1-2
|
||||
- attempt to patch logic error, crasher
|
||||
|
||||
* Tue Aug 5 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.1-1
|
||||
- Update to 2.6.1
|
||||
|
||||
* Mon Jul 14 2008 Orion Poplawski <orion@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@cora.nwra.com> - 2.6.0-1
|
||||
- Update to 2.6.0
|
||||
|
||||
* Mon May 5 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.0-0.rc10.1
|
||||
- Update to 2.6.0-RC-10
|
||||
|
||||
* Thu Apr 24 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.0-0.rc9.1
|
||||
- Update to 2.6.0-RC-9
|
||||
|
||||
* Fri Apr 11 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.0-0.rc8.1
|
||||
- Update to 2.6.0-RC-8
|
||||
|
||||
* Thu Apr 3 2008 Orion Poplawski <orion@cora.nwra.com> - 2.6.0-0.rc6.1
|
||||
- Update to 2.6.0-RC-6
|
||||
|
||||
* Fri Mar 28 2008 Orion Poplawski <orion@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@cora.nwra.com> - 2.4.8-3
|
||||
- Add macro for bootstrapping new release/architecture
|
||||
- Add %%check section
|
||||
|
|
|
|||
Loading…
Reference in New Issue