Hello community, here is the log from the commit of package poxml for openSUSE:Factory checked in at 2016-01-10 13:06:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poxml (Old) and /work/SRC/openSUSE:Factory/.poxml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poxml" Changes: -------- --- /work/SRC/openSUSE:Factory/poxml/poxml.changes 2015-11-15 12:44:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.poxml.new/poxml.changes 2016-01-10 13:07:17.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Dec 13 13:34:05 UTC 2015 - [email protected] + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + + +------------------------------------------------------------------- Old: ---- poxml-15.08.3.tar.xz New: ---- poxml-15.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poxml.spec ++++++ --- /var/tmp/diff_new_pack.k0IGh5/_old 2016-01-10 13:07:18.000000000 +0100 +++ /var/tmp/diff_new_pack.k0IGh5/_new 2016-01-10 13:07:18.000000000 +0100 @@ -19,16 +19,19 @@ Name: poxml BuildRequires: antlr BuildRequires: antlr-devel -BuildRequires: libkde4-devel +BuildRequires: extra-cmake-modules +BuildRequires: gettext-devel +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: kdoctools-devel Summary: KDE SDK POXML Package License: GPL-2.0 and GFDL-1.2 Group: System/GUI/KDE Url: http://www.kde.org/ -Version: 15.08.3 +Version: 15.12.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description This package suggests the packages, built from the kdesdk poxml module. @@ -42,14 +45,12 @@ %endif export CXXFLAGS="$RPM_OPT_FLAGS -fPIC" export CFLAGS="$RPM_OPT_FLAGS -fPIC" - %cmake_kde4 -d build -- -DCMAKE_CXXFLAGS="$RPM_OPT_FLAGS" -DCMAKE_CFLAGS="$RPM_OPT_FLAGS" + %cmake_kf5 -d build -- -DCMAKE_CXXFLAGS="$RPM_OPT_FLAGS" -DCMAKE_CFLAGS="$RPM_OPT_FLAGS" %make_jobs make %install - cd build - %makeinstall - %kde_post_install + %kf5_makeinstall -C build %post -p /sbin/ldconfig @@ -58,28 +59,26 @@ %clean rm -rf $RPM_BUILD_ROOT -%package -n kde4-l10n-devel +%package -n kde-l10n-devel Summary: KDE SDK Package Group: System/GUI/KDE -%kde4_runtime_requires +Obsoletes: kde4-l10n-devel < %{version} +Provides: kde4-l10n-devel = %{version} -%description -n kde4-l10n-devel +%description -n kde-l10n-devel This package suggests the packages, built from the kdesdk module. -%post -n kde4-l10n-devel -p /sbin/ldconfig +%post -n kde-l10n-devel -p /sbin/ldconfig -%postun -n kde4-l10n-devel -p /sbin/ldconfig +%postun -n kde-l10n-devel -p /sbin/ldconfig -%files -n kde4-l10n-devel +%files -n kde-l10n-devel %defattr(-,root,root) %doc COPYING COPYING.DOC -%{_kde4_bindir}/po2xml -%{_kde4_bindir}/split2po -%{_kde4_bindir}/swappo -%{_kde4_bindir}/xml2pot -%{_mandir}/man1/po2xml.1.gz -%{_mandir}/man1/split2po.1.gz -%{_mandir}/man1/swappo.1.gz -%{_mandir}/man1/xml2pot.1.gz +%_bindir/po2xml +%_bindir/split2po +%_bindir/swappo +%_bindir/xml2pot +%_mandir/man1/*.*.gz %changelog ++++++ poxml-15.08.3.tar.xz -> poxml-15.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poxml-15.08.3/CMakeLists.txt new/poxml-15.12.0/CMakeLists.txt --- old/poxml-15.08.3/CMakeLists.txt 2014-03-09 21:27:38.000000000 +0100 +++ new/poxml-15.12.0/CMakeLists.txt 2015-08-26 00:26:50.000000000 +0200 @@ -1,17 +1,28 @@ project(poxml) -# search packages used by KDE -find_package(KDE4 REQUIRED) -include(KDE4Defaults) -add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) -include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIR}) +cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ) +find_package(ECM 1.7.0 REQUIRED CONFIG) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) + +include(FeatureSummary) +include(ECMAddAppIcon) +include(ECMInstallIcons) +include(KDEInstallDirs) +include(KDECompilerSettings) +include(KDECMakeSettings) find_package(GettextPO REQUIRED) -macro_log_feature(GETTEXTPO_FOUND "gettext-po" "A library for processing PO files" "http://www.gnu.org/software/gettext"; TRUE "" "Required to build the poxml tools.") +set_package_properties("gettext-po" PROPERTIES + DESCRIPTION "A library for processing PO files" + URL "http://www.gnu.org/software/gettext"; + TYPE REQUIRED + PURPOSE "Required to build the poxml tools.") + +find_package(Gettext) +find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Xml) +find_package(KF5 REQUIRED COMPONENTS DocTools) -macro_optional_find_package(Gettext) add_subdirectory( doc ) @@ -22,11 +33,11 @@ set(split2po_SRCS split.cpp parser.cpp gettextpoutils.cpp) -kde4_add_executable(split2po ${split2po_SRCS}) +add_executable(split2po ${split2po_SRCS}) -target_link_libraries(split2po ${GETTEXTPO_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTCORE_LIBRARY}) +target_link_libraries(split2po ${GETTEXTPO_LIBRARY} Qt5::Xml Qt5::Core) -install(TARGETS split2po ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS split2po ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) ########### next target ############### @@ -34,11 +45,11 @@ set(xml2pot_SRCS xml2pot.cpp parser.cpp gettextpoutils.cpp) -kde4_add_executable(xml2pot ${xml2pot_SRCS}) +add_executable(xml2pot ${xml2pot_SRCS}) -target_link_libraries(xml2pot ${GETTEXTPO_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTCORE_LIBRARY}) +target_link_libraries(xml2pot ${GETTEXTPO_LIBRARY} Qt5::Xml Qt5::Core) -install(TARGETS xml2pot ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS xml2pot ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) ########### next target ############### @@ -49,11 +60,11 @@ parser.cpp) -kde4_add_executable(po2xml ${po2xml_SRCS}) +add_executable(po2xml ${po2xml_SRCS}) -target_link_libraries(po2xml ${GETTEXTPO_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTCORE_LIBRARY}) +target_link_libraries(po2xml ${GETTEXTPO_LIBRARY} Qt5::Xml Qt5::Core) -install(TARGETS po2xml ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS po2xml ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) ########### next target ############### @@ -63,13 +74,15 @@ gettextpoutils.cpp) -kde4_add_executable(swappo ${swappo_SRCS}) +add_executable(swappo ${swappo_SRCS}) target_link_libraries(swappo ${GETTEXTPO_LIBRARY}) -install(TARGETS swappo ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS swappo ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) add_subdirectory(tests) + +feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poxml-15.08.3/doc/CMakeLists.txt new/poxml-15.12.0/doc/CMakeLists.txt --- old/poxml-15.08.3/doc/CMakeLists.txt 2014-03-09 21:27:38.000000000 +0100 +++ new/poxml-15.12.0/doc/CMakeLists.txt 2015-08-26 00:26:50.000000000 +0200 @@ -1,4 +1,4 @@ -kde4_create_manpage(man-po2xml.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) -kde4_create_manpage(man-split2po.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) -kde4_create_manpage(man-swappo.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) -kde4_create_manpage(man-xml2pot.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) +kdoctools_create_manpage(man-po2xml.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) +kdoctools_create_manpage(man-split2po.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) +kdoctools_create_manpage(man-swappo.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) +kdoctools_create_manpage(man-xml2pot.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poxml-15.08.3/doc/man-po2xml.1.docbook new/poxml-15.12.0/doc/man-po2xml.1.docbook --- old/poxml-15.08.3/doc/man-po2xml.1.docbook 2014-03-09 21:27:38.000000000 +0100 +++ new/poxml-15.12.0/doc/man-po2xml.1.docbook 2015-08-26 00:26:50.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poxml-15.08.3/doc/man-split2po.1.docbook new/poxml-15.12.0/doc/man-split2po.1.docbook --- old/poxml-15.08.3/doc/man-split2po.1.docbook 2014-03-09 21:27:38.000000000 +0100 +++ new/poxml-15.12.0/doc/man-split2po.1.docbook 2015-08-26 00:26:50.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poxml-15.08.3/doc/man-swappo.1.docbook new/poxml-15.12.0/doc/man-swappo.1.docbook --- old/poxml-15.08.3/doc/man-swappo.1.docbook 2014-03-09 21:27:38.000000000 +0100 +++ new/poxml-15.12.0/doc/man-swappo.1.docbook 2015-08-26 00:26:50.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poxml-15.08.3/doc/man-xml2pot.1.docbook new/poxml-15.12.0/doc/man-xml2pot.1.docbook --- old/poxml-15.08.3/doc/man-xml2pot.1.docbook 2014-03-09 21:27:38.000000000 +0100 +++ new/poxml-15.12.0/doc/man-xml2pot.1.docbook 2015-08-26 00:26:50.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poxml-15.08.3/tests/CMakeLists.txt new/poxml-15.12.0/tests/CMakeLists.txt --- old/poxml-15.08.3/tests/CMakeLists.txt 2014-03-09 21:27:38.000000000 +0100 +++ new/poxml-15.12.0/tests/CMakeLists.txt 2015-08-26 00:26:50.000000000 +0200 @@ -5,7 +5,7 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lauri.pot - COMMAND checkXML ${lauri_xml} + COMMAND checkXML5 ${lauri_xml} COMMAND xml2pot ${lauri_xml} > lauri.pot COMMAND msgmerge -o lauri.pot lauri.pot lauri.pot DEPENDS ${lauri_xml} @@ -38,7 +38,7 @@ add_test( NAME lauri_de - COMMAND checkXML lauri_de.xml + COMMAND checkXML5 lauri_de.xml WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poxml-15.08.3/tests/lauri.xml new/poxml-15.12.0/tests/lauri.xml --- old/poxml-15.08.3/tests/lauri.xml 2014-03-09 21:27:38.000000000 +0100 +++ new/poxml-15.12.0/tests/lauri.xml 2015-08-26 00:26:50.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE" > <!-- change language only here --> <!ENTITY lauri "<emphasis>Lauri</emphasis>" > <!ENTITY i18n-file-quit "<menuchoice><shortcut><keycombo action='simul'>&Ctrl;<keycap>Q</keycap></keycombo></shortcut><guimenu>File</guimenu><guimenuitem>Quit</guimenuitem></menuchoice>"> ]>
