Hello community, here is the log from the commit of package qtcurve-kde4 for openSUSE:Factory checked in at 2013-07-08 22:26:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qtcurve-kde4 (Old) and /work/SRC/openSUSE:Factory/.qtcurve-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qtcurve-kde4" Changes: -------- --- /work/SRC/openSUSE:Factory/qtcurve-kde4/qtcurve-kde4.changes 2012-08-22 12:16:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qtcurve-kde4.new/qtcurve-kde4.changes 2013-07-08 22:26:22.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 8 14:29:54 UTC 2013 - [email protected] + +- Add fix_cmake_output.diff: Works around the Factory build failure caused by sr#179164 + +------------------------------------------------------------------- New: ---- fix_cmake_output.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-kde4.spec ++++++ --- /var/tmp/diff_new_pack.VJ3HaI/_old 2013-07-08 22:26:23.000000000 +0200 +++ /var/tmp/diff_new_pack.VJ3HaI/_new 2013-07-08 22:26:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package qtcurve-kde4 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,8 @@ Group: System/GUI/KDE Url: http://www.kde-look.org/content/show.php?content=40492 Source0: QtCurve-KDE4-%{version}.tar.bz2 +# PATCH-FIX-OPENSUSE fix_cmake_output.diff -- Fix the errors in the generated config.h caused by sr#179164 +Patch0: fix_cmake_output.diff BuildRequires: kdebase4-workspace-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -34,6 +36,7 @@ %prep %setup -q -n QtCurve-KDE4-%{version} +%patch0 -p0 %build %cmake_kde4 -d build ++++++ fix_cmake_output.diff ++++++ --- CMakeLists.txt.old 2013-07-08 16:13:22.877617270 +0200 +++ CMakeLists.txt 2013-07-08 16:16:44.010088693 +0200 @@ -1,5 +1,5 @@ project(QtCurve-KDE4) -cmake_minimum_required(VERSION 2.4.4) +cmake_minimum_required(VERSION 2.8.0) set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") set(CPACK_GENERATOR "DEB;RPM;TGZ") @@ -27,9 +27,12 @@ find_program(KDE3CONFIG_EXECUTABLE kde-config) if(KDE3CONFIG_EXECUTABLE) - exec_program(${KDE3CONFIG_EXECUTABLE} - ARGS --prefix - OUTPUT_VARIABLE KDE3PREFIX) + execute_process( + COMMAND ${KDE3CONFIG_EXECUTABLE} + ARGS --prefix + OUTPUT_VARIABLE KDE3PREFIX + OUTPUT_STRIP_TRAILING_WHITESPACE + ) endif(KDE3CONFIG_EXECUTABLE) find_program(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config @@ -42,13 +45,19 @@ # Then set install prefix... if (KDE4_KDECONFIG_EXECUTABLE) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - exec_program(${KDE4_KDECONFIG_EXECUTABLE} - ARGS --prefix - OUTPUT_VARIABLE CMAKE_INSTALL_PREFIX) + execute_process( + COMMAND ${KDE4_KDECONFIG_EXECUTABLE} + ARGS --prefix + OUTPUT_VARIABLE CMAKE_INSTALL_PREFIX + OUTPUT_STRIP_TRAILING_WHITESPACE + ) endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - exec_program(${KDE4_KDECONFIG_EXECUTABLE} - ARGS --prefix - OUTPUT_VARIABLE KDE4PREFIX) + execute_process( + COMMAND ${KDE4_KDECONFIG_EXECUTABLE} + ARGS --prefix + OUTPUT_VARIABLE KDE4PREFIX + OUTPUT_STRIP_TRAILING_WHITESPACE + ) endif (KDE4_KDECONFIG_EXECUTABLE) if(NOT KDE3PREFIX) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
