Hello community, here is the log from the commit of package akonadi-runtime for openSUSE:Factory checked in at Tue Feb 1 18:44:01 CET 2011. -------- --- KDE/akonadi-runtime/akonadi-runtime.changes 2011-01-07 20:08:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/akonadi-runtime/akonadi-runtime.changes 2011-01-30 02:20:40.000000000 +0100 @@ -0,0 +1,7 @@ +------------------------------------------------------------------ +Sun Jan 30 02:19:34 CET 2011 - cgiboudeaux@gmail.com + +- Update to 1.5.0 + - Fix Boost related build issues on Windows. + - Hide akonadi_agent_launcher from Mac OS X dock. + calling whatdependson for head-i586 Old: ---- 1_4_BRANCH.diff akonadi-1.4.95.tar.bz2 New: ---- 1_5_BRANCH.diff akonadi-1.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-runtime.spec ++++++ --- /var/tmp/diff_new_pack.ycgUOk/_old 2011-02-01 18:43:53.000000000 +0100 +++ /var/tmp/diff_new_pack.ycgUOk/_new 2011-02-01 18:43:53.000000000 +0100 @@ -21,7 +21,7 @@ BuildRequires: cmake kde4-filesystem libmysqlclient-devel BuildRequires: automoc4 boost-devel libsoprano-devel libxslt mysql shared-mime-info BuildRequires: fdupes -Version: 1.4.95 +Version: 1.5.0 Release: 1 %define rversion %version License: LGPLv2.1+ @@ -31,7 +31,7 @@ Summary: PIM Storage Service # http://download.akonadi-project.org Source0: akonadi-%rversion.tar.bz2 -Patch0: 1_4_BRANCH.diff +Patch0: 1_5_BRANCH.diff Requires: libqt4 >= %(rpm -q --queryformat '%{VERSION}' libqt4) # rename from 10.3, which had 4.x version Provides: akonadi = %version ++++++ 1_4_BRANCH.diff -> 1_5_BRANCH.diff ++++++ ++++++ akonadi-1.4.95.tar.bz2 -> akonadi-1.5.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.95/CMakeLists.txt new/akonadi-1.5.0/CMakeLists.txt --- old/akonadi-1.4.95/CMakeLists.txt 2011-01-07 19:10:16.000000000 +0100 +++ new/akonadi-1.5.0/CMakeLists.txt 2011-01-22 15:35:30.000000000 +0100 @@ -54,8 +54,8 @@ ############### The Akonadi version (used in AkonadiConfig.cmake) ############### set(AKONADI_VERSION_MAJOR "1") -set(AKONADI_VERSION_MINOR "4") -set(AKONADI_VERSION_PATCH "95") +set(AKONADI_VERSION_MINOR "5") +set(AKONADI_VERSION_PATCH "0") set(AKONADI_VERSION "${AKONADI_VERSION_MAJOR}.${AKONADI_VERSION_MINOR}.${AKONADI_VERSION_PATCH}") set(AKONADI_VERSION_STRING "${AKONADI_VERSION}") @@ -169,11 +169,12 @@ macro_log_feature(Boost_FOUND "Boost" "Boost C++ Libraries" "http://www.boost.org" TRUE "" "Akonadi requires the Boost C++ libraries (program_options).") endif(NOT WINCE) -# should be handled by FindBoost.cmake -> cmake bug #8335 -if(NOT Boost_USE_STATIC_LIBS) +# should be handled by FindBoost.cmake -> cmake bug #8335 +if(WIN32 AND NOT Boost_USE_STATIC_LIBS) add_definitions(-DBOOST_DYN_LINK) add_definitions(-DBOOST_PROGRAM_OPTIONS_DYN_LINK) -endif(NOT Boost_USE_STATIC_LIBS) +endif(WIN32 AND NOT Boost_USE_STATIC_LIBS) + #### Sqlite #### # If Sqlite is the default backend, it cannot be optional. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.95/Info.plist.template new/akonadi-1.5.0/Info.plist.template --- old/akonadi-1.4.95/Info.plist.template 1970-01-01 01:00:00.000000000 +0100 +++ new/akonadi-1.5.0/Info.plist.template 2011-01-22 15:35:30.000000000 +0100 @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string> + <key>CFBundleGetInfoString</key> + <string>${MACOSX_BUNDLE_INFO_STRING}</string> + <key>CFBundleIconFile</key> + <string>${MACOSX_BUNDLE_ICON_FILE}</string> + <key>CFBundleIdentifier</key> + <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleLongVersionString</key> + <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string> + <key>CFBundleName</key> + <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string> + <key>CFBundleVersion</key> + <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string> + <key>CSResourcesFileMapped</key> + <true/> + <key>LSRequiresCarbon</key> + <true/> + <key>LSUIElement</key> + <string>1</string> + <key>NSHumanReadableCopyright</key> + <string>${MACOSX_BUNDLE_COPYRIGHT}</string> +</dict> +</plist> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.95/Mainpage.dox new/akonadi-1.5.0/Mainpage.dox --- old/akonadi-1.4.95/Mainpage.dox 2011-01-07 19:10:16.000000000 +0100 +++ new/akonadi-1.5.0/Mainpage.dox 2011-01-22 15:35:30.000000000 +0100 @@ -315,6 +315,6 @@ // DOXYGEN_EXCLUDE = sqlplugin server/control server/akonadictl server/tests // DOXYGEN_PROJECTNAME=Akonadi -// DOXYGEN_PROJECTVERSION=1.4.95 +// DOXYGEN_PROJECTVERSION=1.5.0 // vim:ts=4:sw=4:expandtab:filetype=doxygen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.95/NEWS new/akonadi-1.5.0/NEWS --- old/akonadi-1.4.95/NEWS 2011-01-07 19:10:16.000000000 +0100 +++ new/akonadi-1.5.0/NEWS 2011-01-22 15:35:30.000000000 +0100 @@ -1,4 +1,9 @@ -1.4.95 07-January-2010 +1.5.0 22-January-2011 +--------------------------------------------- +- Fix Boost related build issues on Windows. +- Hide akonadi_agent_launcher from Mac OS X dock. + +1.4.95 07-January-2011 --------------------------------------------- - Optimize notification compression. - Consider ignore flag when calculating collection statistics. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.95/agentserver/CMakeLists.txt new/akonadi-1.5.0/agentserver/CMakeLists.txt --- old/akonadi-1.4.95/agentserver/CMakeLists.txt 2011-01-07 19:10:16.000000000 +0100 +++ new/akonadi-1.5.0/agentserver/CMakeLists.txt 2011-01-22 15:35:30.000000000 +0100 @@ -35,13 +35,19 @@ agentlauncher.cpp ) - automoc4_add_executable(akonadi_agent_launcher ${akonadi_agent_launcher_SRCS}) + automoc4_add_executable(akonadi_agent_launcher MACOSX_BUNDLE ${akonadi_agent_launcher_SRCS}) target_link_libraries(akonadi_agent_launcher ${QT_QTGUI_LIBRARY} ${AKONADI_SYSTEM_LIBS} ${AKONADI_PROTOCOLINTERNALS_LIBS} ) + if (Q_WS_MAC) + set_target_properties(akonadi_agent_launcher PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template) + set_target_properties(akonadi_agent_launcher PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.agentlauncher") + set_target_properties(akonadi_agent_launcher PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Akonadi Agent Launcher") + endif (Q_WS_MAC) + target_link_libraries(akonadi_agent_launcher ${Boost_PROGRAM_OPTIONS_LIBRARY}) endif(NOT WINCE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.4.95/cmake/modules/FindSqlite.cmake new/akonadi-1.5.0/cmake/modules/FindSqlite.cmake --- old/akonadi-1.4.95/cmake/modules/FindSqlite.cmake 2011-01-07 19:10:16.000000000 +0100 +++ new/akonadi-1.5.0/cmake/modules/FindSqlite.cmake 2011-01-22 15:35:30.000000000 +0100 @@ -34,13 +34,27 @@ set(SQLITE_DEFINITIONS ${PC_SQLITE_CFLAGS_OTHER}) endif( NOT WIN32 ) -find_path(SQLITE_INCLUDE_DIR - NAMES sqlite3.h - ) +if(PC_SQLITE_FOUND) + find_path(SQLITE_INCLUDE_DIR + NAMES sqlite3.h + PATHS ${PC_SQLITE_INCLUDEDIR} + NO_DEFAULT_PATH + ) -find_library(SQLITE_LIBRARIES - NAMES sqlite3 - ) + find_library(SQLITE_LIBRARIES + NAMES sqlite3 + PATHS ${PC_SQLITE_LIBDIR} + NO_DEFAULT_PATH + ) +else(PC_SQLITE_FOUND) + find_path(SQLITE_INCLUDE_DIR + NAMES sqlite3.h + ) + + find_library(SQLITE_LIBRARIES + NAMES sqlite3 + ) +endif(PC_SQLITE_FOUND) if( UNIX ) find_file(SQLITE_STATIC_LIBRARIES ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org