Hello community, here is the log from the commit of package attica-qt5 for openSUSE:Factory checked in at 2014-03-10 12:18:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/attica-qt5 (Old) and /work/SRC/openSUSE:Factory/.attica-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "attica-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/attica-qt5/attica-qt5.changes 2014-02-19 10:54:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.attica-qt5.new/attica-qt5.changes 2014-03-10 12:18:28.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 4 16:38:04 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.97.0: + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-alpha2.php + +------------------------------------------------------------------- Old: ---- attica-4.96.0.tar.xz New: ---- attica-4.97.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ attica-qt5.spec ++++++ --- /var/tmp/diff_new_pack.DI8rDB/_old 2014-03-10 12:18:29.000000000 +0100 +++ /var/tmp/diff_new_pack.DI8rDB/_new 2014-03-10 12:18:29.000000000 +0100 @@ -16,12 +16,12 @@ # -%define sonum 4 +%define sonum 5 %define rname attica %define _libname KF5Attica Name: attica-qt5 -Version: 4.96.0 +Version: 4.97.0 Release: 0 Summary: Open Collaboration Service client library License: LGPL-2.1+ @@ -30,12 +30,11 @@ Source: %{rname}-%{version}.tar.xz Source99: baselibs.conf BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules +BuildRequires: extra-cmake-modules >= 0.0.11 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5Network) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ attica-4.96.0.tar.xz -> attica-4.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-4.96.0/.reviewboardrc new/attica-4.97.0/.reviewboardrc --- old/attica-4.96.0/.reviewboardrc 2014-02-06 22:48:21.000000000 +0100 +++ new/attica-4.97.0/.reviewboardrc 2014-03-01 12:50:48.000000000 +0100 @@ -1,4 +1,4 @@ REVIEWBOARD_URL = "https://git.reviewboard.kde.org"; -REPOSITORY = 'git://anongit.kde.org/attica +REPOSITORY = 'git://anongit.kde.org/attica' BRANCH = 'master' TARGET_GROUPS = 'kdeframeworks' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-4.96.0/CMakeLists.txt new/attica-4.97.0/CMakeLists.txt --- old/attica-4.96.0/CMakeLists.txt 2014-02-06 22:48:21.000000000 +0100 +++ new/attica-4.97.0/CMakeLists.txt 2014-03-01 12:50:48.000000000 +0100 @@ -3,25 +3,25 @@ project(Attica) # ECM setup -find_package(ECM 0.0.10 REQUIRED NO_MODULE) +find_package(ECM 0.0.11 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(FeatureSummary) include(GenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) -include(CMakePackageConfigHelpers) # Used to create CMake config files +include(ECMPackageConfigHelpers) # Used to create CMake config files include(KDEInstallDirs) # Used to set installation paths include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "4.96.0") +set(KF5_VERSION "4.97.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX ATTICA VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/attica_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5AtticaConfigVersion.cmake" -) + SOVERSION 5) # Dependencies set(REQUIRED_QT_VERSION "5.2.0") @@ -43,26 +43,22 @@ add_definitions( -DQT_NO_CAST_TO_ASCII ) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) -include_directories(${CMAKE_CURRENT_BINARY_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src) - # Enable static build option(ATTICA_STATIC_BUILD "Build a static library" Off) add_subdirectory(src) # Enable unit testing -if (ATTICA_ENABLE_TESTS) - enable_testing() - find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Test) +if (BUILD_TESTING) add_subdirectory(autotests) add_subdirectory(tests) -endif (ATTICA_ENABLE_TESTS) +endif () # Create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Attica") # Create the CMake Config files -configure_package_config_file( +ecm_configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5AtticaConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5AtticaConfig.cmake" INSTALL_DESTINATION "${CMAKECONFIG_INSTALL_DIR}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-4.96.0/autotests/CMakeLists.txt new/attica-4.97.0/autotests/CMakeLists.txt --- old/attica-4.96.0/autotests/CMakeLists.txt 2014-02-06 22:48:21.000000000 +0100 +++ new/attica-4.97.0/autotests/CMakeLists.txt 2014-03-01 12:50:48.000000000 +0100 @@ -1,12 +1,17 @@ +include(ECMMarkAsTest) + +find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Test) +set_package_properties(Qt5Test PROPERTIES PURPOSE "Required for autotests") + macro(ATTICA_AUTOTESTS) foreach(_testname ${ARGN}) add_executable(${_testname} ${_testname}.cpp) target_link_libraries(${_testname} Qt5::Test ${ATTICA_LIB_SONAME}) add_test(attica-${_testname} ${CMAKE_CURRENT_BINARY_DIR}/${_testname}) + ecm_mark_as_test(${_testname}) endforeach(_testname) endmacro(ATTICA_AUTOTESTS) ATTICA_AUTOTESTS( persontest -# attributestest ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-4.96.0/src/CMakeLists.txt new/attica-4.97.0/src/CMakeLists.txt --- old/attica-4.96.0/src/CMakeLists.txt 2014-02-06 22:48:21.000000000 +0100 +++ new/attica-4.97.0/src/CMakeLists.txt 2014-03-01 12:50:48.000000000 +0100 @@ -6,6 +6,7 @@ configure_file(version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h) configure_file(atticaclient_export.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/atticaclient_export.h) # TODO: use generate_export_header? +#generate_export_header(KF5Attica BASE_NAME Attica) set(attica_SRCS accountbalance.cpp @@ -83,12 +84,16 @@ set_target_properties(KF5Attica PROPERTIES VERSION ${ATTICA_VERSION_STRING} SOVERSION ${ATTICA_VERSION_MAJOR} + SOVERSION ${ATTICA_SOVERSION} + EXPORT_NAME "Attica" ) else (ATTICA_STATIC_BUILD) add_library(KF5Attica SHARED ${attica_SRCS}) set_target_properties(KF5Attica PROPERTIES VERSION ${ATTICA_VERSION_STRING} - SOVERSION ${ATTICA_VERSION_MAJOR}.${ATTICA_VERSION_MINOR} + #SOVERSION ${ATTICA_VERSION_MAJOR}.${ATTICA_VERSION_MINOR} + SOVERSION ${ATTICA_SOVERSION} + EXPORT_NAME "Attica" DEFINE_SYMBOL ATTICA_LIB_MAKEDLL ) endif(ATTICA_STATIC_BUILD) @@ -105,13 +110,9 @@ ) target_include_directories(KF5Attica INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/Attica>") -set_target_properties(KF5Attica - PROPERTIES VERSION ${ATTICA_VERSION_STRING} - SOVERSION ${ATTICA_SOVERSION} - EXPORT_NAME "Attica" -) -ecm_generate_headers( +ecm_generate_headers(Attica_CamelCase_HEADERS + HEADER_NAMES Activity AccountBalance Achievement @@ -150,11 +151,10 @@ PublisherField Topic - MODULE_NAME Attica PREFIX Attica REQUIRED_HEADERS Attica_HEADERS ) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Attica DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) +install(FILES ${Attica_CamelCase_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/Attica/Attica COMPONENT Devel) install(TARGETS KF5Attica EXPORT KF5AtticaTargets diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-4.96.0/src/listjob_inst.cpp new/attica-4.97.0/src/listjob_inst.cpp --- old/attica-4.96.0/src/listjob_inst.cpp 2014-02-06 22:48:21.000000000 +0100 +++ new/attica-4.97.0/src/listjob_inst.cpp 2014-03-01 12:50:48.000000000 +0100 @@ -76,7 +76,8 @@ #include "topic.h" #include "topicparser.h" -using namespace Attica; +namespace Attica +{ template class ListJob<Achievement>; template class ListJob<Activity>; @@ -159,3 +160,4 @@ template class Parser<RemoteAccount>; template class Parser<Topic>; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-4.96.0/tests/projecttest/CMakeLists.txt new/attica-4.97.0/tests/projecttest/CMakeLists.txt --- old/attica-4.96.0/tests/projecttest/CMakeLists.txt 2014-02-06 22:48:21.000000000 +0100 +++ new/attica-4.97.0/tests/projecttest/CMakeLists.txt 2014-03-01 12:50:48.000000000 +0100 @@ -1,8 +1,7 @@ -cmake_minimum_required(VERSION 2.8.11) +include(ECMMarkAsTest) -find_package(Qt5Widgets CONFIG) - -if (Qt5Widgets_FOUND) +find_package(Qt5Widgets ${REQUIRED_QT_VERSION} CONFIG REQUIRED) +set_package_properties(Qt5Widgets PROPERTIES PURPOSE "Required for tests") set(editproject_UI editproject.ui) qt5_wrap_ui(editproject_UI_H ${editproject_UI}) @@ -13,7 +12,6 @@ ) add_executable(projecttest ${projecttest_SRCS} ${editproject_UI_H}) +ecm_mark_as_test(projecttest) target_link_libraries(projecttest Qt5::Widgets ${ATTICA_LIB_SONAME}) - -endif() ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.DI8rDB/_old 2014-03-10 12:18:29.000000000 +0100 +++ /var/tmp/diff_new_pack.DI8rDB/_new 2014-03-10 12:18:29.000000000 +0100 @@ -1,3 +1,3 @@ -libKF5Attica4 +libKF5Attica5 attica-qt5-devel - requires "libKF5Attica4-<targettype> = <version>" + requires "libKF5Attica5-<targettype> = <version>" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
