Hello community, here is the log from the commit of package sonnet for openSUSE:Factory checked in at 2017-07-17 10:26:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sonnet (Old) and /work/SRC/openSUSE:Factory/.sonnet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sonnet" Mon Jul 17 10:26:57 2017 rev:45 rq:509947 version:5.36.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sonnet/sonnet.changes 2017-07-05 23:54:31.657286216 +0200 +++ /work/SRC/openSUSE:Factory/.sonnet.new/sonnet.changes 2017-07-17 10:27:01.754602866 +0200 @@ -1,0 +2,17 @@ +Wed Jul 12 14:51:10 UTC 2017 - [email protected] + +- Move unversioned files to the new sonnet package to be more + compliant with the SLPP + +------------------------------------------------------------------- +Wed Jul 12 07:14:05 CEST 2017 - [email protected] + +- Update to 5.36.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.36.0.php +- Changes since 5.35.0: + * add debug categories index, for kdebugsettings + * [FEATURE] Option to build & install QCH file with the public API dox + +------------------------------------------------------------------- Old: ---- sonnet-5.35.0.tar.xz New: ---- sonnet-5.36.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sonnet.spec ++++++ --- /var/tmp/diff_new_pack.8Eazih/_old 2017-07-17 10:27:02.270530132 +0200 +++ /var/tmp/diff_new_pack.8Eazih/_new 2017-07-17 10:27:02.270530132 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define sonum 5 -%define _tar_path 5.35 +%define _tar_path 5.36 Name: sonnet -Version: 5.35.0 +Version: 5.36.0 Release: 0 #BuildRequires: aspell-devel BuildRequires: cmake >= 3.0 @@ -53,6 +53,7 @@ %package -n libKF5SonnetCore%sonum Summary: KDE spell checking library Group: System/GUI/KDE +Requires: %{name} >= %{_tar_path} Obsoletes: libKF5SonnetCore4 %if %{with lang} Recommends: libKF5SonnetCore%sonum-lang = %{version} @@ -117,12 +118,17 @@ %files -n libKF5SonnetCore%sonum-lang -f %{name}5.lang %endif +%files +%defattr(-,root,root) +%doc COPYING* README* +%config %{_kf5_configdir}/sonnet.categories +%{_kf5_plugindir}/ +%{_kf5_datadir}/sonnet/ + %files -n libKF5SonnetCore%sonum %defattr(-,root,root) %doc COPYING* %{_kf5_libdir}/libKF5SonnetCore.so.* -%{_kf5_plugindir}/ -%{_kf5_datadir}/sonnet/ %files -n libKF5SonnetUi%sonum %defattr(-,root,root) ++++++ sonnet-5.35.0.tar.xz -> sonnet-5.36.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.35.0/CMakeLists.txt new/sonnet-5.36.0/CMakeLists.txt --- old/sonnet-5.35.0/CMakeLists.txt 2017-06-03 12:25:25.000000000 +0200 +++ new/sonnet-5.36.0/CMakeLists.txt 2017-07-02 10:15:30.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.35.0") # handled by release scripts +set(KF5_VERSION "5.36.0") # handled by release scripts project(Sonnet VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.35.0 NO_MODULE) +find_package(ECM 5.36.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -25,6 +25,7 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) +include(ECMAddQch) include(ECMPoQmTools) ecm_setup_version(PROJECT VARIABLE_PREFIX SONNET @@ -32,6 +33,9 @@ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5SonnetConfigVersion.cmake" SOVERSION 5) +option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) +add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") + if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ecm_install_po_files_as_qm(po) endif() @@ -45,6 +49,16 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Sonnet") +if (BUILD_QCH) + ecm_install_qch_export( + TARGETS KF5SonnetCore_QCH KF5SonnetUi_QCH + FILE KF5SonnetQchTargets.cmake + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel + ) + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5SonnetQchTargets.cmake\")") +endif() + include(CMakePackageConfigHelpers) configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5SonnetConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5SonnetConfig.cmake" @@ -60,4 +74,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sonnet_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) +# contains list of debug categories, for kdebugsettings +install(FILES sonnet.categories DESTINATION ${KDE_INSTALL_CONFDIR}) + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.35.0/KF5SonnetConfig.cmake.in new/sonnet-5.36.0/KF5SonnetConfig.cmake.in --- old/sonnet-5.35.0/KF5SonnetConfig.cmake.in 2017-06-03 12:25:25.000000000 +0200 +++ new/sonnet-5.36.0/KF5SonnetConfig.cmake.in 2017-07-02 10:15:30.000000000 +0200 @@ -5,4 +5,4 @@ include("${CMAKE_CURRENT_LIST_DIR}/KF5SonnetTargets.cmake") - +@PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.35.0/po/ca/sonnet5_qt.po new/sonnet-5.36.0/po/ca/sonnet5_qt.po --- old/sonnet-5.35.0/po/ca/sonnet5_qt.po 2017-06-03 12:25:25.000000000 +0200 +++ new/sonnet-5.36.0/po/ca/sonnet5_qt.po 2017-07-02 10:15:30.000000000 +0200 @@ -1,12 +1,12 @@ # Translation of sonnet5_qt.po to Catalan -# Copyright (C) 2014-2016 This_file_is_part_of_KDE +# Copyright (C) 2014-2017 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # # Sebastià Pla i Sanz <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. # Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013, 2014, 2015, 2016. # Albert Astals Cid <[email protected]>, 2004, 2005, 2007. -# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. +# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017. # Robert Millan <[email protected]>, 2009. # Orestes Mas <[email protected]>, 2010. msgid "" @@ -14,8 +14,8 @@ "Project-Id-Version: sonnet5_qt\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2016-04-25 23:50+0100\n" -"Last-Translator: Antoni Bella Pérez <[email protected]>\n" +"PO-Revision-Date: 2017-06-25 11:12+0100\n" +"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -411,7 +411,7 @@ #: ui/sonnetui.ui:157 msgctxt "SonnetUi|" msgid "Replace &with:" -msgstr "Substitueix &amb:" +msgstr "S&ubstitueix per:" #: ui/sonnetui.ui:177 msgctxt "SonnetUi|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.35.0/po/ca@valencia/sonnet5_qt.po new/sonnet-5.36.0/po/ca@valencia/sonnet5_qt.po --- old/sonnet-5.35.0/po/ca@valencia/sonnet5_qt.po 2017-06-03 12:25:25.000000000 +0200 +++ new/sonnet-5.36.0/po/ca@valencia/sonnet5_qt.po 2017-07-02 10:15:30.000000000 +0200 @@ -1,12 +1,12 @@ # Translation of sonnet5_qt.po to Catalan (Valencian) -# Copyright (C) 2014-2016 This_file_is_part_of_KDE +# Copyright (C) 2014-2017 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # # Sebastià Pla i Sanz <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. # Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013, 2014, 2015, 2016. # Albert Astals Cid <[email protected]>, 2004, 2005, 2007. -# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. +# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017. # Robert Millan <[email protected]>, 2009. # Orestes Mas <[email protected]>, 2010. msgid "" @@ -14,8 +14,8 @@ "Project-Id-Version: sonnet5_qt\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2016-04-25 23:50+0100\n" -"Last-Translator: Antoni Bella Pérez <[email protected]>\n" +"PO-Revision-Date: 2017-06-25 11:12+0100\n" +"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" @@ -411,7 +411,7 @@ #: ui/sonnetui.ui:157 msgctxt "SonnetUi|" msgid "Replace &with:" -msgstr "Substitueix &amb:" +msgstr "S&ubstitueix per:" #: ui/sonnetui.ui:177 msgctxt "SonnetUi|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.35.0/sonnet.categories new/sonnet-5.36.0/sonnet.categories --- old/sonnet-5.35.0/sonnet.categories 1970-01-01 01:00:00.000000000 +0100 +++ new/sonnet-5.36.0/sonnet.categories 2017-07-02 10:15:30.000000000 +0200 @@ -0,0 +1,8 @@ +# Logging categories (for kdebugsettings) +sonnet.plugins.hunspell Sonnet HUnspell plugin +sonnet.plugins.hspell Sonnet Hspell plugin +sonnet.plugins.aspell Sonnet Aspell plugin +sonnet.plugins.voikko Sonnet Voikko plugin +sonnet.core Sonnet Core +sonnet.ui Sonnet UI + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.35.0/src/core/CMakeLists.txt new/sonnet-5.36.0/src/core/CMakeLists.txt --- old/sonnet-5.35.0/src/core/CMakeLists.txt 2017-06-03 12:25:25.000000000 +0200 +++ new/sonnet-5.36.0/src/core/CMakeLists.txt 2017-07-02 10:15:30.000000000 +0200 @@ -51,6 +51,27 @@ ${CMAKE_CURRENT_BINARY_DIR}/sonnetcore_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/SonnetCore/sonnet COMPONENT Devel) +if (BUILD_QCH) + ecm_add_qch( + KF5SonnetCore_QCH + NAME SonnetCore + BASE_NAME KF5SonnetCore + VERSION ${KF5_VERSION} + ORG_DOMAIN org.kde + SOURCES # using only public headers, to cover only public API + ${SonnetCore_HEADERS} + LINK_QCHS + Qt5Core_QCH + BLANK_MACROS + SONNETCORE_EXPORT + SONNETCORE_DEPRECATED_EXPORT + SONNETCORE_DEPRECATED + TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + COMPONENT Devel + ) +endif() + include(ECMGeneratePriFile) ecm_generate_pri_file(BASE_NAME SonnetCore LIB_NAME KF5SonnetCore DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/SonnetCore) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.35.0/src/ui/CMakeLists.txt new/sonnet-5.36.0/src/ui/CMakeLists.txt --- old/sonnet-5.35.0/src/ui/CMakeLists.txt 2017-06-03 12:25:25.000000000 +0200 +++ new/sonnet-5.36.0/src/ui/CMakeLists.txt 2017-07-02 10:15:30.000000000 +0200 @@ -70,6 +70,29 @@ ${CMAKE_CURRENT_BINARY_DIR}/sonnetui_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/SonnetUi/sonnet COMPONENT Devel) +if (BUILD_QCH) + ecm_add_qch( + KF5SonnetUi_QCH + NAME SonnetUi + BASE_NAME KF5SonnetUi + VERSION ${KF5_VERSION} + ORG_DOMAIN org.kde + SOURCES # using only public headers, to cover only public API + ${SonnetUi_HEADERS} + LINK_QCHS + Qt5Core_QCH + Qt5Gui_QCH + Qt5Widgets_QCH + BLANK_MACROS + SONNETUI_EXPORT + SONNETUI_DEPRECATED_EXPORT + SONNETUI_DEPRECATED + TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + COMPONENT Devel + ) +endif() + include(ECMGeneratePriFile) ecm_generate_pri_file(BASE_NAME SonnetUi LIB_NAME KF5SonnetUi DEPS "widgets" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/SonnetUi) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
