Hello community, here is the log from the commit of package qterm for openSUSE:Factory checked in at 2012-12-21 10:33:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qterm (Old) and /work/SRC/openSUSE:Factory/.qterm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qterm", Maintainer is "dmzh...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/qterm/qterm.changes 2012-03-23 12:10:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qterm.new/qterm.changes 2012-12-21 10:33:46.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 14 03:44:17 UTC 2012 - b...@suse.com + +- Add qterm-0.5.12-cmake-2.6.patch to build with cmake 2.6.x. + +------------------------------------------------------------------- New: ---- qterm-0.5.12-cmake-2.6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qterm.spec ++++++ --- /var/tmp/diff_new_pack.lIZ0PF/_old 2012-12-21 10:33:47.000000000 +0100 +++ /var/tmp/diff_new_pack.lIZ0PF/_new 2012-12-21 10:33:47.000000000 +0100 @@ -23,6 +23,7 @@ BuildRequires: libqt4-devel-doc BuildRequires: openssl-devel BuildRequires: python-devel +BuildRequires: qt4-qtscript BuildRequires: update-desktop-files Summary: QTerm is BBS client License: GPL-2.0+ @@ -32,6 +33,7 @@ Url: http://qterm.sourceforge.net/ Source0: %{name}-%{version}.tar.bz2 Patch1: qterm-0.5.12-gcc-4.7.patch +Patch2: qterm-0.5.12-cmake-2.6.patch Source1: qterm.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,6 +51,7 @@ %prep %setup -q -n %{name}-%{version} %patch1 -p0 +%patch2 -p1 %build # This package failed when testing with -Wl,-as-needed being default. ++++++ qterm-0.5.12-cmake-2.6.patch ++++++ Index: qterm-0.5.12/src/CMakeLists.txt =================================================================== --- qterm-0.5.12.orig/src/CMakeLists.txt +++ qterm-0.5.12/src/CMakeLists.txt @@ -199,7 +199,7 @@ set(qterm_MISC set(qterm_RCCS qterm.qrc) -file(COPY ${qterm_MISC} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +configure_file(${qterm_MISC} ${CMAKE_CURRENT_BINARY_DIR}/DESTINATION COPYONLY) if(WIN32) if(MINGW) Index: qterm-0.5.12/src/scheme/CMakeLists.txt =================================================================== --- qterm-0.5.12.orig/src/scheme/CMakeLists.txt +++ qterm-0.5.12/src/scheme/CMakeLists.txt @@ -1,3 +1,3 @@ file(GLOB schemeFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.scheme") -file(COPY ${schemeFiles} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +configure_file(${schemeFiles} ${CMAKE_CURRENT_BINARY_DIR}/DESTINATION COPYONLY) install(FILES ${schemeFiles} DESTINATION share/qterm/scheme) Index: qterm-0.5.12/src/scripts/CMakeLists.txt =================================================================== --- qterm-0.5.12.orig/src/scripts/CMakeLists.txt +++ qterm-0.5.12/src/scripts/CMakeLists.txt @@ -1,4 +1,4 @@ file(GLOB scriptFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.js") -file(COPY ${scriptFiles} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +configure_file(${scriptFiles} ${CMAKE_CURRENT_BINARY_DIR}/DESTINATION COPYONLY) install(FILES ${scriptFiles} DESTINATION share/qterm/scripts) add_subdirectory(ui) Index: qterm-0.5.12/src/scripts/ui/CMakeLists.txt =================================================================== --- qterm-0.5.12.orig/src/scripts/ui/CMakeLists.txt +++ qterm-0.5.12/src/scripts/ui/CMakeLists.txt @@ -1,3 +1,3 @@ file(GLOB scriptFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.ui") -file(COPY ${scriptFiles} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +configure_file(${scriptFiles} ${CMAKE_CURRENT_BINARY_DIR}/DESTINATION COPYONLY) install(FILES ${scriptFiles} DESTINATION share/qterm/scripts/ui) Index: qterm-0.5.12/src/keyboard_profiles/CMakeLists.txt =================================================================== --- qterm-0.5.12.orig/src/keyboard_profiles/CMakeLists.txt +++ qterm-0.5.12/src/keyboard_profiles/CMakeLists.txt @@ -1,3 +1,3 @@ file(GLOB keyboardFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.keytab") -file(COPY ${keyboardFiles} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +configure_file(${keyboardFiles} ${CMAKE_CURRENT_BINARY_DIR}/DESTINATION COPYONLY) install(FILES ${keyboardFiles} DESTINATION share/qterm/keyboard_profiles) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
