Hello community, here is the log from the commit of package cmake checked in at Thu Jan 17 22:17:28 CET 2008. -------- --- cmake/cmake.changes 2008-01-03 17:29:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/cmake/cmake.changes 2008-01-14 18:59:07.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 14 18:58:48 CET 2008 - dmueller@suse.de + +- update to 2.4.8-RC12: + * fix glib and Qt4 detection on 10.2 and older + * MODULE install with versions was broken + +------------------------------------------------------------------- Old: ---- cmake-2.4.8-RC-9.tar.bz2 New: ---- cmake-2.4.8-RC-12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.G32660/_old 2008-01-17 22:16:36.000000000 +0100 +++ /var/tmp/diff_new_pack.G32660/_new 2008-01-17 22:16:36.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cmake (Version 2.4.7+2.4.8RC9) +# spec file for package cmake (Version 2.4.7+2.4.8RC12) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,11 +11,11 @@ # norootforbuild Name: cmake -Version: 2.4.7+2.4.8RC9 +Version: 2.4.7+2.4.8RC12 Release: 1 License: BSD 3-Clause Group: Development/Tools/Building -%define tar_version 2.4.8-RC-9 +%define tar_version 2.4.8-RC-12 BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 1020 BuildRequires: libexpat-devel @@ -78,7 +78,11 @@ /usr/share/man/man1/ctest.1.gz %changelog -* Thu Jan 03 2008 - dmueller@suse.de +* Mon Jan 14 2008 dmueller@suse.de +- update to 2.4.8-RC12: + * fix glib and Qt4 detection on 10.2 and older + * MODULE install with versions was broken +* Thu Jan 03 2008 dmueller@suse.de - update to 2.4.8-RC9: * last release candidate of 2.4.8 * Add list(FIND) because it is used in new FindQt4.cmake @@ -104,19 +108,19 @@ * make #cmakedefine output match autoconf when undefined * document cmake remove -f * document order of -D and -P -* Mon Dec 10 2007 - dmueller@suse.de +* Mon Dec 10 2007 dmueller@suse.de - if you want cmake, you probably also want make -* Fri Sep 21 2007 - dmueller@suse.de +* Fri Sep 21 2007 dmueller@suse.de - disabling less_verbosity patch -* Fri Jul 20 2007 - pcerny@suse.cz +* Fri Jul 20 2007 pcerny@suse.cz - update to 2.4.7 - several bugfixes (KDevelop problem among others, see ChangeLog.manual for more details) -* Fri Apr 27 2007 - dmueller@suse.de +* Fri Apr 27 2007 dmueller@suse.de - expat -> libexpat-devel -* Thu Mar 29 2007 - dmueller@suse.de +* Thu Mar 29 2007 dmueller@suse.de - add ncurses-devel buildrequires -* Thu Jan 11 2007 - dmueller@suse.de +* Thu Jan 11 2007 dmueller@suse.de - update to 2.4.6: * Fix for FIND_* order and framworks with PREFIX usage. * Fix for FindDoxygen and quiet mode. @@ -125,14 +129,14 @@ * Fix for cpack .tgz.sh and dash * Fix for finding custom commands from a full path with CMAKE_CFG_INTDIR. * Fix for Borland make and custom commands that do nothing -* Mon Jan 08 2007 - dmueller@suse.de +* Mon Jan 08 2007 dmueller@suse.de - readd patch to detect shared python library instead of the static one. -* Tue Dec 19 2006 - mrueckert@suse.de +* Tue Dec 19 2006 mrueckert@suse.de - added cmake-2.4.5_use_intree_xmlrpc.patch: the xmlrpc-c check seems broken. and on 10.2 we dont have the lib anyways. so disable the systemwide xmlrpc for now. -* Fri Dec 15 2006 - mrueckert@suse.de +* Fri Dec 15 2006 mrueckert@suse.de - update to version 2.4.5: * Fix for seg fault when a macro runs a bad command BUG# 3815 * Fix fix for foo.dll.lib that does not break -L/usr/lib in @@ -145,19 +149,19 @@ * Fix FindQt3 so that it does not find qt4 * Fix FindKDE4 so that it only looks for kde4-config - disabled all patches -> applied upstream -* Mon Oct 02 2006 - dmueller@suse.de +* Mon Oct 02 2006 dmueller@suse.de - detect shared python library instead of static variant -* Tue Sep 26 2006 - dmueller@suse.de +* Tue Sep 26 2006 dmueller@suse.de - add python 2.5 support -* Sun Sep 10 2006 - dmueller@suse.de +* Sun Sep 10 2006 dmueller@suse.de - build against system zlib / libcurl -* Mon Aug 28 2006 - coolo@suse.de +* Mon Aug 28 2006 coolo@suse.de - fix Qt3 configure check for lib64 -* Sat Aug 26 2006 - coolo@suse.de +* Sat Aug 26 2006 coolo@suse.de - respect DESTDIR on installing kde3 icons -* Mon Aug 14 2006 - coolo@suse.de +* Mon Aug 14 2006 coolo@suse.de - add SUSE default paths for Qt3 -* Mon Jul 31 2006 - dmueller@suse.de +* Mon Jul 31 2006 dmueller@suse.de - 2.4.3 update: * progress is now reported with makefiles * Fix relative path problems in ADD_SUBDIRECTORY @@ -165,7 +169,7 @@ * make sure try compile files have a newline at the end * add rxvt-unicode, cygwin, and screen terminal support for color output -* Thu May 18 2006 - dmueller@suse.de +* Thu May 18 2006 dmueller@suse.de - 2.4.2 update: * Run symlink command from correct directory for executable versions * Fix for universal binaries and Xcode depend problem @@ -183,7 +187,7 @@ * install command CONFIGURATIONS option. * Fix MSVC60, MSVC70, MSVC71, MSVC80 definitions for IDE builds * Fix for C++ compiler being used for c code in VS IDE -* Wed May 10 2006 - dmueller@suse.de +* Wed May 10 2006 dmueller@suse.de - 2.4.1 update : * Several ctest and cpack bug fixes * Many updates and fixes for FindQt4.cmake @@ -203,17 +207,17 @@ * Fix msys bootstrap * Change color output to be more readable * Fix vs6 library naming -* Wed Apr 19 2006 - dmueller@suse.de +* Wed Apr 19 2006 dmueller@suse.de - update to 2.4.0, fixes -L/-I compiler flag ordering needed for building KDE 4 trunk. -* Fri Apr 14 2006 - dmueller@suse.de +* Fri Apr 14 2006 dmueller@suse.de - fix --help-modules / --help-module <module> -* Mon Mar 27 2006 - dmueller@suse.de +* Mon Mar 27 2006 dmueller@suse.de - compile with RPM_OPT_FLAGS (#160857) - fix permissions of installed files (#160856) -* Fri Mar 24 2006 - dmueller@suse.de +* Fri Mar 24 2006 dmueller@suse.de - drop rpath patch, no longer necessary -* Mon Mar 20 2006 - dmueller@suse.de +* Mon Mar 20 2006 dmueller@suse.de - CVS snapshot update, fixes RPATH handling -* Wed Feb 15 2006 - dmueller@suse.de +* Wed Feb 15 2006 dmueller@suse.de - Initial package (2.3 CVS snapshot 20060210) ++++++ cmake-2.4.8-RC-9.tar.bz2 -> cmake-2.4.8-RC-12.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.8-RC-9/ChangeLog.manual new/cmake-2.4.8-RC-12/ChangeLog.manual --- old/cmake-2.4.8-RC-9/ChangeLog.manual 2007-12-28 20:25:24.000000000 +0100 +++ new/cmake-2.4.8-RC-12/ChangeLog.manual 2008-01-11 15:12:32.000000000 +0100 @@ -1,3 +1,10 @@ +Changes in CMake 2.4.8 RC 12 +* Fix vs 9 so cmake can find it +* Fix bug 6230 MODULE install with versions was broken +Changes in CMake 2.4.8 RC 11 +* Remove ability to select install location for mac (it does not work) +Changes in CMake 2.4.8 RC 10 +* Fix for FindQt4 and glib and gthread, if not found don't use Changes in CMake 2.4.8 RC 9 * add some descriptive text to the mac installer Changes in CMake 2.4.8 RC 8 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.8-RC-9/CMakeLists.txt new/cmake-2.4.8-RC-12/CMakeLists.txt --- old/cmake-2.4.8-RC-9/CMakeLists.txt 2007-12-28 20:25:24.000000000 +0100 +++ new/cmake-2.4.8-RC-12/CMakeLists.txt 2008-01-11 15:12:32.000000000 +0100 @@ -7,7 +7,7 @@ SET(CMake_VERSION_MINOR 4) SET(CMake_VERSION_PATCH 8) # for an actual release this should not be defined -SET(CMake_VERSION_RC 9) +SET(CMake_VERSION_RC 12) SET(CMake_VERSION "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}") @@ -351,9 +351,6 @@ SET(CPACK_PACKAGE_VENDOR "Kitware") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt") - IF(APPLE) - SET(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/MacInstallReadme.txt") - ENDIF(APPLE) SET(CPACK_PACKAGE_VERSION_MAJOR "${CMake_VERSION_MAJOR}") SET(CPACK_PACKAGE_VERSION_MINOR "${CMake_VERSION_MINOR}") SET(CPACK_PACKAGE_VERSION_PATCH "${CMake_VERSION_PATCH}") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.8-RC-9/Modules/CMakeVS9FindMake.cmake new/cmake-2.4.8-RC-12/Modules/CMakeVS9FindMake.cmake --- old/cmake-2.4.8-RC-9/Modules/CMakeVS9FindMake.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-2.4.8-RC-12/Modules/CMakeVS9FindMake.cmake 2008-01-11 15:12:33.000000000 +0100 @@ -0,0 +1,16 @@ +FIND_PROGRAM(CMAKE_MAKE_PROGRAM + NAMES VCExpress devenv + PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup\\VS;EnvironmentDirectory] + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup;Dbghelp_path] + "$ENV{ProgramFiles}/Microsoft Visual Studio .NET/Common7/IDE" + "$ENV{ProgramFiles}/Microsoft Visual Studio 9/Common7/IDE" + "$ENV{ProgramFiles}/Microsoft Visual Studio9/Common7/IDE" + "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio .NET/Common7/IDE" + "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio 9/Common7/IDE" + "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio9/Common7/IDE" + "/Program Files/Microsoft Visual Studio 9/Common7/IDE/" + ) +MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM) +SET(MSVC90 1) +SET(MSVC_VERSION 1500) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.8-RC-9/Modules/CPack.cmake new/cmake-2.4.8-RC-12/Modules/CPack.cmake --- old/cmake-2.4.8-RC-9/Modules/CPack.cmake 2007-12-28 20:25:24.000000000 +0100 +++ new/cmake-2.4.8-RC-12/Modules/CPack.cmake 2008-01-11 15:12:33.000000000 +0100 @@ -79,7 +79,7 @@ "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}") cpack_set_if_not_set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}") -cpack_set_if_not_set(CPACK_PACKAGE_RELOCATABLE "true") +cpack_set_if_not_set(CPACK_PACKAGE_RELOCATABLE "false") # always force to exactly "true" or "false" for CPack.Info.plist.in: if(CPACK_PACKAGE_RELOCATABLE) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.8-RC-9/Modules/FindQt4.cmake new/cmake-2.4.8-RC-12/Modules/FindQt4.cmake --- old/cmake-2.4.8-RC-9/Modules/FindQt4.cmake 2007-12-28 20:25:24.000000000 +0100 +++ new/cmake-2.4.8-RC-12/Modules/FindQt4.cmake 2008-01-11 15:12:33.000000000 +0100 @@ -1230,8 +1230,10 @@ # Qt 4.2.0 uses glib-2.0 (wish we could ask Qt that it uses 2.0) FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0) FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0) - SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} + IF(QT_GTHREAD_LIBRARY AND QT_GLIB_LIBRARY) #TEMP: need more robust find of glib2 + SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY}) + ENDIF(QT_GTHREAD_LIBRARY AND QT_GLIB_LIBRARY) MARK_AS_ADVANCED(QT_GLIB_LIBRARY) MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY) ENDIF(QT_QCONFIG MATCHES "glib") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.8-RC-9/Source/cmInstallTargetGenerator.cxx new/cmake-2.4.8-RC-12/Source/cmInstallTargetGenerator.cxx --- old/cmake-2.4.8-RC-9/Source/cmInstallTargetGenerator.cxx 2007-12-28 20:25:26.000000000 +0100 +++ new/cmake-2.4.8-RC-12/Source/cmInstallTargetGenerator.cxx 2008-01-11 15:12:35.000000000 +0100 @@ -3,8 +3,8 @@ Program: CMake - Cross-Platform Makefile Generator Module: $RCSfile: cmInstallTargetGenerator.cxx,v $ Language: C++ - Date: $Date: 2007/02/05 18:21:32 $ - Version: $Revision: 1.12.2.5 $ + Date: $Date: 2008/01/11 13:30:18 $ + Version: $Revision: 1.12.2.6 $ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. @@ -79,6 +79,7 @@ switch(type) { case cmTarget::SHARED_LIBRARY: + case cmTarget::MODULE_LIBRARY: { // Add shared library installation properties if this platform // supports them. @@ -146,8 +147,7 @@ } break; case cmTarget::STATIC_LIBRARY: - case cmTarget::MODULE_LIBRARY: - // Nothing special for modules or static libraries. + // Nothing special for static libraries. break; default: break; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org