Mailinglist Archive: opensuse-commit (1295 mails)
| < Previous | Next > |
commit cmake
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 23 Jul 2007 19:55:09 +0200
- Message-id: <20070723175509.B0D83678182@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package cmake
checked in at Mon Jul 23 19:55:09 CEST 2007.
--------
--- cmake/cmake.changes 2007-04-27 15:43:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/cmake/cmake.changes 2007-07-23 18:29:02.504966000 +0200
@@ -1,0 +2,7 @@
+Fri Jul 20 13:11:34 CEST 2007 - pcerny@xxxxxxx
+
+- update to 2.4.7 - several bugfixes
+ (KDevelop problem among others,
+ see ChangeLog.manual for more details)
+
+-------------------------------------------------------------------
Old:
----
cmake-2.4.5_use_intree_xmlrpc.patch
cmake-2.4.6.tar.bz2
less-verbosity.diff
use-shared-python-lib.diff
New:
----
cmake-2.4.7-less_verbosity.patch
cmake-2.4.7.tar.bz2
cmake-2.4.7-use_intree_xmlrpc.patch
cmake-2.4.7-use_shared_python_lib.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cmake.spec ++++++
--- /var/tmp/diff_new_pack.H32468/_old 2007-07-23 19:50:17.000000000 +0200
+++ /var/tmp/diff_new_pack.H32468/_new 2007-07-23 19:50:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package cmake (Version 2.4.6)
+# spec file for package cmake (Version 2.4.7)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,10 @@
# norootforbuild
Name: cmake
-Version: 2.4.6
-Release: 12
-#
-License: Other License(s), see package
+Version: 2.4.7
+Release: 1
+License: Redistribution and use in source and binary forms, with or without
Group: Development/Tools/Building
-#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 1020
BuildRequires: libexpat-devel
@@ -24,13 +22,11 @@
BuildRequires: expat
%endif
BuildRequires: curl-devel expat gcc-c++ libstdc++-devel ncurses-devel
-#
URL: http://www.cmake.org/
Source0: %{name}-%{version}.tar.bz2
-Patch: cmake-2.4.5_use_intree_xmlrpc.patch
-Patch1: use-shared-python-lib.diff
-Patch2: less-verbosity.diff
-#
+Patch0: cmake-2.4.7-use_intree_xmlrpc.patch
+Patch1: cmake-2.4.7-less_verbosity.patch
+Patch2: cmake-2.4.7-use_shared_python_lib.patch
Summary: Cross-platform, open-source make system
%description
@@ -44,22 +40,27 @@
%prep
%setup -q -n %name-%version
-%patch
+%patch0
%patch1
%patch2
%build
export CXXFLAGS="$RPM_OPT_FLAGS"
-export CFLAGS=$CXXFLAGS
-./configure --prefix=/usr --datadir=/share/%name --docdir=/share/doc/packages/%name --mandir=/share/man --system-libs
+export CFLAGS="$CXXFLAGS"
+./configure \
+ --prefix=%{_prefix} \
+ --datadir=/share/%{name} \
+ --docdir=/share/doc/packages/%{name} \
+ --mandir=/share/man \
+ --system-libs
make VERBOSE=1 %{?jobs:-j %jobs}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
-find $RPM_BUILD_ROOT/usr/share/cmake -type f -print0 | xargs -0 chmod 644
+make DESTDIR=%{buildroot} install
+find %{buildroot}/usr/share/cmake -type f -print0 | xargs -0 chmod 644
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
%defattr(-,root,root)
@@ -74,6 +75,10 @@
/usr/share/man/man1/ctest.1.gz
%changelog
+* Fri Jul 20 2007 - pcerny@xxxxxxx
+- update to 2.4.7 - several bugfixes
+ (KDevelop problem among others,
+ see ChangeLog.manual for more details)
* Fri Apr 27 2007 - dmueller@xxxxxxx
- expat -> libexpat-devel
* Thu Mar 29 2007 - dmueller@xxxxxxx
++++++ cmake-2.4.7-less_verbosity.patch ++++++
--- Source/cmGlobalUnixMakefileGenerator3.cxx
+++ Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -767,6 +767,7 @@
std::string progressDir =
lg->GetMakefile()->GetHomeOutputDirectory();
progressDir += cmake::GetCMakeFilesDirectory();
+#if 0
{
cmOStringStream progCmd;
progCmd << "$(CMAKE_COMMAND) -E cmake_progress_report ";
@@ -786,6 +787,7 @@
progressDir = "Built target ";
progressDir += t->first;
lg->AppendEcho(commands,progressDir.c_str());
+#endif
this->AppendGlobalTargetDepends(depends,t->second);
lg->WriteMakeRule(ruleFileStream, "All Build rule for target.",
++++++ cmake-2.4.6.tar.bz2 -> cmake-2.4.7.tar.bz2 ++++++
++++ 12979 lines of diff (skipped)
++++++ cmake-2.4.7-use_intree_xmlrpc.patch ++++++
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -128,6 +128,7 @@ ELSE(CMAKE_ALLOW_SYSTEM_LIBRARIES)
SET(CMAKE_USE_SYSTEM_XMLRPC 0)
SET(CMAKE_USE_SYSTEM_ZLIB 0)
ENDIF(CMAKE_ALLOW_SYSTEM_LIBRARIES)
+SET(CMAKE_USE_SYSTEM_XMLRPC 0)
# Inform utility library header wrappers whether to use system versions.
CONFIGURE_FILE(${CMake_SOURCE_DIR}/Utilities/cmThirdParty.h.in
++++++ cmake-2.4.7-use_shared_python_lib.patch ++++++
--- Modules/FindPythonLibs.cmake
+++ Modules/FindPythonLibs.cmake
@@ -62,9 +62,6 @@
python2.0/config
python1.6/config
python1.5/config
-
- # Avoid finding the .dll in the PATH. We want the .lib.
- NO_SYSTEM_ENVIRONMENT_PATH
)
# Search for the python framework on Apple.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |