Hello community, here is the log from the commit of package QtZeitgeist for openSUSE:12.2 checked in at 2012-06-28 16:53:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/QtZeitgeist (Old) and /work/SRC/openSUSE:12.2/.QtZeitgeist.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "QtZeitgeist", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/QtZeitgeist/QtZeitgeist.changes 2012-06-25 15:14:46.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.QtZeitgeist.new/QtZeitgeist.changes 2012-06-28 16:53:35.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Jun 25 20:40:26 UTC 2012 - asterios.dramis@gmail.com + +- Added the following patches (taken from Fedora - already upstream): + * libqzeitgeist-0.8.0-declarative.patch: Fix linking, consistently use + QT_IMPORTS_DIR + * libqzeitgeist-0.8.0-reduced_linking.patch: Reduce linking in libqzeitgeist +- Removed libQtWebKit-devel from build dependencies and devel package Requires: + (not needed anymore because of the above patches). + +------------------------------------------------------------------- New: ---- libqzeitgeist-0.8.0-declarative.patch libqzeitgeist-0.8.0-reduced_linking.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ QtZeitgeist.spec ++++++ --- /var/tmp/diff_new_pack.LEcGuU/_old 2012-06-28 16:53:36.000000000 +0200 +++ /var/tmp/diff_new_pack.LEcGuU/_new 2012-06-28 16:53:36.000000000 +0200 @@ -16,21 +16,25 @@ # -Name: QtZeitgeist %define rname libqzeitgeist %define sonum 1 %define libname %{rname}%{sonum} + +Name: QtZeitgeist Version: 0.8.0 Release: 0 Summary: Qt Zeitgeist Library License: LGPL-2.1 Group: Development/Libraries/KDE -Url: http://releases.zeitgeist-project.com/qzeitgeist/ +Url: https://projects.kde.org/projects/kdesupport/libqzeitgeist/ Source: ftp://ftp.kde.org/pub/kde/stable/libqzeitgeist/0.8.0/src/%{rname}-%{version}.tar.bz2 Source1: baselibs.conf +# PATCH-FIX-UPSTREAM libqzeitgeist-0.8.0-declarative.patch asterios.dramis@gmail.com -- Fix linking (don't link the Qt world, only use QT_DECLARATIVE_LIBRARIES), consistently use QT_IMPORTS_DIR +Patch0: libqzeitgeist-0.8.0-declarative.patch +# PATCH-FIX-UPSTREAM libqzeitgeist-0.8.0-declarative.patch asterios.dramis@gmail.com -- Reduce linking in libqzeitgeist +Patch1: libqzeitgeist-0.8.0-reduced_linking.patch BuildRequires: automoc4 BuildRequires: cmake -BuildRequires: libQtWebKit-devel BuildRequires: libqt4-devel BuildRequires: pkg-config BuildRequires: zeitgeist @@ -44,10 +48,38 @@ also able to establish relationships between items based on similarity and usage patterns. -This package provides the Qt interface for Zeitgeist +This package provides the Qt interface for Zeitgeist. + +%package devel +Summary: Development files for QtZeitgeist +Group: Development/Languages/C and C++ +Requires: %{libname} = %{version} +Requires: libqt4-devel +Requires: zeitgeist + +%description devel +This package provides headers and libraries needed to build against the Qt +interface for Zeitgeist. + +%package -n %{libname} +Summary: Qt Zeitgeist Library +Group: Development/Libraries/KDE +Recommends: zeitgeist + +%description -n %{libname} +Zeitgeist is a service which logs the user's activities +and notifications, anywhere from files opened to websites +visited and conversations, and makes this information +readily available for other applications to use. It is +also able to establish relationships between items based +on similarity and usage patterns. + +This package provides the Qt interface for Zeitgeist. %prep %setup -q -n %{rname}-%{version} +%patch0 -p1 +%patch1 -p1 %build mkdir build @@ -65,54 +97,23 @@ cd build %make_install -%package -n %{libname} -Summary: Qt Zeitgeist Library -Group: Development/Libraries/KDE -Recommends: zeitgeist - -%description -n %{libname} -Zeitgeist is a service which logs the user's activities -and notifications, anywhere from files opened to websites -visited and conversations, and makes this information -readily available for other applications to use. It is -also able to establish relationships between items based -on similarity and usage patterns. - -This package provides the Qt interface for Zeitgeist - %post -n %{libname} -p /sbin/ldconfig -%postun -n %{libname} -p /sbin/ldconfig - -%files -n %{libname} -%defattr(-,root,root) -%doc README COPYING -%{_libdir}/libqzeitgeist.so.* -%{_libdir}/qt4/ -%package devel -Summary: Development files for QtZeitgeist -Group: Development/Libraries/KDE -Requires: %{libname} = %{version} -Requires: libQtWebKit-devel -Requires: libqt4-devel -Requires: zeitgeist - -%description devel -Zeitgeist is a service which logs the user's activities -and notifications, anywhere from files opened to websites -visited and conversations, and makes this information -readily available for other applications to use. It is -also able to establish relationships between items based -on similarity and usage patterns. - -This package provides headers and libraries needed to -build against the Qt interface for Zeitgeist +%postun -n %{libname} -p /sbin/ldconfig %files devel -%defattr(-,root,root) +%defattr(-,root,root,-) %{_includedir}/QZeitgeist/ %{_libdir}/cmake/QZeitgeist/ %{_libdir}/libqzeitgeist.so %{_libdir}/pkgconfig/QZeitgeist.pc +%files -n %{libname} +%defattr(-,root,root,-) +%doc COPYING README +%{_libdir}/libqzeitgeist.so.* +%dir %{_libdir}/qt4/plugins/imports/org/ +%dir %{_libdir}/qt4/plugins/imports/org/gnome/ +%{_libdir}/qt4/plugins/imports/org/gnome/zeitgeist/ + %changelog ++++++ libqzeitgeist-0.8.0-declarative.patch ++++++ fix linking, don't link the Qt world via QT_LIBRARIES (including QtWebkit), only use QT_DECLARATIVE_LIBRARIES consistently use QT_IMPORTS_DIR diff -up libqzeitgeist-0.8.0/declarative/CMakeLists.txt.declarative libqzeitgeist-0.8.0/declarative/CMakeLists.txt --- libqzeitgeist-0.8.0/declarative/CMakeLists.txt.declarative 2011-10-27 09:08:58.000000000 -0500 +++ libqzeitgeist-0.8.0/declarative/CMakeLists.txt 2011-10-31 07:36:01.751921806 -0500 @@ -14,7 +14,7 @@ include_directories(${CMAKE_CURRENT_SOUR include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src/) automoc4_add_library(QZeitgeistDeclarativePlugin MODULE ${declarative_SRCS}) -target_link_libraries(QZeitgeistDeclarativePlugin ${QT_LIBRARIES} qzeitgeist) +target_link_libraries(QZeitgeistDeclarativePlugin ${QT_QTDECLARATIVE_LIBRARIES} qzeitgeist) -install(TARGETS QZeitgeistDeclarativePlugin DESTINATION lib${LIB_SUFFIX}/qt4/imports/org/gnome/zeitgeist) +install(TARGETS QZeitgeistDeclarativePlugin DESTINATION ${QT_IMPORTS_DIR}/org/gnome/zeitgeist) install(FILES qmldir DESTINATION ${QT_IMPORTS_DIR}/org/gnome/zeitgeist) ++++++ libqzeitgeist-0.8.0-reduced_linking.patch ++++++ diff -up libqzeitgeist-0.8.0/src/CMakeLists.txt.linking libqzeitgeist-0.8.0/src/CMakeLists.txt --- libqzeitgeist-0.8.0/src/CMakeLists.txt.linking 2011-10-27 09:08:58.000000000 -0500 +++ libqzeitgeist-0.8.0/src/CMakeLists.txt 2011-10-31 08:04:24.037330288 -0500 @@ -70,7 +70,7 @@ add_custom_command(OUTPUT ${CMAKE_CURREN ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifestation.h ${CMAKE_CURRENT_BINARY_DIR}/interpretation.h DESTINATION include/QZeitgeist) -target_link_libraries(qzeitgeist ${QT_LIBRARIES} ${QDBUS_LDFLAGS}) +target_link_libraries(qzeitgeist ${QT_QTDBUS_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QDBUS_LDFLAGS}) set_target_properties(qzeitgeist PROPERTIES VERSION "${QZEITGEIST_VERSION}" VERSION ${QZEITGEIST_VERSION} SOVERSION ${QZEITGEIST_LIB_SOVERSION} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org