Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at 2015-10-28 17:16:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-19 22:39:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4.new/kdebase4.changes 2015-10-28 17:16:22.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Oct 21 11:40:05 UTC 2015 - wba...@tmo.at + +- Drop skip-dolphin4-build.patch: reenable dolphin build, it is + required for Konqueror's filemanagement part and also things like + FTP and SMB. It's shipped in the new dolphin4 package to not + conflict with the KF5 based dolphin. +- Re-add dolphin-go_up.diff: adds a "go up" button to dolphin's + default toolbar. + +------------------------------------------------------------------- Old: ---- skip-dolphin4-build.patch New: ---- dolphin-go_up.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.P8UaHF/_old 2015-10-28 17:16:23.000000000 +0100 +++ /var/tmp/diff_new_pack.P8UaHF/_new 2015-10-28 17:16:23.000000000 +0100 @@ -26,10 +26,10 @@ Source0: kde-baseapps-%{version}.tar.xz Source1: baselibs.conf Source2: %{name}-rpmlintrc -# PATCH-FIX-OPENSUSE skip-dolphin4-build.patch -- Don't build dolphin4 -Patch0: skip-dolphin4-build.patch +# PATCH-FEATURE-OPENSUSE dolphin-go_up.diff -- adds a "go up" button to dolphin's default toolbar. +Patch1: dolphin-go_up.diff # 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) -Patch1: folderview_align_to_grid_true.diff +Patch2: 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,6 +57,7 @@ %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 @@ -74,6 +75,17 @@ %fdupes -s %{buildroot} %kde_post_install +%package -n dolphin4 +Summary: KDE File Manager +Group: Productivity/File utilities +Requires: %{name}-libkonq = %{version} +Recommends: konsole4-part +Recommends: kate4-part +%kde4_runtime_requires + +%description -n dolphin4 +This package contains the default file manager of KDE 4. + %package -n kdepasswd Summary: KDE Password Changer Group: System/GUI/KDE @@ -112,7 +124,7 @@ Requires: %{name}-libkonq = %{version} Requires: konqueror-plugins = %{version} # needed for embedded filemanagement part -Recommends: dolphin +Recommends: dolphin4 Recommends: kwebkitpart Recommends: kdebase4-nsplugin %kde4_runtime_requires @@ -189,6 +201,10 @@ %postun -p /sbin/ldconfig +%post -n dolphin4 -p /sbin/ldconfig + +%postun -n dolphin4 -p /sbin/ldconfig + %post -n kdepasswd -p /sbin/ldconfig %postun -n kdepasswd -p /sbin/ldconfig @@ -221,6 +237,11 @@ %postun -n libkonq5 -p /sbin/ldconfig +%files -n dolphin4 -f filelists/dolphin +%defattr(-,root,root) +%doc COPYING COPYING.DOC README +%dir %{_kde4_appsdir}/dolphinpart + %files -n kdepasswd -f filelists/kdepasswd %defattr(-,root,root) %doc COPYING COPYING.DOC README @@ -284,7 +305,7 @@ %dir %{_kde4_appsdir}/konqueror/icons/oxygen/*/actions %dir %{_kde4_appsdir}/konqueror/kpartplugins %dir %{_kde4_appsdir}/konqueror/opensearch -%dir %_kde4_appsdir/dolphinpart +%dir %{_kde4_appsdir}/dolphinpart %files libkonq -f filelists/lib %defattr(-,root,root) ++++++ dolphin-go_up.diff ++++++ Index: kde-baseapps-4.7.98/dolphin/src/dolphinui.rc =================================================================== --- kde-baseapps-4.7.98.orig/dolphin/src/dolphinui.rc +++ kde-baseapps-4.7.98/dolphin/src/dolphinui.rc @@ -88,6 +88,7 @@ <text context="@title:menu">Main Toolbar</text> <Action name="go_back" /> <Action name="go_forward" /> + <Action name="go_up" /> <Separator name="separator_1" /> <Action name="icons" /> <Action name="compact" />