Hello community, here is the log from the commit of package liblastfm for openSUSE:Factory checked in at 2016-04-12 18:59:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/liblastfm (Old) and /work/SRC/openSUSE:Factory/.liblastfm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "liblastfm" Changes: -------- --- /work/SRC/openSUSE:Factory/liblastfm/liblastfm.changes 2013-11-07 12:53:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.liblastfm.new/liblastfm.changes 2016-04-12 18:59:19.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Oct 22 18:04:56 UTC 2014 - [email protected] + +- Update to 1.0.9: + * Linux build fixes and Qt5 compatibility + * fixes cache directory path - boo#974005 + +------------------------------------------------------------------- Old: ---- liblastfm-1.0.8.tar.gz New: ---- liblastfm-1.0.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liblastfm.spec ++++++ --- /var/tmp/diff_new_pack.dxeva5/_old 2016-04-12 18:59:20.000000000 +0200 +++ /var/tmp/diff_new_pack.dxeva5/_new 2016-04-12 18:59:20.000000000 +0200 @@ -1,8 +1,8 @@ # # spec file for package liblastfm # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright 2009 Buschmann <[email protected]> +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2009 Buschmann <[email protected]> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,9 +18,8 @@ %define _soversion 1 - Name: liblastfm -Version: 1.0.8 +Version: 1.0.9 Release: 0 Summary: A Qt C++ Library for the Last.fm Webservices License: GPL-3.0+ @@ -73,7 +72,6 @@ %kde4_makeinstall -C build %post -n liblastfm%{_soversion} -p /sbin/ldconfig - %postun -n liblastfm%{_soversion} -p /sbin/ldconfig %files -n liblastfm%{_soversion} ++++++ liblastfm-1.0.8.tar.gz -> liblastfm-1.0.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liblastfm-1.0.8/CMakeLists.txt new/liblastfm-1.0.9/CMakeLists.txt --- old/liblastfm-1.0.8/CMakeLists.txt 2013-09-03 17:43:03.000000000 +0200 +++ new/liblastfm-1.0.9/CMakeLists.txt 2014-10-02 16:05:46.000000000 +0200 @@ -5,11 +5,11 @@ # general settings set(LASTFM_SOVERSION 1) -set(LASTFM_VERSION "0x00010007") +set(LASTFM_VERSION "0x00010009") set(LASTFM_MAJOR_VERSION "1") set(LASTFM_MINOR_VERSION "0") -set(LASTFM_PATCH_VERSION "8") +set(LASTFM_PATCH_VERSION "9") set(LASTFM_VERSION_STRING "${LASTFM_MAJOR_VERSION}.${LASTFM_MINOR_VERSION}.${LASTFM_PATCH_VERSION}") # options @@ -35,8 +35,12 @@ endif() if(Qt5Core_DIR) + set(LASTFM_LIB_VERSION_SUFFIX 5) message(STATUS "Found Qt5! Please keep in mind, this is highly experimental and not our main development target..") include_directories(${Qt5Core_INCLUDE_DIRS}) + if(UNIX AND NOT APPLE) + find_package(Qt5DBus REQUIRED) + endif() # macro(qt_wrap_ui) # qt5_wrap_ui(${ARGN}) @@ -69,6 +73,12 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:wchar_t-") endif(MSVC) +set(LASTFM_LIB_TARGET_NAME lastfm${LASTFM_LIB_VERSION_SUFFIX} CACHE + INTERNAL "Target name of liblastfm" FORCE) + +set(FINGERPRINT_LIB_TARGET_NAME lastfm_fingerprint${LASTFM_LIB_VERSION_SUFFIX} CACHE + INTERNAL "Target name of liblastfm_fingerprint" FORCE) + # main library add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liblastfm-1.0.8/src/CMakeLists.txt new/liblastfm-1.0.9/src/CMakeLists.txt --- old/liblastfm-1.0.8/src/CMakeLists.txt 2013-09-03 17:43:03.000000000 +0200 +++ new/liblastfm-1.0.9/src/CMakeLists.txt 2014-10-02 16:05:46.000000000 +0200 @@ -87,17 +87,17 @@ list(APPEND liblastfm_QT5_MODULES DBus) endif() -add_library(lastfm SHARED ${liblastfm_SOURCES}) -qt5_use_modules(lastfm ${liblastfm_QT5_MODULES}) +add_library(${LASTFM_LIB_TARGET_NAME} SHARED ${liblastfm_SOURCES}) +qt5_use_modules(${LASTFM_LIB_TARGET_NAME} ${liblastfm_QT5_MODULES}) -target_link_libraries(lastfm ${liblastfm_LIBRARIES}) -set_target_properties(lastfm PROPERTIES +target_link_libraries(${LASTFM_LIB_TARGET_NAME} ${liblastfm_LIBRARIES}) +set_target_properties(${LASTFM_LIB_TARGET_NAME} PROPERTIES VERSION ${LASTFM_VERSION_STRING} SOVERSION ${LASTFM_SOVERSION} COMPILE_DEFINITIONS LASTFM_LIB ) -install(TARGETS lastfm +install(TARGETS ${LASTFM_LIB_TARGET_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liblastfm-1.0.8/src/InternetConnectionMonitor.cpp new/liblastfm-1.0.9/src/InternetConnectionMonitor.cpp --- old/liblastfm-1.0.8/src/InternetConnectionMonitor.cpp 2013-09-03 17:43:03.000000000 +0200 +++ new/liblastfm-1.0.9/src/InternetConnectionMonitor.cpp 2014-10-02 16:05:46.000000000 +0200 @@ -131,12 +131,12 @@ { NetworkConnectionMonitor* ncm = 0; -#ifdef Q_OS_X11 - ncm = new LNetworkConnectionMonitor( this ); +#if defined(Q_OS_MAC) + ncm = new MNetworkConnectionMonitor( this ); #elif defined(Q_OS_WIN) && ! defined __MINGW32__ ncm = new WNetworkConnectionMonitor( this ); -#elif defined(Q_OS_MAC) - ncm = new MNetworkConnectionMonitor( this ); +#elif defined(Q_OS_LINUX) + ncm = new LNetworkConnectionMonitor( this ); #endif return ncm; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liblastfm-1.0.8/src/fingerprint/CMakeLists.txt new/liblastfm-1.0.9/src/fingerprint/CMakeLists.txt --- old/liblastfm-1.0.8/src/fingerprint/CMakeLists.txt 2013-09-03 17:43:03.000000000 +0200 +++ new/liblastfm-1.0.9/src/fingerprint/CMakeLists.txt 2014-10-02 16:05:46.000000000 +0200 @@ -24,25 +24,25 @@ FingerprintableSource.h ) -add_library(lastfm_fingerprint SHARED ${lastfm_fingerprint_SOURCES}) +add_library(${FINGERPRINT_LIB_TARGET_NAME} SHARED ${lastfm_fingerprint_SOURCES}) -target_link_libraries(lastfm_fingerprint - lastfm +target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} + ${LASTFM_LIB_TARGET_NAME} ${QT_QTSQL_LIBRARY} ${QT_QTCORE_LIBRARY} ${LIBSAMPLERATE_LIBRARY} ${LIBFFTW3_LIBRARY} ) -set_target_properties(lastfm_fingerprint PROPERTIES +set_target_properties(${FINGERPRINT_LIB_TARGET_NAME} PROPERTIES COMPILE_DEFINITIONS LASTFM_FINGERPRINT_LIB VERSION ${LASTFM_VERSION_STRING} SOVERSION ${LASTFM_SOVERSION} ) -qt5_use_modules(lastfm_fingerprint Network Sql Xml) +qt5_use_modules(${FINGERPRINT_LIB_TARGET_NAME} Network Sql Xml) -install(TARGETS lastfm_fingerprint +install(TARGETS ${FINGERPRINT_LIB_TARGET_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liblastfm-1.0.8/src/misc.cpp new/liblastfm-1.0.9/src/misc.cpp --- old/liblastfm-1.0.8/src/misc.cpp 2013-09-03 17:43:03.000000000 +0200 +++ new/liblastfm-1.0.9/src/misc.cpp 2014-10-02 16:05:46.000000000 +0200 @@ -62,7 +62,7 @@ return QDir::home(); #elif defined(Q_OS_MAC) return QDir::home().filePath( "Library/Application Support" ); -#elif defined(Q_OS_X11) +#elif defined(Q_OS_LINUX) || defined(Q_OS_UNIX) return QDir::home().filePath( ".local/share" ); #else return QDir::home(); @@ -199,7 +199,7 @@ default: return "Unknown"; } -#elif defined Q_OS_X11 +#elif defined(Q_OS_LINUX) || defined(Q_OS_UNIX) return "UNIX X11"; #else return "Unknown"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liblastfm-1.0.8/tests/lastfm_add_test.cmake new/liblastfm-1.0.9/tests/lastfm_add_test.cmake --- old/liblastfm-1.0.8/tests/lastfm_add_test.cmake 2013-09-03 17:43:03.000000000 +0200 +++ new/liblastfm-1.0.9/tests/lastfm_add_test.cmake 2014-10-02 16:05:46.000000000 +0200 @@ -9,10 +9,10 @@ qt5_use_modules(${LASTFM_TEST_CLASS}Test Core Test Xml Network) target_link_libraries(${LASTFM_TEST_CLASS}Test - lastfm + ${LASTFM_LIB_TARGET_NAME} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ) add_test(NAME ${LASTFM_TEST_CLASS}Test COMMAND ${LASTFM_TEST_CLASS}Test) -endmacro() \ No newline at end of file +endmacro()
