Hello community, here is the log from the commit of package libyui for openSUSE:Factory checked in at 2015-01-21 21:52:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-08-30 16:04:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui.new/libyui.changes 2015-01-21 21:52:06.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Jan 20 13:44:13 UTC 2015 - [email protected] + +- Fix cmake also in the spec file, duh. + +------------------------------------------------------------------- +Mon Jan 12 15:10:15 UTC 2015 - [email protected] + +- Fixed building with cmake 3.1 (-fPIC, PREFIX, boo#911875). +- 3.1.5 + +------------------------------------------------------------------- Old: ---- libyui-3.1.4.tar.bz2 New: ---- libyui-3.1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-doc.spec ++++++ --- /var/tmp/diff_new_pack.MOLWzF/_old 2015-01-21 21:52:07.000000000 +0100 +++ /var/tmp/diff_new_pack.MOLWzF/_new 2015-01-21 21:52:07.000000000 +0100 @@ -17,7 +17,7 @@ Name: libyui-doc -Version: 3.1.4 +Version: 3.1.5 Release: 0 Source: libyui-%{version}.tar.bz2 ++++++ libyui.spec ++++++ --- /var/tmp/diff_new_pack.MOLWzF/_old 2015-01-21 21:52:07.000000000 +0100 +++ /var/tmp/diff_new_pack.MOLWzF/_new 2015-01-21 21:52:07.000000000 +0100 @@ -17,7 +17,7 @@ Name: libyui -Version: 3.1.4 +Version: 3.1.5 Release: 0 Source: libyui-%{version}.tar.bz2 @@ -99,13 +99,13 @@ %if %{?_with_debug:1}%{!?_with_debug:0} cmake .. \ - -DPREFIX=%{_prefix} \ + -DYPREFIX=%{_prefix} \ -DDOC_DIR=%{_docdir} \ -DLIB_DIR=%{_lib} \ -DCMAKE_BUILD_TYPE=RELWITHDEBINFO %else cmake .. \ - -DPREFIX=%{_prefix} \ + -DYPREFIX=%{_prefix} \ -DDOC_DIR=%{_docdir} \ -DLIB_DIR=%{_lib} \ -DCMAKE_BUILD_TYPE=RELEASE ++++++ libyui-3.1.4.tar.bz2 -> libyui-3.1.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.4/ChangeLog new/libyui-3.1.5/ChangeLog --- old/libyui-3.1.4/ChangeLog 2014-08-27 16:57:17.000000000 +0200 +++ new/libyui-3.1.5/ChangeLog 2015-01-20 15:11:09.000000000 +0100 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Tue Jan 20 13:44:13 UTC 2015 - [email protected] + +- Fix cmake also in the spec file, duh. + +------------------------------------------------------------------- +Mon Jan 12 15:10:15 UTC 2015 - [email protected] + +- Fixed building with cmake 3.1 (-fPIC, PREFIX, boo#911875). +- 3.1.5 + +------------------------------------------------------------------- Wed Aug 27 16:32:52 CEST 2014 - [email protected] - The default product name should be "SUSE Linux" (bnc#886608) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.4/Rakefile new/libyui-3.1.5/Rakefile --- old/libyui-3.1.4/Rakefile 2014-08-13 10:22:11.000000000 +0200 +++ new/libyui-3.1.5/Rakefile 2015-01-13 10:26:09.000000000 +0100 @@ -55,7 +55,7 @@ sh("cmake", "-DCMAKE_BUILD_TYPE=RELEASE", "-DLIB_DIR=#{lib_dir}", - "-DPREFIX=#{LIBYUI_PREFIX}", + "-DYPREFIX=#{LIBYUI_PREFIX}", "-DCMAKE_PREFIX_PATH=#{LIBYUI_PREFIX}", "-DENABLE_WERROR=OFF", # gtk needs this "..") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.4/VERSION.cmake new/libyui-3.1.5/VERSION.cmake --- old/libyui-3.1.4/VERSION.cmake 2014-08-27 16:57:17.000000000 +0200 +++ new/libyui-3.1.5/VERSION.cmake 2015-01-13 10:26:09.000000000 +0100 @@ -1,6 +1,6 @@ SET( VERSION_MAJOR "3") SET( VERSION_MINOR "1" ) -SET( VERSION_PATCH "4" ) +SET( VERSION_PATCH "5" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.4/buildtools/CMakeLists.common new/libyui-3.1.5/buildtools/CMakeLists.common --- old/libyui-3.1.4/buildtools/CMakeLists.common 2014-02-18 17:12:09.000000000 +0100 +++ new/libyui-3.1.5/buildtools/CMakeLists.common 2015-01-13 10:26:09.000000000 +0100 @@ -4,16 +4,16 @@ SET( BUILDTOOLS_DIR "buildtools/" ) -IF( NOT PREFIX ) - SET( PREFIX "/usr" ) -ENDIF( NOT PREFIX ) +IF( NOT YPREFIX ) + SET( YPREFIX "/usr" ) +ENDIF( NOT YPREFIX ) IF( PLUGINNAME AND EXTENSIONNAME ) MESSAGE( FATAL_ERROR "Please define PLUGINNAME or EXTENSIONNAME not both" ) ENDIF( PLUGINNAME AND EXTENSIONNAME ) IF( PLUGINNAME OR EXTENSIONNAME ) - SET( BUILDTOOLS_DIR "${PREFIX}/share/lib${BASELIB}/${BUILDTOOLS_DIR}" ) + SET( BUILDTOOLS_DIR "${YPREFIX}/share/lib${BASELIB}/${BUILDTOOLS_DIR}" ) ELSE( PLUGINNAME OR EXTENSIONNAME ) SET( BUILDTOOLS_DIR "${CMAKE_SOURCE_DIR}/${BUILDTOOLS_DIR}" ) ENDIF( PLUGINNAME OR EXTENSIONNAME ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.4/buildtools/Config.cmake.in new/libyui-3.1.5/buildtools/Config.cmake.in --- old/libyui-3.1.4/buildtools/Config.cmake.in 2014-02-21 11:30:58.000000000 +0100 +++ new/libyui-3.1.5/buildtools/Config.cmake.in 2015-01-13 10:26:09.000000000 +0100 @@ -15,7 +15,7 @@ SET( @PROJECTNAME_UC_UPPER@_SONAME_PATCH "@SONAME_PATCH@" ) # Compute paths -SET( @PROJECTNAME_UC_UPPER@_PREFIX "@PREFIX@" ) +SET( @PROJECTNAME_UC_UPPER@_PREFIX "@YPREFIX@" ) GET_FILENAME_COMPONENT( @PROJECTNAME_UC_UPPER@_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH ) IF( EXISTS "${@PROJECTNAME_UC_UPPER@_CMAKE_DIR}/CMakeCache.txt" ) # In build tree diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.4/buildtools/LibyuiCommon.cmake new/libyui-3.1.5/buildtools/LibyuiCommon.cmake --- old/libyui-3.1.4/buildtools/LibyuiCommon.cmake 2014-08-25 14:57:18.000000000 +0200 +++ new/libyui-3.1.5/buildtools/LibyuiCommon.cmake 2015-01-13 10:26:09.000000000 +0100 @@ -142,10 +142,10 @@ SET( LIB_DIR "lib" ) ENDIF() ELSE( NOT LIB_DIR ) - STRING( REPLACE "${PREFIX}/" "" LIB_DIR "${LIB_DIR}" ) + STRING( REPLACE "${YPREFIX}/" "" LIB_DIR "${LIB_DIR}" ) ENDIF( NOT LIB_DIR ) - SET( CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PREFIX}/${LIB_DIR}" "${PREFIX}/${LIB_DIR}/${BASELIB}" ) + SET( CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${YPREFIX}/${LIB_DIR}" "${YPREFIX}/${LIB_DIR}/${BASELIB}" ) ENDMACRO( SET_LIBDIR ) @@ -154,11 +154,11 @@ IF( NOT INCLUDE_DIR ) SET( INCLUDE_DIR "include") ELSE( NOT INCLUDE_DIR ) - STRING( REPLACE REGEX "^${PREFIX}/" "" INCLUDE_DIR "${INCLUDE_DIR}" ) + STRING( REPLACE REGEX "^${YPREFIX}/" "" INCLUDE_DIR "${INCLUDE_DIR}" ) ENDIF( NOT INCLUDE_DIR ) - SET( CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH}" "${PREFIX}" ) - SET( CMAKE_INSTALL_PREFIX "${PREFIX}" ) + SET( CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH}" "${YPREFIX}" ) + SET( CMAKE_INSTALL_PREFIX "${YPREFIX}" ) SET( CMAKE_INCLUDE_PATH ${EXTRA_INCLUDES} ${CMAKE_INCLUDE_PATH} ) SET( INSTALL_CMAKE_DIR ${LIB_DIR}/cmake/${PROJECTNAME} CACHE PATH "Installation directory for CMake files" ) SET( INSTALL_PKGCONFIG_DIR ${LIB_DIR}/pkgconfig CACHE PATH "Installation directory for pkgconfig files" ) @@ -192,7 +192,7 @@ IF( NOT DEFINED DOC_DIR ) SET( DOC_DIR "${DATAROOTDIR}/doc" ) ELSE( NOT DEFINED DOC_DIR ) - STRING( REPLACE "${PREFIX}/" "" DOC_DIR "${DOC_DIR}" ) + STRING( REPLACE "${YPREFIX}/" "" DOC_DIR "${DOC_DIR}" ) ENDIF( NOT DEFINED DOC_DIR ) IF( NOT DEFINED DOC_SUBDIR ) @@ -206,7 +206,7 @@ FOREACH( p "DOC" LIB INCLUDE CMAKE PKGCONFIG BUILDTOOLS ) SET( var "INSTALL_${p}_DIR" ) IF( NOT IS_ABSOLUTE "${${var}}" ) - SET( ${var}_PREFIX "${PREFIX}/${${var}}" ) + SET( ${var}_PREFIX "${YPREFIX}/${${var}}" ) ENDIF( NOT IS_ABSOLUTE "${${var}}" ) ENDFOREACH() @@ -259,9 +259,9 @@ MACRO( CHECK_PREFIX ) # check if all internal libyui-dependecies are in prefix, too. FOREACH ( p ${INTERNAL_DEPS} ) STRING(TOUPPER ${p} pU) - IF( NOT "${${pU}_PREFIX}" STREQUAL "${PREFIX}" ) - MESSAGE( FATAL_ERROR "${p} must be installed in ${PREFIX} first! (found in ${${pU}_PREFIX})" ) - ENDIF( NOT "${${pU}_PREFIX}" STREQUAL "${PREFIX}" ) + IF( NOT "${${pU}_PREFIX}" STREQUAL "${YPREFIX}" ) + MESSAGE( FATAL_ERROR "${p} must be installed in ${YPREFIX} first! (found in ${${pU}_PREFIX})" ) + ENDIF( NOT "${${pU}_PREFIX}" STREQUAL "${YPREFIX}" ) ENDFOREACH () ENDMACRO ( CHECK_PREFIX ) @@ -533,14 +533,14 @@ ENDIF( ENABLE_DEBUG OR ${CMAKE_BUILD_TYPE} STREQUAL "RELWITHDEBINFO" ) MESSAGE( STATUS "" ) - MESSAGE( STATUS " Install to Prefix: ${PREFIX}" ) - MESSAGE( STATUS " use Shared-Dir: ${PREFIX}/${DATAROOTDIR}" ) - MESSAGE( STATUS " use Library-Dir: ${PREFIX}/${INSTALL_LIB_DIR}" ) - MESSAGE( STATUS " use Include-Dir: ${PREFIX}/${INSTALL_INCLUDE_DIR}" ) - MESSAGE( STATUS " use CMake Plugin-InstallDir: ${PREFIX}/${INSTALL_CMAKE_DIR}" ) - MESSAGE( STATUS " use Doc-Dir: ${PREFIX}/${INSTALL_DOC_DIR}" ) - MESSAGE( STATUS " Data-Dir: ${PREFIX}/${FULL_DATA_DIR}" ) - MESSAGE( STATUS " Theme-Dir: ${PREFIX}/${THEME_DIR}" ) + MESSAGE( STATUS " Install to Prefix: ${YPREFIX}" ) + MESSAGE( STATUS " use Shared-Dir: ${YPREFIX}/${DATAROOTDIR}" ) + MESSAGE( STATUS " use Library-Dir: ${YPREFIX}/${INSTALL_LIB_DIR}" ) + MESSAGE( STATUS " use Include-Dir: ${YPREFIX}/${INSTALL_INCLUDE_DIR}" ) + MESSAGE( STATUS " use CMake Plugin-InstallDir: ${YPREFIX}/${INSTALL_CMAKE_DIR}" ) + MESSAGE( STATUS " use Doc-Dir: ${YPREFIX}/${INSTALL_DOC_DIR}" ) + MESSAGE( STATUS " Data-Dir: ${YPREFIX}/${FULL_DATA_DIR}" ) + MESSAGE( STATUS " Theme-Dir: ${YPREFIX}/${THEME_DIR}" ) MESSAGE( STATUS "" ) MESSAGE( STATUS " Disable shared library: ${DISABLE_SHARED}" ) IF( ENABLE_DEBUG OR ${CMAKE_BUILD_TYPE} STREQUAL "RELWITHDEBINFO" OR ${CMAKE_BUILD_TYPE} STREQUAL "DEBUG" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.4/buildtools/config.h.in new/libyui-3.1.5/buildtools/config.h.in --- old/libyui-3.1.4/buildtools/config.h.in 2014-02-18 17:12:09.000000000 +0100 +++ new/libyui-3.1.5/buildtools/config.h.in 2015-01-13 10:26:09.000000000 +0100 @@ -33,13 +33,13 @@ #ifndef @PROJECTNAME_UC@_CONFIG_H #define @PROJECTNAME_UC@_CONFIG_H -#define DATADIR "@PREFIX@/@FULL_DATA_DIR@" -#define DATAROOTDIR "@PREFIX@/@DATAROOTDIR@" -#define HELP_ICONS_DIR "@PREFIX@/@FULL_DATA_DIR@/images" -#define LANG_FONTS_FILE "@PREFIX@/@FULL_DATA_DIR@/data/lang_fonts" -#define LOCALEDIR "@PREFIX@/@DATAROOTDIR@/locale" -#define PLUGINDIR "@PREFIX@/@LIB_DIR_PLAIN@/@BASELIB@" -#define THEMEDIR "@PREFIX@/@THEME_DIR@" +#define DATADIR "@YPREFIX@/@FULL_DATA_DIR@" +#define DATAROOTDIR "@YPREFIX@/@DATAROOTDIR@" +#define HELP_ICONS_DIR "@YPREFIX@/@FULL_DATA_DIR@/images" +#define LANG_FONTS_FILE "@YPREFIX@/@FULL_DATA_DIR@/data/lang_fonts" +#define LOCALEDIR "@YPREFIX@/@DATAROOTDIR@/locale" +#define PLUGINDIR "@YPREFIX@/@LIB_DIR_PLAIN@/@BASELIB@" +#define THEMEDIR "@YPREFIX@/@THEME_DIR@" #define PLUGIN_PREFIX "lib@BASELIB@-" #define PLUGIN_SUFFIX ".so.@SONAME_MAJOR@" #define LIBYUI_VERSION_NUM (((@VERSION_MAJOR@) << 16) | ((@VERSION_MINOR@) << 8) | (@VERSION_PATCH@)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.4/buildtools/template.pc.in new/libyui-3.1.5/buildtools/template.pc.in --- old/libyui-3.1.4/buildtools/template.pc.in 2014-02-18 17:12:09.000000000 +0100 +++ new/libyui-3.1.5/buildtools/template.pc.in 2015-01-13 10:26:09.000000000 +0100 @@ -2,7 +2,7 @@ ##### Pkg-Config file for @PROJECTNAME@ ############################### -prefix=@PREFIX@ +prefix=@YPREFIX@ exec_prefix=${prefix} datarootdir=${exec_prefix}/@DATAROOTDIR@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-3.1.4/libyui.spec.in new/libyui-3.1.5/libyui.spec.in --- old/libyui-3.1.4/libyui.spec.in 2014-02-19 13:02:36.000000000 +0100 +++ new/libyui-3.1.5/libyui.spec.in 2015-01-20 15:11:09.000000000 +0100 @@ -81,13 +81,13 @@ %if %{?_with_debug:1}%{!?_with_debug:0} cmake .. \ - -DPREFIX=%{_prefix} \ + -DYPREFIX=%{_prefix} \ -DDOC_DIR=%{_docdir} \ -DLIB_DIR=%{_lib} \ -DCMAKE_BUILD_TYPE=RELWITHDEBINFO %else cmake .. \ - -DPREFIX=%{_prefix} \ + -DYPREFIX=%{_prefix} \ -DDOC_DIR=%{_docdir} \ -DLIB_DIR=%{_lib} \ -DCMAKE_BUILD_TYPE=RELEASE -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
