Hello community, here is the log from the commit of package libyui for openSUSE:Factory checked in at 2014-02-24 14:11:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-02-21 13:48:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libyui.new/libyui.changes 2014-02-24 14:12:00.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Feb 21 14:54:17 UTC 2014 - [email protected] + +- now building on https://ci.opensuse.org/view/libyui/ ! + - adapted CMake macros for PREFIX != /usr + - use Rakefile for making srcpackage for OBS + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ libyui.spec: same change ++++++ libyui-3.0.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.0.13/CMakeLists.txt new/libyui-3.0.13/CMakeLists.txt --- old/libyui-3.0.13/CMakeLists.txt 2014-02-24 14:12:01.000000000 +0100 +++ new/libyui-3.0.13/CMakeLists.txt 2014-02-24 14:12:01.000000000 +0100 @@ -1 +1 @@ -symbolic link to ./buildtools/CMakeLists.common +symbolic link to ../libyui-master/buildtools/CMakeLists.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.0.13/ChangeLog new/libyui-3.0.13/ChangeLog --- old/libyui-3.0.13/ChangeLog 2014-02-18 17:12:09.000000000 +0100 +++ new/libyui-3.0.13/ChangeLog 2014-02-21 16:22:51.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 21 14:54:17 UTC 2014 - [email protected] + +- now building on https://ci.opensuse.org/view/libyui/ ! + - adapted CMake macros for PREFIX != /usr + - use Rakefile for making srcpackage for OBS + +------------------------------------------------------------------- Fri Feb 7 11:43:20 UTC 2014 - [email protected] - use text version of release notes with NCurses (bnc#862578) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.0.13/Rakefile new/libyui-3.0.13/Rakefile --- old/libyui-3.0.13/Rakefile 2014-02-18 17:12:09.000000000 +0100 +++ new/libyui-3.0.13/Rakefile 2014-02-21 14:45:21.000000000 +0100 @@ -16,10 +16,12 @@ conf.package_name = Dir.glob("*.spec.in").first.chomp(".spec.in") conf.package_dir = "#{BUILDDIR}/package" + conf.skip_license_check << /.*/ if conf.package_name =~ /^libyui-gtk/ conf.skip_license_check << /bootstrap.sh|ChangeLog|Makefile.cvs/ conf.skip_license_check << /^buildtools\/.*/ conf.skip_license_check << /\.(cmake|gv|ui|xpm)$/ conf.skip_license_check << /^src\/lang_fonts$/ + conf.skip_license_check << /\.mng$/ # binary end desc 'Pretend to run the test suite' @@ -27,13 +29,29 @@ puts 'No tests yet' if verbose end +LIBYUI_PREFIX = ENV["HOME"] + "/libyui-prefix" +LIBYUI_BASE = ENV.fetch("LIBYUI_BASE", "../libyui") + # build the gem package desc 'Build a tarball for OBS' task :tarball do - sh "make -f Makefile.cvs" + rm_rf BUILDDIR + ln_sf "#{LIBYUI_BASE}/buildtools/CMakeLists.common", "CMakeLists.txt" + lib_dir = `rpm --eval '%{_lib}'`.chomp + mkdir_p BUILDDIR chdir BUILDDIR do + # unfortunately buildtools are set up in such a way that + # for making a package, all dependencies need to be present and installed :-/ + sh("cmake", + "-DCMAKE_BUILD_TYPE=RELEASE", + "-DLIB_DIR=#{lib_dir}", + "-DPREFIX=#{LIBYUI_PREFIX}", + "-DCMAKE_PREFIX_PATH=#{LIBYUI_PREFIX}", + "-DENABLE_WERROR=OFF", # gtk needs this + "..") sh "make clean" -# sh "make" # river jenkins does it; should not be needed + sh "make -j$(nproc)" + sh "make install" sh "make srcpackage" end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.0.13/buildtools/Config.cmake.in new/libyui-3.0.13/buildtools/Config.cmake.in --- old/libyui-3.0.13/buildtools/Config.cmake.in 2014-02-18 17:12:09.000000000 +0100 +++ new/libyui-3.0.13/buildtools/Config.cmake.in 2014-02-21 11:30:58.000000000 +0100 @@ -21,7 +21,7 @@ # In build tree INCLUDE( "${@PROJECTNAME_UC_UPPER@_CMAKE_DIR}/@[email protected]" ) ELSE() - SET( @PROJECTNAME_UC_UPPER@_INCLUDE_DIRS "@INSTALL_INCLUDE_DIR_PREFIX@" ) + SET( @PROJECTNAME_UC_UPPER@_INCLUDE_DIRS @INSTALL_INCLUDE_DIR_PREFIX@ @INSTALL_INCLUDE_DIR_PREFIX@/.. ) ENDIF() # Our library dependencies (contains definitions for IMPORTED targets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.0.13/buildtools/LibyuiCommon.cmake new/libyui-3.0.13/buildtools/LibyuiCommon.cmake --- old/libyui-3.0.13/buildtools/LibyuiCommon.cmake 2014-02-18 17:12:09.000000000 +0100 +++ new/libyui-3.0.13/buildtools/LibyuiCommon.cmake 2014-02-21 11:30:58.000000000 +0100 @@ -690,7 +690,7 @@ MACRO( PROCESS_EXAMPLES ) - INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/src") + INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/src" ${CMAKE_INCLUDE_PATH}) FOREACH( EXAMPLE ${EXAMPLES_LIST} ) IF( ENABLE_EXAMPLES ) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
