Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at 2015-10-03 20:19:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4 (Old) and /work/SRC/openSUSE:Factory/.kdebase4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4/kdebase4.changes 2015-07-14 17:33:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4.new/kdebase4.changes 2015-10-03 20:19:45.000000000 +0200 @@ -1,0 +2,27 @@ +Sun Sep 13 19:07:51 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 15.08.1 + * KDE Applications 15.08.1 + * https://www.kde.org/announcements/announce-applications-15.08.1.php + + +------------------------------------------------------------------- +Wed Aug 19 19:42:56 UTC 2015 - cgiboude...@gmx.com + +- Update to KDE Applications 15.08.0 + * KDE Applications 15.08.0 + * https://www.kde.org/announcements/announce-applications-15.08.0.php +- Add skip-dolphin4-build.patch. Don't build dolphin4. + * We already provide a KF5 based Dolphin. + +------------------------------------------------------------------- +Fri Aug 7 06:50:48 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 15.07.90 + * KDE Applications 15.08.0 RC1 + * https://www.kde.org/announcements/announce-applications-15.07.90.php + +- Dolphin is no longer part of kdebase4 as it has been ported to KF5 + * Drop dolphin-go_up.diff and dolphinsu.desktop + +------------------------------------------------------------------- Old: ---- dolphin-go_up.diff dolphinsu.desktop kde-baseapps-15.04.3.tar.xz New: ---- kde-baseapps-15.08.1.tar.xz skip-dolphin4-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.0RMJgE/_old 2015-10-03 20:19:45.000000000 +0200 +++ /var/tmp/diff_new_pack.0RMJgE/_new 2015-10-03 20:19:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdebase4 -Version: 15.04.3 +Version: 15.08.1 Release: 0 Summary: The Base KDE Apps License: GPL-2.0+ @@ -26,10 +26,10 @@ Source0: kde-baseapps-%{version}.tar.xz Source1: baselibs.conf Source2: %{name}-rpmlintrc -Source3: dolphinsu.desktop -Patch1: dolphin-go_up.diff +# PATCH-FIX-OPENSUSE skip-dolphin4-build.patch -- Don't build dolphin4 +Patch0: skip-dolphin4-build.patch # PATCH-FIX-OPENSUSE folderview_align_to_grid_true.diff (created by Christian Trippe to make icon set to align the default in folderview bnc#327502) -Patch2: folderview_align_to_grid_true.diff +Patch1: folderview_align_to_grid_true.diff BuildRequires: baloo-devel BuildRequires: fdupes BuildRequires: libbaloowidgets-devel @@ -47,8 +47,8 @@ %prep %setup -q -n kde-baseapps-%{version} +%patch0 -p1 %patch1 -p1 -%patch2 -p1 %build %cmake_kde4 -d build @@ -57,7 +57,6 @@ %install pushd build %kde4_makeinstall - %create_subdir_filelist -d dolphin %create_subdir_filelist -d kdepasswd %create_subdir_filelist -d kdialog %create_subdir_filelist -d keditbookmarks @@ -68,10 +67,8 @@ %create_subdir_filelist -d nsplugins popd %create_exclude_filelist - install -D -m 0644 %{SOURCE3} %{buildroot}%{_kde4_applicationsdir} %suse_update_desktop_file konqbrowser WebBrowser %suse_update_desktop_file konquerorsu System FileManager - %suse_update_desktop_file dolphin System FileManager %suse_update_desktop_file kfind System Filesystem core %suse_update_desktop_file Home System FileManager core %fdupes -s %{buildroot} @@ -91,17 +88,6 @@ done popd -%package -n dolphin -Summary: KDE File Manager -Group: Productivity/File utilities -Requires: %{name}-libkonq = %{version} -Recommends: konsole4-part -Recommends: kate4-part -%kde4_runtime_requires - -%description -n dolphin -This package contains the default file manager of KDE 4. - %package -n kdepasswd Summary: KDE Password Changer Group: System/GUI/KDE @@ -217,10 +203,6 @@ %postun -p /sbin/ldconfig -%post -n dolphin -p /sbin/ldconfig - -%postun -n dolphin -p /sbin/ldconfig - %post -n kdepasswd -p /sbin/ldconfig %postun -n kdepasswd -p /sbin/ldconfig @@ -253,13 +235,6 @@ %postun -n libkonq5 -p /sbin/ldconfig -%files -n dolphin -f filelists/dolphin -%defattr(-,root,root) -%doc COPYING COPYING.DOC README -%dir %{_kde4_appsdir}/dolphinpart -%dir %{_kde4_datadir}/appdata -%{_kde4_applicationsdir}/dolphinsu.desktop - %files -n kdepasswd -f filelists/kdepasswd %defattr(-,root,root) %doc COPYING COPYING.DOC README @@ -306,6 +281,7 @@ %exclude %{_kde4_appsdir}/konqueror/pics/arrow_topright.png %exclude %{_kde4_includedir}/konqsidebarplugin.h %exclude %{_kde4_libdir}/libkonqsidebarplugin.so +%dir %_kde4_appsdir/dolphinpart %files -n konqueror-plugins -f filelists/konq-plugins %defattr(-,root,root) @@ -320,6 +296,7 @@ %dir %{_kde4_appsdir}/konqueror/icons/oxygen/*/actions %dir %{_kde4_appsdir}/konqueror/kpartplugins %dir %{_kde4_appsdir}/konqueror/opensearch +%dir %_kde4_appsdir/dolphinpart %files libkonq -f filelists/lib %defattr(-,root,root) @@ -331,7 +308,6 @@ %exclude %{_kde4_includedir}/knewmenu.h %exclude %{_kde4_includedir}/konq_*.h %exclude %{_kde4_includedir}/konqmimedata.h -%exclude %{_kde4_includedir}/kversioncontrolplugin.h %exclude %{_kde4_includedir}/libkonq_export.h %exclude %{_kde4_libdir}/libkonq.so %exclude %{_kde4_libdir}/libkonq.so.* @@ -343,7 +319,6 @@ %{_kde4_includedir}/konq_*.h %{_kde4_includedir}/konqmimedata.h %{_kde4_includedir}/konqsidebarplugin.h -%{_kde4_includedir}/kversioncontrolplugin.h %{_kde4_includedir}/libkonq_export.h %{_kde4_libdir}/libkonq.so %{_kde4_libdir}/libkonqsidebarplugin.so ++++++ kde-baseapps-15.04.3.tar.xz -> kde-baseapps-15.08.1.tar.xz ++++++ ++++ 4012 lines of diff (skipped) ++++++ skip-dolphin4-build.patch ++++++ diff --git a/CMakeLists.txt b/CMakeLists.txt index b06ba01..696d3e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ if ( KActivities_FOUND ) endif ( KActivities_FOUND ) add_subdirectory( lib ) -add_subdirectory( dolphin ) +# add_subdirectory( dolphin ) add_subdirectory( kdialog ) add_subdirectory( keditbookmarks ) add_subdirectory( konqueror ) diff --git a/lib/konq/CMakeLists.txt b/lib/konq/CMakeLists.txt index 8ecbfa9..20716e1 100644 --- a/lib/konq/CMakeLists.txt +++ b/lib/konq/CMakeLists.txt @@ -20,8 +20,8 @@ set(konq_LIB_SRCS konq_historyentry.cpp konq_historyloader.cpp konq_historyprovider.cpp - kversioncontrolplugin.cpp # used by dolphin and its version control plugins (deprecated) - kversioncontrolplugin2.cpp # used by dolphin and its version control plugins +# kversioncontrolplugin.cpp # used by dolphin and its version control plugins (deprecated) +# kversioncontrolplugin2.cpp # used by dolphin and its version control plugins konq_nameandurlinputdialog.cpp # deprecated (functionality has moved to kdelibs) knewmenu.cpp # deprecated (functionality has moved to kdelibs) @@ -65,8 +65,8 @@ install( FILES konq_events.h konqmimedata.h konq_fileitemcapabilities.h - kversioncontrolplugin.h - kversioncontrolplugin2.h + # kversioncontrolplugin.h + # kversioncontrolplugin2.h konq_historyprovider.h konq_historyentry.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
