Hello community, here is the log from the commit of package libyui for openSUSE:Factory checked in at 2013-07-03 16:50:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui (Old) and /work/SRC/openSUSE:Factory/.libyui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui/libyui.changes 2013-06-28 16:04:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui.new/libyui.changes 2013-07-03 16:50:59.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Jun 30 18:52:25 CEST 2013 - [email protected] + +- git describe and git --tags do not always return a git hash + to avoid cmake failure a check has been introduced with a warning + message +- skipping also .kdev4 when building source package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ libyui.spec: same change ++++++ libyui-3.0.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.0.8/ChangeLog new/libyui-3.0.8/ChangeLog --- old/libyui-3.0.8/ChangeLog 2013-06-26 17:12:26.000000000 +0200 +++ new/libyui-3.0.8/ChangeLog 2013-07-01 09:47:29.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Sun Jun 30 18:52:25 CEST 2013 - [email protected] + +- git describe and git --tags do not always return a git hash + to avoid cmake failure a check has been introduced with a warning + message +- skipping also .kdev4 when building source package + +------------------------------------------------------------------- Wed Jun 26 16:20:29 CEST 2013 - [email protected] - Fixed build of libyui-qt-graph examples diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.0.8/buildtools/LibyuiCommon.cmake new/libyui-3.0.8/buildtools/LibyuiCommon.cmake --- old/libyui-3.0.8/buildtools/LibyuiCommon.cmake 2013-06-26 17:12:26.000000000 +0200 +++ new/libyui-3.0.8/buildtools/LibyuiCommon.cmake 2013-07-01 09:47:29.000000000 +0200 @@ -4,7 +4,6 @@ ### and include it in CMakeLists.txt MACRO( SET_GITVERSION ) - FIND_PACKAGE( Git ) IF( GIT_FOUND ) EXEC_PROGRAM( @@ -14,8 +13,14 @@ OUTPUT_VARIABLE GIT_VERSION ) STRING( REGEX MATCH "-g[0-9|a-f]+$" VERSION_SHA1 ${GIT_VERSION} ) - STRING( REGEX REPLACE "[g]" "" VERSION_SHA1 ${VERSION_SHA1} ) - SET(GIT_SHA1_VERSION "${VERSION_SHA1}") + IF ( VERSION_SHA1 ) + STRING( REGEX REPLACE "[g]" "" VERSION_SHA1 ${VERSION_SHA1} ) + SET(GIT_SHA1_VERSION "${VERSION_SHA1}") + ELSE( VERSION_SHA1 ) + MESSAGE ( WARNING "Cannot evaluate GIT_VERSION based on git + describe --tags, skipping..." ) + SET( GIT_SHA1_VERSION "" ) + ENDIF( VERSION_SHA1 ) ELSE( GIT_FOUND ) MESSAGE ( STATUS "GIT_VERSION option needs git installed" ) SET( GIT_SHA1_VERSION "" ) @@ -431,6 +436,7 @@ # backup files "~$" # eclipse files + "\\\\.kdev4$" "\\\\.cdtproject$" "\\\\.cproject$" "\\\\.project$" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
