Hello community, here is the log from the commit of package libsysstat-qt5 for openSUSE:Factory checked in at 2015-02-16 21:07:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsysstat-qt5 (Old) and /work/SRC/openSUSE:Factory/.libsysstat-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsysstat-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/libsysstat-qt5/libsysstat-qt5.changes 2014-11-02 16:45:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libsysstat-qt5.new/libsysstat-qt5.changes 2015-02-16 21:07:56.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 9 16:33:58 UTC 2015 - sfal...@opensuse.org + +- new upstream version 0.3.0 + +------------------------------------------------------------------- Old: ---- libsysstat-0.2.0.tar.xz New: ---- libsysstat-0.3.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsysstat-qt5.spec ++++++ --- /var/tmp/diff_new_pack.QjBFuD/_old 2015-02-16 21:07:56.000000000 +0100 +++ /var/tmp/diff_new_pack.QjBFuD/_new 2015-02-16 21:07:56.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libsysstat +# spec file for package libsysstat-qt5 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,17 @@ Name: libsysstat-qt5 -Version: 0.2.0 +Version: 0.3.0 Release: 0 Summary: Query system info and statistics License: LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://www.lxde.org -Source: libsysstat-%{version}.tar.xz +Source: http://downloads.lxqt.org/libsysstat/%{version}/libsysstat-%{version}.tar.xz BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: pkgconfig(Qt5Core) BuildRequires: libqt5-linguist-devel +BuildRequires: pkgconfig(Qt5Core) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -51,7 +51,7 @@ sysstat libraries for development %prep -%setup -q -n libsysstat +%setup -q -n libsysstat-%{version} %build %cmake -DUSE_QT5=ON ++++++ libsysstat-0.2.0.tar.xz -> libsysstat-0.3.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat/CMakeLists.txt new/libsysstat-0.3.0/CMakeLists.txt --- old/libsysstat/CMakeLists.txt 2014-10-19 18:41:35.000000000 +0200 +++ new/libsysstat-0.3.0/CMakeLists.txt 2014-10-21 15:23:15.000000000 +0200 @@ -1,10 +1,7 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.11) project(libsysstat) -# Support different versions of Qt -option(USE_QT5 "Build with Qt5." $ENV{USE_QT5}) - # Set default installation paths set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Installation path for libraries") set(INCLUDE_INSTALL_DIR include CACHE PATH "Installation path for includes") @@ -20,23 +17,15 @@ add_definitions(-DSYSSTAT_LIBRARY) # use gcc visibility feature to decrease unnecessary exported symbols -if (CMAKE_COMPILER_IS_GNUCXX) +if(CMAKE_COMPILER_IS_GNUCXX) # set visibility to hidden to hide symbols, unlesss they're exporeted manually in the code set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -fno-exceptions -Wall") endif() -if (USE_QT5) - cmake_minimum_required(VERSION 2.8.11) - find_package(Qt5Core REQUIRED QUIET) - find_package(Qt5LinguistTools REQUIRED QUIET) - set(QT_VERSION_SUFFIX "-qt5") -else() - find_package(Qt4 REQUIRED) - include(${QT_USE_FILE}) - set(QT_VERSION_SUFFIX "") -endif() +find_package(Qt5Core REQUIRED QUIET) +find_package(Qt5LinguistTools REQUIRED QUIET) -set(SYSSTAT_LIBRARY_NAME "sysstat${QT_VERSION_SUFFIX}") +set(SYSSTAT_LIBRARY_NAME "sysstat-qt5") set(HEADER_NAMESPACE "SysStat") set(SYSSTAT_PUBLIC_HDRS @@ -85,41 +74,27 @@ ) -# Translations ********************************** +# Translations file(GLOB SYSSTAT_TS_FILES translations/*.ts ) -#************************************************ - -#********************************************************** +qt5_wrap_cpp(SYSSTAT_CXX ${SYSSTAT_MOCS}) +qt5_add_translation(SYSSTAT_QM_FILES ${SYSSTAT_TS_FILES}) -if (USE_QT5) - QT5_WRAP_CPP(SYSSTAT_CXX ${SYSSTAT_MOCS}) - qt5_add_translation(SYSSTAT_QM_FILES ${SYSSTAT_TS_FILES}) -else() - QT4_WRAP_CPP(SYSSTAT_CXX ${SYSSTAT_MOCS}) - qt4_add_translation(SYSSTAT_QM_FILES ${SYSSTAT_TS_FILES}) +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) endif() -if (NOT CMAKE_BUILD_TYPE) - set ( CMAKE_BUILD_TYPE Release ) -endif (NOT CMAKE_BUILD_TYPE) - set(APP_SHARE_DIR "${CMAKE_INSTALL_PREFIX}/share/${SYSSTAT_LIBRARY_NAME}") -include_directories( .. ) +include_directories(..) add_definitions(-DTRANSLATIONS_DIR=\"${APP_SHARE_DIR}\") add_library(${SYSSTAT_LIBRARY_NAME} SHARED ${SYSSTAT_PUBLIC_HDRS} ${SYSSTAT_PRIVATE_HDRS} ${SYSSTAT_SRCS} ${SYSSTAT_CXX} ${SYSSTAT_QM_FILES}) -if(USE_QT5) - target_link_libraries(${SYSSTAT_LIBRARY_NAME} Qt5::Core) -else() - target_link_libraries(${SYSSTAT_LIBRARY_NAME} ${QT_LIBRARIES}) -endif() - +target_link_libraries(${SYSSTAT_LIBRARY_NAME} Qt5::Core) set_target_properties(${SYSSTAT_LIBRARY_NAME} PROPERTIES VERSION ${SYSSTAT_VERSION} @@ -132,30 +107,30 @@ NAMESPACE "${HEADER_NAMESPACE}/" FILENAMES ${SYSSTAT_PUBLIC_CLASSES} ) -install(TARGETS ${SYSSTAT_LIBRARY_NAME} DESTINATION ${LIB_INSTALL_DIR}) -install(FILES ${SYSSTAT_PUBLIC_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/${SYSSTAT_LIBRARY_NAME}) -install(FILES ${SYSSTAT_NAMESPACE_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/${SYSSTAT_LIBRARY_NAME}/${HEADER_NAMESPACE}) -install(FILES ${SYSSTAT_QM_FILES} DESTINATION ${APP_SHARE_DIR}) +install(TARGETS ${SYSSTAT_LIBRARY_NAME} DESTINATION "${LIB_INSTALL_DIR}") +install(FILES ${SYSSTAT_PUBLIC_HDRS} DESTINATION "${INCLUDE_INSTALL_DIR}/${SYSSTAT_LIBRARY_NAME}") +install(FILES ${SYSSTAT_NAMESPACE_HEADERS} DESTINATION "${INCLUDE_INSTALL_DIR}/${SYSSTAT_LIBRARY_NAME}/${HEADER_NAMESPACE}") +install(FILES ${SYSSTAT_QM_FILES} DESTINATION "${APP_SHARE_DIR}") include(cmake/create_pkgconfig_file.cmake) create_pkgconfig_file(${SYSSTAT_LIBRARY_NAME} "SysStat, a Qt-based interface to system statistics") # cmake config file -set(SYSSTAT_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/${SYSSTAT_LIBRARY_NAME}) +set(SYSSTAT_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/${SYSSTAT_LIBRARY_NAME}") configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/sysstat-config.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/${SYSSTAT_LIBRARY_NAME}-config.cmake + "${CMAKE_CURRENT_SOURCE_DIR}/cmake/sysstat-config.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/${SYSSTAT_LIBRARY_NAME}-config.cmake" @ONLY ) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SYSSTAT_LIBRARY_NAME}-config.cmake DESTINATION share/cmake/${SYSSTAT_LIBRARY_NAME}) -install(FILES cmake/sysstat_use.cmake DESTINATION share/cmake/${SYSSTAT_LIBRARY_NAME}) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${SYSSTAT_LIBRARY_NAME}-config.cmake" DESTINATION "share/cmake/${SYSSTAT_LIBRARY_NAME}") +install(FILES cmake/sysstat_use.cmake DESTINATION "share/cmake/${SYSSTAT_LIBRARY_NAME}") # building tarball with CPack ------------------------------------------------- -include (InstallRequiredSystemLibraries) -set (CPACK_PACKAGE_VERSION_MAJOR ${MAJOR_VERSION}) -set (CPACK_PACKAGE_VERSION_MINOR ${MINOR_VERSION}) -set (CPACK_PACKAGE_VERSION_PATCH ${PATCH_VERSION}) -set (CPACK_GENERATOR TBZ2) -set (CPACK_SOURCE_GENERATOR TBZ2) -set (CPACK_SOURCE_IGNORE_FILES /build/;.gitignore;.*~;.git;.kdev4;temp) -include (CPack) +include(InstallRequiredSystemLibraries) +set(CPACK_PACKAGE_VERSION_MAJOR ${MAJOR_VERSION}) +set(CPACK_PACKAGE_VERSION_MINOR ${MINOR_VERSION}) +set(CPACK_PACKAGE_VERSION_PATCH ${PATCH_VERSION}) +set(CPACK_GENERATOR TBZ2) +set(CPACK_SOURCE_GENERATOR TBZ2) +set(CPACK_SOURCE_IGNORE_FILES /build/;.gitignore;.*~;.git;.kdev4;temp) +include(CPack) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat/cmake/create_pkgconfig_file.cmake new/libsysstat-0.3.0/cmake/create_pkgconfig_file.cmake --- old/libsysstat/cmake/create_pkgconfig_file.cmake 2014-10-19 18:41:35.000000000 +0200 +++ new/libsysstat-0.3.0/cmake/create_pkgconfig_file.cmake 2014-10-21 15:23:15.000000000 +0200 @@ -16,7 +16,8 @@ "\n" "Name: ${name}\n" "Description: ${desc}\n" - "Version: ${LXQT_VERSION}\n" + "Version: ${SYSSTAT_VERSION}\n" + "Requires: Qt5Core\n" "Libs: -L\${libdir} -l${name}\n" "Cflags: -I\${includedir}\n" "\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat/cmake/sysstat-config.cmake.in new/libsysstat-0.3.0/cmake/sysstat-config.cmake.in --- old/libsysstat/cmake/sysstat-config.cmake.in 2014-10-19 18:41:35.000000000 +0200 +++ new/libsysstat-0.3.0/cmake/sysstat-config.cmake.in 2014-10-21 15:23:15.000000000 +0200 @@ -25,10 +25,10 @@ set(SYSSTAT_INCLUDE_DIR @SYSSTAT_INCLUDE_DIR@) set(SYSSTAT_LIBRARY @SYSSTAT_LIBRARY_NAME@) -set(SYSSTAT_LIBRARIES ${SYSSTAT_LIBRARY} ) -set(SYSSTAT_INCLUDE_DIRS ${SYSSTAT_INCLUDE_DIR} ) -set(SYSSTAT_LIBRARY_DIRS @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@ ) -set(SYSSTAT_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/sysstat_use.cmake) +set(SYSSTAT_LIBRARIES ${SYSSTAT_LIBRARY}) +set(SYSSTAT_INCLUDE_DIRS "${SYSSTAT_INCLUDE_DIR}") +set(SYSSTAT_LIBRARY_DIRS @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@) +set(SYSSTAT_USE_FILE "${CMAKE_CURRENT_LIST_DIR}/sysstat_use.cmake") set(SYSSTAT_FOUND 1) mark_as_advanced(SYSSTAT_LIBRARY SYSSTAT_INCLUDE_DIR) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
