November 2012 - openSUSE Commits - openSUSE Mailing Lists

commit kdepimlibs4 for openSUSE:Factory
by root＠hilbert.suse.de 08 Nov '12

08 Nov '12

Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at 2012-11-08 07:43:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepimlibs4 (Old) and /work/SRC/openSUSE:Factory/.kdepimlibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepimlibs4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepimlibs4/kdepimlibs4.changes 2012-10-07 19:09:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepimlibs4.new/kdepimlibs4.changes 2012-11-08 07:43:49.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 2 16:45:15 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 4.9.3 + * see http://kde.org/announcements/4.9.3/ for details + +------------------------------------------------------------------- Old: ---- kdepimlibs-4.9.2.tar.xz New: ---- kdepimlibs-4.9.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.JMFZLF/_old 2012-11-08 07:43:50.000000000 +0100 +++ /var/tmp/diff_new_pack.JMFZLF/_new 2012-11-08 07:43:50.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdepimlibs4 -Version: 4.9.2 +Version: 4.9.3 Release: 0 Summary: KDE PIM Libraries License: LGPL-2.1+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim4-runtime for openSUSE:Factory
by root＠hilbert.suse.de 08 Nov '12

08 Nov '12

Hello community, here is the log from the commit of package kdepim4-runtime for openSUSE:Factory checked in at 2012-11-08 07:43:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim4-runtime (Old) and /work/SRC/openSUSE:Factory/.kdepim4-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim4-runtime", Maintainer is "WStephenson(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim4-runtime/kdepim4-runtime.changes 2012-10-07 19:08:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim4-runtime.new/kdepim4-runtime.changes 2012-11-08 07:43:47.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 2 16:47:04 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 4.9.3 + * see http://kde.org/announcements/4.9.3/ for details + +------------------------------------------------------------------- Old: ---- kdepim-runtime-4.9.2.tar.xz New: ---- kdepim-runtime-4.9.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.6SqpT8/_old 2012-11-08 07:43:48.000000000 +0100 +++ /var/tmp/diff_new_pack.6SqpT8/_new 2012-11-08 07:43:48.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdepim4-runtime -Version: 4.9.2 +Version: 4.9.3 Release: 0 Summary: Base package of kdepim License: LGPL-2.1+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim4 for openSUSE:Factory
by root＠hilbert.suse.de 08 Nov '12

08 Nov '12

Hello community, here is the log from the commit of package kdepim4 for openSUSE:Factory checked in at 2012-11-08 07:43:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim4 (Old) and /work/SRC/openSUSE:Factory/.kdepim4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim4/kdepim4.changes 2012-10-07 19:08:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim4.new/kdepim4.changes 2012-11-08 07:43:41.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 2 16:46:42 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 4.9.3 + * see http://kde.org/announcements/4.9.3/ for details + +------------------------------------------------------------------- Old: ---- kdepim-4.9.2.tar.xz New: ---- kdepim-4.9.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4.spec ++++++ --- /var/tmp/diff_new_pack.BP3Fke/_old 2012-11-08 07:43:42.000000000 +0100 +++ /var/tmp/diff_new_pack.BP3Fke/_new 2012-11-08 07:43:42.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdepim4 -Version: 4.9.2 +Version: 4.9.3 Release: 0 Summary: Base package of kdepim License: GPL-2.0+ and LGPL-2.1+ @@ -160,6 +160,7 @@ %suse_update_desktop_file knotes Utility DesktopUtility %suse_update_desktop_file korganizer Office Calendar %suse_update_desktop_file ktimetracker Utility TimeUtility + %suse_update_desktop_file importwizard Network Email %kde_post_install #Restrict fdupes call to not cause unwanted dependencies between packages ++++++ 4_8_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.BP3Fke/_old 2012-11-08 07:43:42.000000000 +0100 +++ /var/tmp/diff_new_pack.BP3Fke/_new 2012-11-08 07:43:42.000000000 +0100 @@ -5,3 +5,14 @@ +git diff v4.7.2..origin/KDE/4.7 diff --git a/akregator/plugins/sharemicroblog/akregator_config_sharemicroblog.desktop b/akregator/plugins/sharemicroblog/akregator_config_sharemicroblog.desktop index c605c2b..58a86e5 100644 +--- a/importwizard/importwizard.desktop 2012-10-20 08:49:48.992059048 +0200 ++++ b/importwizard/importwizard.desktop 2012-10-20 14:47:04.812464894 +0200 +@@ -31,7 +31,7 @@ + Name[zh_TW]=匯入精靈 + Exec=importwizard + Type=Application +-Icon=kontact-import-wizard ++Icon= + Comment=Launch the import wizard to migrate data from mailer as thunderbird/evolution etc. + Comment[ca]=Engega l'assistent d'importació per migrar les dades dels agents de correus com el Thunderbird/Evolution etc. + Comment[da]=Kør importguiden for at migrere data fra e-mail-programmer såsom Thunderbird, Evolution osv. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdenetwork4 for openSUSE:Factory
by root＠hilbert.suse.de 08 Nov '12

08 Nov '12

Hello community, here is the log from the commit of package kdenetwork4 for openSUSE:Factory checked in at 2012-11-08 07:43:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdenetwork4 (Old) and /work/SRC/openSUSE:Factory/.kdenetwork4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdenetwork4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdenetwork4/kdenetwork4.changes 2012-10-31 06:59:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdenetwork4.new/kdenetwork4.changes 2012-11-08 07:43:37.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Nov 7 07:43:50 UTC 2012 - tittiatcoke(a)gmail.com + +- Add explicit buildrequire for libmediastreamer1 for kopete to + avoid "Have Choice for" for packages depending on Kopete and to + prevent that the user has to make a choice what to install + +------------------------------------------------------------------- +Fri Nov 2 17:06:20 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 4.9.3 + * see http://kde.org/announcements/4.9.3/ for details + +------------------------------------------------------------------- Old: ---- kdenetwork-4.9.2.tar.xz New: ---- kdenetwork-4.9.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenetwork4.spec ++++++ --- /var/tmp/diff_new_pack.wq6rkl/_old 2012-11-08 07:43:38.000000000 +0100 +++ /var/tmp/diff_new_pack.wq6rkl/_new 2012-11-08 07:43:38.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdenetwork4 -Version: 4.9.2 +Version: 4.9.3 Release: 0 Summary: KDE Network Base Package License: GPL-2.0+ @@ -151,6 +151,7 @@ Summary: Instant Messenger Group: Productivity/Networking/Instant Messenger Requires: kdepim4-runtime +Requires: libmediastreamer1 Recommends: kopete-protocol-facebook Obsoletes: kde4-kopete < 4.3.0 Provides: kde4-kopete = 4.3.0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kde-mplayer-thumbnailer for openSUSE:Factory
by root＠hilbert.suse.de 08 Nov '12

08 Nov '12

Hello community, here is the log from the commit of package kde-mplayer-thumbnailer for openSUSE:Factory checked in at 2012-11-08 07:43:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kde-mplayer-thumbnailer (Old) and /work/SRC/openSUSE:Factory/.kde-mplayer-thumbnailer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kde-mplayer-thumbnailer", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kde-mplayer-thumbnailer/kde-mplayer-thumbnailer.changes 2012-10-08 20:32:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kde-mplayer-thumbnailer.new/kde-mplayer-thumbnailer.changes 2012-11-08 07:43:36.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 2 16:56:19 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 4.9.3 + * see http://kde.org/announcements/4.9.3/ for details + +------------------------------------------------------------------- Old: ---- mplayerthumbs-4.9.2.tar.xz New: ---- mplayerthumbs-4.9.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde-mplayer-thumbnailer.spec ++++++ --- /var/tmp/diff_new_pack.NbcNwD/_old 2012-11-08 07:43:37.000000000 +0100 +++ /var/tmp/diff_new_pack.NbcNwD/_new 2012-11-08 07:43:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kde-mplayer-thumbnailer # -# Copyright (c) SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -9,7 +9,7 @@ # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 4.8.95_20120629.9) +# license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ @@ -19,12 +19,12 @@ Name: kde-mplayer-thumbnailer BuildRequires: libkde4-devel BuildRequires: xz +Summary: MPlayer based thumbnailer License: LGPL-2.0+ Group: System/GUI/KDE -Summary: MPlayer based thumbnailer Url: http://www.kde.org -Version: 4.9.2 -Release: 1 +Version: 4.9.3 +Release: 0 Source0: mplayerthumbs-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdelibs4 for openSUSE:Factory
by root＠hilbert.suse.de 08 Nov '12

08 Nov '12

Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at 2012-11-08 07:43:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old) and /work/SRC/openSUSE:Factory/.kdelibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdelibs4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4-apidocs.changes 2012-10-08 07:11:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4-apidocs.changes 2012-11-08 07:43:26.000000000 +0100 @@ -1,0 +2,25 @@ +Fri Nov 2 19:06:02 UTC 2012 - ctrippe(a)opensuse.org + +- Fix the path for docs in /etc/kde4rc which is used by + bundle-lang-kde-* (bnc#695108) + +------------------------------------------------------------------- +Fri Nov 2 16:44:45 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 4.9.3 + * see http://kde.org/announcements/4.9.3/ for details + +------------------------------------------------------------------- +Thu Nov 1 09:02:07 UTC 2012 - einar(a)heavensinferno.net + +- Update the upstream patch for Python 3 installation, backporting + the work done upstream (under review) for 4.10 + +------------------------------------------------------------------- +Sat Oct 13 08:10:10 UTC 2012 - einar(a)heavensinferno.net + +- Add patch from upstream to enable correct Python 3 installation: + this is a prerequisite to provide PyKDE4 Python 3 packages. +- Currently the patch is enabled just for Factory (openSUSE 12.3) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4.changes 2012-10-18 21:51:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4.changes 2012-11-08 07:43:26.000000000 +0100 @@ -1,0 +2,18 @@ +Fri Nov 2 19:06:02 UTC 2012 - ctrippe(a)opensuse.org + +- Fix the path for docs in /etc/kde4rc which is used by + bundle-lang-kde-* (bnc#695108) + +------------------------------------------------------------------- +Fri Nov 2 16:44:45 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 4.9.3 + * see http://kde.org/announcements/4.9.3/ for details + +------------------------------------------------------------------- +Thu Nov 1 09:02:07 UTC 2012 - einar(a)heavensinferno.net + +- Update the upstream patch for Python 3 installation, backporting + the work done upstream (under review) for 4.10 + +------------------------------------------------------------------- Old: ---- kdelibs-4.9.2.tar.xz New: ---- kdelibs-4.9.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4-apidocs.spec ++++++ --- /var/tmp/diff_new_pack.LDuDYZ/_old 2012-11-08 07:43:28.000000000 +0100 +++ /var/tmp/diff_new_pack.LDuDYZ/_new 2012-11-08 07:43:28.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdelibs4-apidocs -Version: 4.9.2 +Version: 4.9.3 Release: 0 Summary: KDE 4 API documentation License: LGPL-2.1+ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.LDuDYZ/_old 2012-11-08 07:43:28.000000000 +0100 +++ /var/tmp/diff_new_pack.LDuDYZ/_new 2012-11-08 07:43:28.000000000 +0100 @@ -24,7 +24,7 @@ %define kderev 0 Name: kdelibs4 -Version: 4.9.2 +Version: 4.9.3 Release: 0 %define default_branding 4.8 BuildRequires: OpenEXR-devel @@ -195,7 +195,7 @@ # define KDE version exactly # if [ '%{_project}' != KDE:Distro:Factory -a \ - '%{_project}' != KDE:KDE4:UNSTABLE:Desktop -a \ + '%{_project}' != KDE:KDE4:Unstable:SC -a \ '%{_project}' != KDE:Distro:Stable -a \ '%{_project}' != openSUSE:Factory ] ; then sed -ri "s,#cmakedefine KDE_VERSION_STRING \"@KDE_VERSION_STRING@\",#cmakedefine KDE_VERSION_STRING \"@KDE_VERSION_STRING@ \\\\\"release $(echo %{release} | cut -d. -f-1)\\\\\"\"," kdecore/util/kdeversion.h.cmake ++++++ kde4rc ++++++ --- /var/tmp/diff_new_pack.LDuDYZ/_old 2012-11-08 07:43:28.000000000 +0100 +++ /var/tmp/diff_new_pack.LDuDYZ/_new 2012-11-08 07:43:28.000000000 +0100 @@ -1,4 +1,4 @@ [Directories] prefixes=/etc/kde4/ dir_locale=/usr/share/locale-bundle -dir_html=/usr/share/doc-bundle +dir_html=/usr/share/doc-bundle/kde/HTML ++++++ kdelibs4-fix-python3-install.diff ++++++ --- /var/tmp/diff_new_pack.LDuDYZ/_old 2012-11-08 07:43:28.000000000 +0100 +++ /var/tmp/diff_new_pack.LDuDYZ/_new 2012-11-08 07:43:28.000000000 +0100 @@ -1,63 +1,238 @@ +diff --git a/cmake/modules/FindPythonLibrary.cmake b/cmake/modules/FindPythonLibrary.cmake +index 60567e2..46bb884 100644 +--- a/cmake/modules/FindPythonLibrary.cmake ++++ b/cmake/modules/FindPythonLibrary.cmake +@@ -12,7 +12,7 @@ + # PYTHON_LONG_VERSION - The version of the Python interpreter found as a human + # readable string. + # +-# PYTHON_SITE_PACKAGES_INSTALL_DIR - this cache variable can be used for installing ++# PYTHON_SITE_PACKAGES_INSTALL_DIR - this cache variable can be used for installing + # own python modules. You may want to adjust this to be the + # same as ${PYTHON_SITE_PACKAGES_DIR}, but then admin + # privileges may be required for installation. +@@ -24,83 +24,39 @@ + # PYTHON_LIBRARY, PYTHON_LIBRARIES- Location of the Python library. + + # Copyright (c) 2007, Simon Edwards <simon(a)simonzone.com> ++# Copyright (c) 2012, Luca Beltrame <lbeltrame(a)kde.org> + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + ++include(FindPackageHandleStandardArgs) + ++find_package(PythonInterp) + +-include(CMakeFindFrameworks) ++if (PYTHONINTERP_FOUND) + +-if(EXISTS PYTHON_LIBRARY) +- # Already in cache, be silent +- set(PYTHONLIBRARY_FOUND TRUE) +-else(EXISTS PYTHON_LIBRARY) ++ # Set the Python libraries to what we actually found for interpreters ++ set(Python_ADDITIONAL_VERSIONS "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") ++ # These are kept for compatibility ++ set(PYTHON_SHORT_VERSION "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") ++ set(PYTHON_LONG_VERSION ${PYTHON_VERSION_STRING}) + +- find_package(PythonInterp) ++ find_package(PythonLibs QUIET) + +- if(PYTHONINTERP_FOUND) ++ if(PYTHONLIBS_FOUND) ++ set(PYTHON_LIBRARY ${PYTHON_LIBRARIES}) ++ endif(PYTHONLIBS_FOUND) + +- # get the directory of the current file, used later on in the file +- get_filename_component( _py_cmake_module_dir ${CMAKE_CURRENT_LIST_FILE} PATH) +- if(NOT EXISTS "${_py_cmake_module_dir}/FindLibPython.py") +- message(FATAL_ERROR "The file FindLibPython.py does not exist in ${_py_cmake_module_dir} (the directory where FindPythonLibrary.cmake is located). Check your installation.") +- endif(NOT EXISTS "${_py_cmake_module_dir}/FindLibPython.py") ++ # Auto detect Python site-packages directory ++ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(True))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) + +- execute_process(COMMAND ${PYTHON_EXECUTABLE} "${_py_cmake_module_dir}/FindLibPython.py" OUTPUT_VARIABLE python_config) +- if(python_config) +- string(REGEX REPLACE ".*exec_prefix:([^\n]+).*$" "\\1" PYTHON_PREFIX ${python_config}) +- string(REGEX REPLACE ".*\nshort_version:([^\n]+).*$" "\\1" PYTHON_SHORT_VERSION ${python_config}) +- string(REGEX REPLACE ".*\nlong_version:([^\n]+).*$" "\\1" PYTHON_LONG_VERSION ${python_config}) ++ # Set the destination install directory to be the same as the site-packages dir if not supplied ++ if(NOT DEFINED PYTHON_SITE_PACKAGES_INSTALL_DIR) ++ set(PYTHON_SITE_PACKAGES_INSTALL_DIR "${PYTHON_SITE_PACKAGES_DIR}") ++ endif(NOT DEFINED PYTHON_SITE_PACKAGES_INSTALL_DIR) + +- string(REGEX REPLACE ".*\npy_inc_dir:([^\n]+).*$" "\\1" _TMP_PYTHON_INCLUDE_PATH ${python_config}) +- string(REGEX REPLACE ".*\nsite_packages_dir:([^\n]+).*$" "\\1" _TMP_PYTHON_SITE_PACKAGES_DIR ${python_config}) ++ message (STATUS "Python system site-packages directory: ${PYTHON_SITE_PACKAGES_DIR}") ++ message(STATUS "Installing Python modules to: ${PYTHON_SITE_PACKAGES_INSTALL_DIR}") + +- # Put these two variables in the cache so they are visible for the user, but read-only: +- set(PYTHON_INCLUDE_PATH "${_TMP_PYTHON_INCLUDE_PATH}" CACHE PATH "The python include directory" FORCE) +- set(PYTHON_SITE_PACKAGES_DIR "${_TMP_PYTHON_SITE_PACKAGES_DIR}" CACHE PATH "The python site packages dir" FORCE) ++endif(PYTHONINTERP_FOUND) + +- # This one is intended to be used and changed by the user for installing own modules: +- set(PYTHON_SITE_PACKAGES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/python${PYTHON_SHORT_VERSION}/site-packages CACHE PATH "The directory where python modules will be installed to.") +- +- string(REGEX REPLACE "([0-9]+).([0-9]+)" "\\1\\2" PYTHON_SHORT_VERSION_NO_DOT ${PYTHON_SHORT_VERSION}) +- set(PYTHON_LIBRARY_NAMES python${PYTHON_SHORT_VERSION} python${PYTHON_SHORT_VERSION_NO_DOT}) +- if(WIN32) +- string(REPLACE "\\" "/" PYTHON_SITE_PACKAGES_DIR ${PYTHON_SITE_PACKAGES_DIR}) +- endif(WIN32) +- find_library(PYTHON_LIBRARY NAMES ${PYTHON_LIBRARY_NAMES} PATHS ${PYTHON_PREFIX}/lib ${PYTHON_PREFIX}/libs NO_DEFAULT_PATH) +- set(PYTHONLIBRARY_FOUND TRUE) +- endif(python_config) +- +- # adapted from cmake's builtin FindPythonLibs +- if(APPLE) +- cmake_find_frameworks(Python) +- set(PYTHON_FRAMEWORK_INCLUDES) +- if(Python_FRAMEWORKS) +- # If a framework has been selected for the include path, +- # make sure "-framework" is used to link it. +- if("${PYTHON_INCLUDE_PATH}" MATCHES "Python\\.framework") +- set(PYTHON_LIBRARY "") +- set(PYTHON_DEBUG_LIBRARY "") +- endif("${PYTHON_INCLUDE_PATH}" MATCHES "Python\\.framework") +- if(NOT PYTHON_LIBRARY) +- set (PYTHON_LIBRARY "-framework Python" CACHE FILEPATH "Python Framework" FORCE) +- endif(NOT PYTHON_LIBRARY) +- set(PYTHONLIBRARY_FOUND TRUE) +- endif(Python_FRAMEWORKS) +- endif(APPLE) +- endif(PYTHONINTERP_FOUND) +- +- if(PYTHONLIBRARY_FOUND) +- set(PYTHON_LIBRARIES ${PYTHON_LIBRARY}) +- if(NOT PYTHONLIBRARY_FIND_QUIETLY) +- message(STATUS "Found Python executable: ${PYTHON_EXECUTABLE}") +- message(STATUS "Found Python version: ${PYTHON_LONG_VERSION}") +- message(STATUS "Found Python library: ${PYTHON_LIBRARY}") +- endif(NOT PYTHONLIBRARY_FIND_QUIETLY) +- else(PYTHONLIBRARY_FOUND) +- if(PYTHONLIBRARY_FIND_REQUIRED) +- message(FATAL_ERROR "Could not find Python") +- endif(PYTHONLIBRARY_FIND_REQUIRED) +- endif(PYTHONLIBRARY_FOUND) +- +-endif (EXISTS PYTHON_LIBRARY) ++find_package_handle_standard_args(PythonLibrary DEFAULT_MSG PYTHON_LIBRARY) diff --git a/cmake/modules/PythonMacros.cmake b/cmake/modules/PythonMacros.cmake -index 774c6b2..661e32d 100644 +index 661e32d..785093e 100644 --- a/cmake/modules/PythonMacros.cmake +++ b/cmake/modules/PythonMacros.cmake -@@ -7,21 +7,21 @@ - # - # This file defines the following macros: +@@ -1,6 +1,8 @@ + # Python macros + # ~~~~~~~~~~~~~ + # Copyright (c) 2007, Simon Edwards <simon(a)simonzone.com> ++# Copyright (c) 2012, Luca Beltrame <lbeltrame(a)kde.org> ++# Copyright (c) 2012, Rolf Eike Beer <eike(a)sf-mail.de> # --# PYTHON_INSTALL (SOURCE_FILE DESINATION_DIR) -+# PYTHON_INSTALL (SOURCE_FILE DESTINATION_DIR) - # Install the SOURCE_FILE, which is a Python .py file, into the + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. +@@ -12,64 +14,65 @@ # destination directory during install. The file will be byte compiled # and both the .py file and .pyc file will be installed. - GET_FILENAME_COMPONENT(PYTHON_MACROS_MODULE_PATH ${CMAKE_CURRENT_LIST_FILE} PATH) +-GET_FILENAME_COMPONENT(PYTHON_MACROS_MODULE_PATH ${CMAKE_CURRENT_LIST_FILE} PATH) ++set(PYTHON_MACROS_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) --MACRO(PYTHON_INSTALL SOURCE_FILE DESINATION_DIR) -+MACRO(PYTHON_INSTALL SOURCE_FILE DESTINATION_DIR) +-MACRO(PYTHON_INSTALL SOURCE_FILE DESTINATION_DIR) ++macro(PYTHON_INSTALL SOURCE_FILE DESTINATION_DIR) - FIND_FILE(_python_compile_py PythonCompile.py PATHS ${CMAKE_MODULE_PATH}) +- FIND_FILE(_python_compile_py PythonCompile.py PATHS ${CMAKE_MODULE_PATH}) ++ find_file(_python_compile_py PythonCompile.py PATHS ${CMAKE_MODULE_PATH}) - ADD_CUSTOM_TARGET(compile_python_files ALL) +- ADD_CUSTOM_TARGET(compile_python_files ALL) ++ add_custom_target(compile_python_files ALL) # Install the source file. -- INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR}) -+ INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR}) +- INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR}) ++ install(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR}) - # Byte compile and install the .pyc file. - GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE) -@@ -34,11 +34,19 @@ MACRO(PYTHON_INSTALL SOURCE_FILE DESINATION_DIR) +- # Byte compile and install the .pyc file. +- GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE) +- GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME) +- GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE) +- GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH) ++ # Byte compile and install the .pyc file. ++ get_filename_component(_absfilename ${SOURCE_FILE} ABSOLUTE) ++ get_filename_component(_filename ${SOURCE_FILE} NAME) ++ get_filename_component(_filenamebase ${SOURCE_FILE} NAME_WE) ++ get_filename_component(_basepath ${SOURCE_FILE} PATH) + + if(WIN32) +- string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}") ++ # remove drive letter ++ string(REGEX REPLACE "^[a-zA-Z]:/" "/" _basepath "${_basepath}") endif(WIN32) - SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename}) -- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) -+ -+ # Python 3.2 changed the pyc file location -+ IF(PYTHON_SHORT_VERSION GREATER 3.1) -+ # To get the right version for suffix -+ STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION}) -+ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc) -+ ELSE(PYTHON_SHORT_VERSION GREATER 3.1) -+ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) -+ ENDIF(PYTHON_SHORT_VERSION GREATER 3.1) +- SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename}) ++ set(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename}) - FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}) + # Python 3.2 changed the pyc file location +- IF(PYTHON_SHORT_VERSION GREATER 3.1) ++ if(PYTHON_VERSION_STRING VERSION_GREATER 3.1) + # To get the right version for suffix +- STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION}) +- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc) +- ELSE(PYTHON_SHORT_VERSION GREATER 3.1) +- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) +- ENDIF(PYTHON_SHORT_VERSION GREATER 3.1) ++ set(_bin_pyc "${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.pyc") ++ set(_py_install_dir "${DESTINATION_DIR}/__pycache__/") ++ else() ++ set(_bin_pyc "${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc") ++ set(_py_install_dir "${DESTINATION_DIR}") ++ endif() -- SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}") -+ SET(_message "Byte-compiling ${_bin_py}") + FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}) - GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE) - IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself. -@@ -58,5 +66,10 @@ MACRO(PYTHON_INSTALL SOURCE_FILE DESINATION_DIR) +- SET(_message "Byte-compiling ${_bin_py}") ++ # Setting because it will be displayed later, in compile_python_files ++ set(_message "Byte-compiling ${_bin_py} to ${_bin_pyc}") + +- GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE) +- IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself. +- ADD_CUSTOM_COMMAND( ++ get_filename_component(_abs_bin_py ${_bin_py} ABSOLUTE) ++ if(_abs_bin_py STREQUAL _absfilename) # Don't copy the file onto itself. ++ add_custom_command( + TARGET compile_python_files +- COMMAND ${CMAKE_COMMAND} -E echo ${_message} +- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} +- DEPENDS ${_absfilename} ++ COMMAND "${CMAKE_COMMAND}" -E echo "${_message}" ++ COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "${_bin_py}" ++ DEPENDS "${_absfilename}" + ) +- ELSE(_abs_bin_py STREQUAL ${_absfilename}) +- ADD_CUSTOM_COMMAND( ++ else() ++ add_custom_command( + TARGET compile_python_files +- COMMAND ${CMAKE_COMMAND} -E echo ${_message} +- COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py} +- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} +- DEPENDS ${_absfilename} ++ COMMAND "${CMAKE_COMMAND}" -E echo "${_message}" ++ COMMAND "${CMAKE_COMMAND}" -E copy "${_absfilename}" "${_bin_py}" ++ COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "${_bin_py}" ++ DEPENDS "${_absfilename}" ) - ENDIF(_abs_bin_py STREQUAL ${_absfilename}) +- ENDIF(_abs_bin_py STREQUAL ${_absfilename}) ++ endif() -- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR}) -+ IF(PYTHON_SHORT_VERSION GREATER 3.1) -+ INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/) -+ ELSE (PYTHON_SHORT_VERSION GREATER 3.1) -+ INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}) -+ ENDIF (PYTHON_SHORT_VERSION GREATER 3.1) -+ - ENDMACRO(PYTHON_INSTALL) +- IF(PYTHON_SHORT_VERSION GREATER 3.1) +- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/) +- ELSE (PYTHON_SHORT_VERSION GREATER 3.1) +- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}) +- ENDIF (PYTHON_SHORT_VERSION GREATER 3.1) ++ install(FILES ${_bin_pyc} DESTINATION "${_py_install_dir}") ++ unset(_py_install_dir) ++ unset(_message) + +-ENDMACRO(PYTHON_INSTALL) ++endmacro(PYTHON_INSTALL) + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegraphics-thumbnailers for openSUSE:Factory
by root＠hilbert.suse.de 08 Nov '12

08 Nov '12

Hello community, here is the log from the commit of package kdegraphics-thumbnailers for openSUSE:Factory checked in at 2012-11-08 07:43:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdegraphics-thumbnailers (Old) and /work/SRC/openSUSE:Factory/.kdegraphics-thumbnailers.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdegraphics-thumbnailers", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kdegraphics-thumbnailers/kdegraphics-thumbnailers.changes 2012-10-07 08:22:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdegraphics-thumbnailers.new/kdegraphics-thumbnailers.changes 2012-11-08 07:43:21.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 2 16:50:59 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 4.9.3 + * see http://kde.org/announcements/4.9.3/ for details + +------------------------------------------------------------------- Old: ---- kdegraphics-thumbnailers-4.9.2.tar.xz New: ---- kdegraphics-thumbnailers-4.9.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics-thumbnailers.spec ++++++ --- /var/tmp/diff_new_pack.yKGcxh/_old 2012-11-08 07:43:22.000000000 +0100 +++ /var/tmp/diff_new_pack.yKGcxh/_new 2012-11-08 07:43:22.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdegraphics-thumbnailers -Version: 4.9.2 +Version: 4.9.3 Release: 0 Summary: Graphics file thumbnail generators License: LGPL-2.1+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegraphics-strigi-analyzer for openSUSE:Factory
by root＠hilbert.suse.de 08 Nov '12

08 Nov '12

Hello community, here is the log from the commit of package kdegraphics-strigi-analyzer for openSUSE:Factory checked in at 2012-11-08 07:43:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdegraphics-strigi-analyzer (Old) and /work/SRC/openSUSE:Factory/.kdegraphics-strigi-analyzer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdegraphics-strigi-analyzer", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer.changes 2012-10-07 08:22:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdegraphics-strigi-analyzer.new/kdegraphics-strigi-analyzer.changes 2012-11-08 07:43:17.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 2 16:50:41 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 4.9.3 + * see http://kde.org/announcements/4.9.3/ for details + +------------------------------------------------------------------- Old: ---- kdegraphics-strigi-analyzer-4.9.2.tar.xz New: ---- kdegraphics-strigi-analyzer-4.9.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics-strigi-analyzer.spec ++++++ --- /var/tmp/diff_new_pack.NNSstw/_old 2012-11-08 07:43:18.000000000 +0100 +++ /var/tmp/diff_new_pack.NNSstw/_new 2012-11-08 07:43:18.000000000 +0100 @@ -25,7 +25,7 @@ License: LGPL-2.1+ Group: Productivity/Graphics/Other Url: http://www.kde.org -Version: 4.9.2 +Version: 4.9.3 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegames4 for openSUSE:Factory
by root＠hilbert.suse.de 08 Nov '12

08 Nov '12

Hello community, here is the log from the commit of package kdegames4 for openSUSE:Factory checked in at 2012-11-08 07:43:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdegames4 (Old) and /work/SRC/openSUSE:Factory/.kdegames4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdegames4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdegames4/kdegames4.changes 2012-10-05 18:37:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdegames4.new/kdegames4.changes 2012-11-08 07:43:15.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 2 17:05:13 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 4.9.3 + * see http://kde.org/announcements/4.9.3/ for details + +------------------------------------------------------------------- Old: ---- kdegames-4.9.2.tar.xz New: ---- kdegames-4.9.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegames4.spec ++++++ --- /var/tmp/diff_new_pack.YDuTkP/_old 2012-11-08 07:43:17.000000000 +0100 +++ /var/tmp/diff_new_pack.YDuTkP/_new 2012-11-08 07:43:17.000000000 +0100 @@ -28,13 +28,15 @@ BuildRequires: python-Twisted %endif %endif -Version: 4.9.2 +Version: 4.9.3 Release: 0 BuildRequires: libkde4-devel >= %version BuildRequires: libqca2-devel BuildRequires: libsndfile-devel BuildRequires: openal-soft-devel BuildRequires: oxygen-icon-theme-large +BuildRequires: python-kde4-devel +BuildRequires: python-qt4-devel BuildRequires: qhull-devel BuildRequires: xz BuildRequires: pkgconfig(glu) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebindings-smokeqt for openSUSE:Factory
by root＠hilbert.suse.de 08 Nov '12

08 Nov '12

Hello community, here is the log from the commit of package kdebindings-smokeqt for openSUSE:Factory checked in at 2012-11-08 07:43:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebindings-smokeqt (Old) and /work/SRC/openSUSE:Factory/.kdebindings-smokeqt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebindings-smokeqt", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebindings-smokeqt/kdebindings-smokeqt.changes 2012-10-07 19:08:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebindings-smokeqt.new/kdebindings-smokeqt.changes 2012-11-08 07:43:11.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 2 16:47:19 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 4.9.3 + * see http://kde.org/announcements/4.9.3/ for details + +------------------------------------------------------------------- Old: ---- smokeqt-4.9.2.tar.xz New: ---- smokeqt-4.9.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebindings-smokeqt.spec ++++++ --- /var/tmp/diff_new_pack.U6a4A1/_old 2012-11-08 07:43:11.000000000 +0100 +++ /var/tmp/diff_new_pack.U6a4A1/_new 2012-11-08 07:43:11.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdebindings-smokeqt -Version: 4.9.2 +Version: 4.9.3 Release: 0 Summary: SMOKE-Qt library for kdebindings License: LGPL-2.1+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0