commit kdebase4 for openSUSE:Factory
Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at 2015-06-10 09:14: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-06-04 10:45:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4.new/kdebase4.changes 2015-06-10 09:14:41.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Jun 9 10:16:07 UTC 2015 - wbauer@tmo.at + +- Remove install-templates-to-xdg-location.patch again -- %fdupes + replaces the KDE4 files with symlinks which KDE4 doesn't seem to + like, see also https://forum.kde.org/viewtopic.php?f=224&t=126778 + + Instead, create symlinks for Plasma5 again, this time in a way + that should work. + +------------------------------------------------------------------- Old: ---- install-templates-to-xdg-location.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.A19UdM/_old 2015-06-10 09:14:42.000000000 +0200 +++ /var/tmp/diff_new_pack.A19UdM/_new 2015-06-10 09:14:42.000000000 +0200 @@ -30,8 +30,6 @@ 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) Patch2: folderview_align_to_grid_true.diff -# PATCH-FIX-OPENSUSE install-templates-to-xdg-location.patch -- Install file templates into place known to Plasma 5, they are used by folder widget & kfiledialog and there is no ETA for frameworks based kde-baseapps release -Patch3: install-templates-to-xdg-location.patch BuildRequires: baloo-devel BuildRequires: fdupes BuildRequires: libbaloowidgets-devel @@ -51,7 +49,6 @@ %setup -q -n kde-baseapps-%{version} %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build %cmake_kde4 -d build @@ -80,6 +77,20 @@ %fdupes -s %{buildroot} %kde_post_install +# symlink file templates into place known to Plasma 5, remove once kde-baseapps is KF5-based +mkdir -p %{buildroot}%{_datadir}/templates +mkdir -p %{buildroot}%{_datadir}/templates/.source +pushd %{buildroot}%{_kde4_sharedir}/templates +for i in *.desktop; do +ln -s %{_kde4_sharedir}/templates/$i %{buildroot}%{_datadir}/templates/ +done +popd +pushd %{buildroot}%{_kde4_sharedir}/templates/.source +for i in *.desktop; do +ln -s %{_kde4_sharedir}/templates/.source/$i %{buildroot}%{_datadir}/templates/.source/ +done +popd + %package -n dolphin Summary: KDE File Manager Group: Productivity/File utilities
participants (1)
-
root@hilbert.suse.de