From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: * X-Spam-Status: No, score=1.3 required=5.0 tests=AWL,BAYES_50, DNS_FROM_OPENWHOIS,MIME_BASE64_TEXT autolearn=no version=3.2.5 From: Sergei Epiphanov Organization: OKSAT To: ALT Linux Team development discussions Date: Tue, 19 Jul 2011 12:19:45 +0400 User-Agent: KMail/1.13.7 (Linux/2.6.39-un-def-alt3; KDE/4.6.5; x86_64; ; ) References: <201107190053.24000.nenderus@altlinux.org> <201107191146.16933.serpiph@nikiet.ru> <201107191155.44281.serpiph@nikiet.ru> In-Reply-To: <201107191155.44281.serpiph@nikiet.ru> MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_i4TJOS2V8AlFTmh" Message-Id: <201107191219.46072.serpiph@nikiet.ru> X-SpamTest-Version: SMTP-Filter Version 3.0.0 [0284], KAS30/Release X-SpamTest-Info: Not protected X-Synonym: Copied by Synonym (http://www.modulo.ro/synonym) to: mailcopy X-Anti-Virus: Kaspersky Anti-Virus for Linux Mail Server 5.6.39/RELEASE, bases: 20110717 #5619247, check: 20110719 clean Subject: Re: [devel] =?koi8-r?b?cXV0SU0gySDOxdDPztHUy8kg0yBjbWFrZQ==?= X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jul 2011 08:23:58 -0000 Archived-At: List-Archive: List-Post: --Boundary-00=_i4TJOS2V8AlFTmh Content-Type: Text/Plain; charset="koi8-r" Content-Transfer-Encoding: base64 8NLP29Ug0NLP3cXOydEg2sEg29TP0s0g0MnTxc0uCgrwz8fM0cTJ1MUg1yDQ0snMz9bFzs7ZyiDG wcrMLiD3IM/C3cXNLCDQ0s/H0sHNzcEgY21ha2Ug08XK3sHTINPP2sTBo9Qg0MHSwc3F1NIgClBB Q0tBR0VfRklORF9WRVJTSU9OINcgzMDCz80g08zV3sHFICjEwdbFIMXTzMkg18XS08nRIM7FINXL wdrBzsEpLCDIz9TRINfPIArX08XIIM/QydPBzsnRyCDOwdDJ08HOzywg3tTPINzUwSDQxdLFzcXO zsHRIMXT1Ngg1M/M2MvPINDSySDSxcHM2M7PzSDOwczJ3snJIArVy8Hawc7J0SDXxdLTyckuIP7B 09TJ3s7ZyiDP1NfF1CDXIMbByszFLvDSz9vVINDPxM/K1MkgyyDOxc3VIM/exc7YIArTy9XS0NXM o9rOzyDJIMnMySDPw8XOydTYINDSxcTMz9bFzs7PxSDJ2s3FzsXOycUgKMnTyM/EztnKIMvPxCks IMnMySDQ0sHXydTYIAouY21ha2UtxsHKzNkg0M/EIM7P19nFIM7V1sTZLgoK89LB2tUgx8/Xz9LA LCDe1M8g0SDMydvYINXLwdrBzCDNxdPUzywgx8TFINPUz8nUINfP0NLP0ywgws/MxcUg2s7BwN3J yCDQ0s/b1SAKxMHU2CDT18/KINfF0sTJy9QuCgotLSAK8yDV18HWxc7Jxc0sIOXQycbBzs/XIPPF 0sfFygo= --Boundary-00=_i4TJOS2V8AlFTmh Content-Type: text/x-patch; charset="UTF-8"; name="cmake-2.8.5.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="cmake-2.8.5.patch" diff -Naur cmake-2.8.5.orig/Modules/FindPackageHandleStandardArgs.cmake cmake-2.8.5/Modules/FindPackageHandleStandardArgs.cmake --- cmake-2.8.5.orig/Modules/FindPackageHandleStandardArgs.cmake 2011-07-08 15:12:50.000000000 +0400 +++ cmake-2.8.5/Modules/FindPackageHandleStandardArgs.cmake 2011-07-19 10:46:59.288009661 +0400 @@ -211,7 +211,7 @@ SET(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"") SET(VERSION_OK FALSE) ELSE ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}") - SET(VERSION_MSG "(found suitable version \"${VERSION}\", required is \"${${_NAME}_FIND_VERSION}\")") + SET(VERSION_MSG "(found suitable version \"${VERSION}\", minimum required is \"${${_NAME}_FIND_VERSION}\")") ENDIF ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}") ENDIF(${_NAME}_FIND_VERSION_EXACT) diff -Naur cmake-2.8.5.orig/Modules/FindQt3.cmake cmake-2.8.5/Modules/FindQt3.cmake --- cmake-2.8.5.orig/Modules/FindQt3.cmake 2011-07-08 15:12:50.000000000 +0400 +++ cmake-2.8.5/Modules/FindQt3.cmake 2011-07-19 10:44:15.288009564 +0400 @@ -206,7 +206,7 @@ ENDIF (NOT req_qt_major_vers) STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" req_qt_major_vers "${QT_MIN_VERSION}") - STRING(REGEX REPLACE "[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" req_qt_minor_vers "${QT_MIN_VERSION}") + STRING(REGEX REPLACE "[0-9]+\\.([0-9]+)\\.[0-9]+" "\\1" req_qt_minor_vers "${QT_MIN_VERSION}") STRING(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qt_patch_vers "${QT_MIN_VERSION}") # req = "6.5.4", qt = "3.2.1" diff -Naur cmake-2.8.5.orig/Modules/FindQt4.cmake cmake-2.8.5/Modules/FindQt4.cmake --- cmake-2.8.5.orig/Modules/FindQt4.cmake 2011-07-08 15:12:50.000000000 +0400 +++ cmake-2.8.5/Modules/FindQt4.cmake 2011-07-19 10:44:28.240009571 +0400 @@ -1122,7 +1122,7 @@ # set version variables STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${QTVERSION}") - STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}") + STRING(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}") STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${QTVERSION}") ENDIF(QT_QMAKE_EXECUTABLE AND QTVERSION) diff -Naur cmake-2.8.5.orig/Source/cmFindPackageCommand.cxx cmake-2.8.5/Source/cmFindPackageCommand.cxx --- cmake-2.8.5.orig/Source/cmFindPackageCommand.cxx 2011-07-08 15:12:50.000000000 +0400 +++ cmake-2.8.5/Source/cmFindPackageCommand.cxx 2011-07-19 12:14:52.768012748 +0400 @@ -1751,6 +1751,7 @@ } result_version = this->Makefile->GetSafeDefinition("PACKAGE_VERSION"); + if(!this->VersionFoundCount) this->Makefile->RemoveDefinition("PACKAGE_FIND_VERSION"); if (result_version.empty()) { result_version = "unknown"; --Boundary-00=_i4TJOS2V8AlFTmh--