Hello community, here is the log from the commit of package kinit for openSUSE:Factory checked in at 2014-09-12 17:03:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kinit (Old) and /work/SRC/openSUSE:Factory/.kinit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kinit" Changes: -------- --- /work/SRC/openSUSE:Factory/kinit/kinit.changes 2014-08-16 15:42:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kinit.new/kinit.changes 2014-09-12 17:04:33.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Sep 9 09:49:32 UTC 2014 - [email protected] + +- Update to 5.2.0 + * For more details please see: + http://kde.org/announcements/kde-frameworks-5.2.php +- Rebase fpie.patch + +------------------------------------------------------------------- Old: ---- kinit-5.1.0.tar.xz New: ---- kinit-5.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kinit.spec ++++++ --- /var/tmp/diff_new_pack.JuOJdw/_old 2014-09-12 17:04:35.000000000 +0200 +++ /var/tmp/diff_new_pack.JuOJdw/_new 2014-09-12 17:04:35.000000000 +0200 @@ -17,11 +17,11 @@ Name: kinit -Version: 5.1.0 +Version: 5.2.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.1.0 +BuildRequires: extra-cmake-modules >= 1.2.0 BuildRequires: fdupes BuildRequires: kcrash-devel >= %{kf5_version} BuildRequires: kdoctools-devel >= %{kf5_version} ++++++ fpie.patch ++++++ --- /var/tmp/diff_new_pack.JuOJdw/_old 2014-09-12 17:04:35.000000000 +0200 +++ /var/tmp/diff_new_pack.JuOJdw/_new 2014-09-12 17:04:35.000000000 +0200 @@ -1,5 +1,5 @@ diff --git a/src/start_kdeinit/CMakeLists.txt b/src/start_kdeinit/CMakeLists.txt -index 56a91e3..1af14de 100644 +index 46d6cb3..31434df 100644 --- a/src/start_kdeinit/CMakeLists.txt +++ b/src/start_kdeinit/CMakeLists.txt @@ -2,6 +2,11 @@ add_executable(start_kdeinit start_kdeinit.c) @@ -13,4 +13,4 @@ + add_executable(start_kdeinit_wrapper start_kdeinit_wrapper.c) - install(TARGETS start_kdeinit DESTINATION ${KF5_LIBEXEC_INSTALL_DIR}) + install(TARGETS start_kdeinit DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}) ++++++ kinit-5.1.0.tar.xz -> kinit-5.2.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.1.0/CMakeLists.txt new/kinit-5.2.0/CMakeLists.txt --- old/kinit-5.1.0/CMakeLists.txt 2014-08-02 11:05:47.000000000 +0200 +++ new/kinit-5.2.0/CMakeLists.txt 2014-09-09 02:24:19.000000000 +0200 @@ -2,7 +2,7 @@ project(KInit) -find_package(ECM 1.1.0 REQUIRED NO_MODULE) +find_package(ECM 1.2.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(REQUIRED_QT_VERSION "5.2") @@ -15,8 +15,8 @@ include(ECMPackageConfigHelpers) include(ECMSetupVersion) -set(KF5_VERSION "5.1.0") # handled by release scripts -set(KF5_DEP_VERSION "5.1.0") # handled by release scripts +set(KF5_VERSION "5.2.0") # handled by release scripts +set(KF5_DEP_VERSION "5.2.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KINIT VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kinit_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.1.0/README.md new/kinit-5.2.0/README.md --- old/kinit-5.1.0/README.md 2014-08-02 11:05:47.000000000 +0200 +++ new/kinit-5.2.0/README.md 2014-09-09 02:24:19.000000000 +0200 @@ -83,9 +83,3 @@ [kde-dev-scripts]: https://projects.kde.org/projects/kde/kdesdk/kde-dev-scripts/ -## Links - -- Home page: <https://projects.kde.org/projects/frameworks/kinit> -- Mailing list: <https://mail.kde.org/mailman/listinfo/kde-frameworks-devel> -- IRC channel: #kde-devel on Freenode -- Git repository: <https://projects.kde.org/projects/frameworks/kinit/repository> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.1.0/metainfo.yaml new/kinit-5.2.0/metainfo.yaml --- old/kinit-5.1.0/metainfo.yaml 2014-08-02 11:05:47.000000000 +0200 +++ new/kinit-5.2.0/metainfo.yaml 2014-09-09 02:24:19.000000000 +0200 @@ -9,3 +9,4 @@ portingAid: false deprecated: false release: true +cmakename: KF5Init diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.1.0/po/cs/kinit5.po new/kinit-5.2.0/po/cs/kinit5.po --- old/kinit-5.1.0/po/cs/kinit5.po 2014-08-02 11:05:47.000000000 +0200 +++ new/kinit-5.2.0/po/cs/kinit5.po 2014-09-09 02:24:19.000000000 +0200 @@ -18,6 +18,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" +"X-Language: cs_CZ\n" +"X-Source-Language: en_US\n" #: kdeinit/kinit.cpp:526 msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.1.0/po/fi/kinit5.po new/kinit-5.2.0/po/fi/kinit5.po --- old/kinit-5.1.0/po/fi/kinit5.po 2014-08-02 11:05:47.000000000 +0200 +++ new/kinit-5.2.0/po/fi/kinit5.po 2014-09-09 02:24:19.000000000 +0200 @@ -29,7 +29,7 @@ "POT-Creation-Date: 2014-07-05 08:10+0000\n" "PO-Revision-Date: 2014-03-30 00:13+0200\n" "Last-Translator: Lasse Liehu <[email protected]>\n" -"Language-Team: Finnish <[email protected]>\n" +"Language-Team: Finnish <[email protected]>\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.1.0/po/zh_CN/kinit5.po new/kinit-5.2.0/po/zh_CN/kinit5.po --- old/kinit-5.1.0/po/zh_CN/kinit5.po 2014-08-02 11:05:47.000000000 +0200 +++ new/kinit-5.2.0/po/zh_CN/kinit5.po 2014-09-09 02:24:19.000000000 +0200 @@ -99,7 +99,6 @@ #: klauncher/klauncher.cpp:1054 #, kde-format -#| msgid "Could not find service '%1'." msgid "Could not find the '%1' plugin.\n" msgstr "找不到插件“%1”。\n" @@ -109,9 +108,6 @@ msgstr "装入“%1”时出错。\n" #: klauncher/klauncher_main.cpp:142 -#| msgid "" -#| "klauncher: This program is not supposed to be started manually.\n" -#| "klauncher: It is started automatically by kdeinit4.\n" msgid "" "klauncher: This program is not supposed to be started manually.\n" "klauncher: It is started automatically by kdeinit5.\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.1.0/src/CMakeLists.txt new/kinit-5.2.0/src/CMakeLists.txt --- old/kinit-5.1.0/src/CMakeLists.txt 2014-08-02 11:05:47.000000000 +0200 +++ new/kinit-5.2.0/src/CMakeLists.txt 2014-09-09 02:24:19.000000000 +0200 @@ -3,9 +3,9 @@ if (CMAKE_SYSTEM_NAME MATCHES Linux) if (Libcap_FOUND) - message(STATUS "Using capabilities kdeinit wrapper in order to protect it from bad Linux OOM-killer") + message(STATUS "kdeinit wrapper uses capabilities to protect kdeinit from misguided Linux OOM killer") else() - message(STATUS "Using setuid root kdeinit wrapper in order to protect it from bad Linux OOM-killer") + message(STATUS "kdeinit wrapper uses setuid-root to protect kdeinit from misguided Linux OOM killer") endif() set(KDEINIT_OOM_PROTECT 1) endif () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.1.0/src/config-kdeinit.h.cmake new/kinit-5.2.0/src/config-kdeinit.h.cmake --- old/kinit-5.1.0/src/config-kdeinit.h.cmake 2014-08-02 11:05:47.000000000 +0200 +++ new/kinit-5.2.0/src/config-kdeinit.h.cmake 2014-09-09 02:24:19.000000000 +0200 @@ -2,8 +2,8 @@ #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" #define LIB_INSTALL_DIR "${LIB_INSTALL_DIR}" -#define KF5_LIBEXEC_INSTALL_DIR "${KF5_LIBEXEC_INSTALL_DIR}" -#define BIN_INSTALL_DIR "${BIN_INSTALL_DIR}" +#define CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}" +#define CMAKE_INSTALL_FULL_BINDIR "${CMAKE_INSTALL_FULL_BINDIR}" /* These are for proctitle.cpp: */ #cmakedefine01 HAVE___PROGNAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.1.0/src/kdeinit/CMakeLists.txt new/kinit-5.2.0/src/kdeinit/CMakeLists.txt --- old/kinit-5.1.0/src/kdeinit/CMakeLists.txt 2014-08-02 11:05:47.000000000 +0200 +++ new/kinit-5.2.0/src/kdeinit/CMakeLists.txt 2014-09-09 02:24:19.000000000 +0200 @@ -32,7 +32,7 @@ target_compile_definitions(kdeinit5 PRIVATE CMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}" LIB_INSTALL_DIR="${LIB_INSTALL_DIR}" - KF5_LIBEXEC_INSTALL_DIR="${KF5_LIBEXEC_INSTALL_DIR}" + KF5_LIBEXEC_INSTALL_DIR="${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}" ) if (X11_FOUND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.1.0/src/kdeinit/kinit.cpp new/kinit-5.2.0/src/kdeinit/kinit.cpp --- old/kinit-5.1.0/src/kdeinit/kinit.cpp 2014-08-02 11:05:47.000000000 +0200 +++ new/kinit-5.2.0/src/kdeinit/kinit.cpp 2014-09-09 02:24:19.000000000 +0200 @@ -406,7 +406,7 @@ } } else { paths = QString::fromLocal8Bit(qgetenv("PATH")).split(pathSepRegExp, QString::KeepEmptyParts); - paths.prepend(QFile::decodeName(CMAKE_INSTALL_PREFIX "/" KF5_LIBEXEC_INSTALL_DIR)); + paths.prepend(QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5)); } QString execpath = QStandardPaths::findExecutable(QFile::decodeName(exec), paths); if (avoid_loops && !execpath.isEmpty()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.1.0/src/klauncher/CMakeLists.txt new/kinit-5.2.0/src/klauncher/CMakeLists.txt --- old/kinit-5.1.0/src/klauncher/CMakeLists.txt 2014-08-02 11:05:47.000000000 +0200 +++ new/kinit-5.2.0/src/klauncher/CMakeLists.txt 2014-09-09 02:24:19.000000000 +0200 @@ -25,5 +25,5 @@ ) install(TARGETS kdeinit_klauncher ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) -install(TARGETS klauncher DESTINATION ${KF5_LIBEXEC_INSTALL_DIR} ) +install(TARGETS klauncher DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5} ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KLauncher.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} RENAME kf5_org.kde.KLauncher.xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.1.0/src/klauncher/klauncher.cpp new/kinit-5.2.0/src/klauncher/klauncher.cpp --- old/kinit-5.1.0/src/klauncher/klauncher.cpp 2014-08-02 11:05:47.000000000 +0200 +++ new/kinit-5.2.0/src/klauncher/klauncher.cpp 2014-09-09 02:24:19.000000000 +0200 @@ -1061,7 +1061,7 @@ arg_list << protocol; arg_list << mConnectionServer.address().toString(); arg_list << app_socket; - QString name = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" KF5_LIBEXEC_INSTALL_DIR "/kioslave"); + QString name = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kioslave"); #else QString arg1 = protocol; QString arg2 = mConnectionServer.address().toString(); @@ -1088,7 +1088,7 @@ if (mSlaveValgrind == protocol) { arg_list.prepend(name); #ifndef USE_KPROCESS_FOR_KIOSLAVES // otherwise we've already done this - arg_list.prepend(QFile::decodeName(CMAKE_INSTALL_PREFIX "/" KF5_LIBEXEC_INSTALL_DIR "/kioslave")); + arg_list.prepend(QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kioslave")); #endif name = QString::fromLatin1("valgrind"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.1.0/src/start_kdeinit/CMakeLists.txt new/kinit-5.2.0/src/start_kdeinit/CMakeLists.txt --- old/kinit-5.1.0/src/start_kdeinit/CMakeLists.txt 2014-08-02 11:05:47.000000000 +0200 +++ new/kinit-5.2.0/src/start_kdeinit/CMakeLists.txt 2014-09-09 02:24:19.000000000 +0200 @@ -4,8 +4,8 @@ endif() add_executable(start_kdeinit_wrapper start_kdeinit_wrapper.c) -install(TARGETS start_kdeinit DESTINATION ${KF5_LIBEXEC_INSTALL_DIR}) -install(TARGETS start_kdeinit_wrapper DESTINATION ${KF5_LIBEXEC_INSTALL_DIR}) +install(TARGETS start_kdeinit DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}) +install(TARGETS start_kdeinit_wrapper DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}) if (KDEINIT_OOM_PROTECT) if (Libcap_FOUND) @@ -13,11 +13,11 @@ COMMAND ${SETCAP_EXECUTABLE} CAP_SYS_RESOURCE=+ep - $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${KF5_LIBEXEC_INSTALL_DIR}/start_kdeinit)" + $ENV{DESTDIR}${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}/start_kdeinit)" ) else() install(CODE " - set(START_KDEINIT_PATH \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${KF5_LIBEXEC_INSTALL_DIR}/start_kdeinit\") + set(START_KDEINIT_PATH \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}/start_kdeinit\") EXECUTE_PROCESS(COMMAND sh -c \"chown 0 '\${START_KDEINIT_PATH}' && chmod u+s '\${START_KDEINIT_PATH}'\") ") endif () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.1.0/src/start_kdeinit/start_kdeinit.c new/kinit-5.2.0/src/start_kdeinit/start_kdeinit.c --- old/kinit-5.1.0/src/start_kdeinit/start_kdeinit.c 2014-08-02 11:05:47.000000000 +0200 +++ new/kinit-5.2.0/src/start_kdeinit/start_kdeinit.c 2014-09-09 02:24:19.000000000 +0200 @@ -32,7 +32,7 @@ #include <sys/capability.h> #endif -#define EXECUTE CMAKE_INSTALL_PREFIX"/"BIN_INSTALL_DIR "/kdeinit5" +#define EXECUTE CMAKE_INSTALL_FULL_BINDIR "/kdeinit5" #if KDEINIT_OOM_PROTECT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinit-5.1.0/src/start_kdeinit/start_kdeinit_wrapper.c new/kinit-5.2.0/src/start_kdeinit/start_kdeinit_wrapper.c --- old/kinit-5.1.0/src/start_kdeinit/start_kdeinit_wrapper.c 2014-08-02 11:05:47.000000000 +0200 +++ new/kinit-5.2.0/src/start_kdeinit/start_kdeinit_wrapper.c 2014-09-09 02:24:19.000000000 +0200 @@ -23,7 +23,7 @@ #include <string.h> #include <unistd.h> -#define EXECUTE CMAKE_INSTALL_PREFIX"/"KF5_LIBEXEC_INSTALL_DIR "/start_kdeinit" +#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit" #if KDEINIT_OOM_PROTECT -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
