Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at 2015-06-01 09:43:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-25 11:11:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4.new/kdebase4.changes 2015-06-01 09:43:02.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 29 15:09:34 UTC 2015 - [email protected] + +- Add install-templates-to-xdg-location.patch -- Install file + templates directly , instead of symlinking, brp-25-symlink cramps + the links + +------------------------------------------------------------------- New: ---- install-templates-to-xdg-location.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.K2W0HU/_old 2015-06-01 09:43:03.000000000 +0200 +++ /var/tmp/diff_new_pack.K2W0HU/_new 2015-06-01 09:43:03.000000000 +0200 @@ -30,6 +30,8 @@ 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 @@ -49,6 +51,7 @@ %setup -q -n kde-baseapps-%{version} %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %cmake_kde4 -d build @@ -77,20 +80,6 @@ %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 $i %{buildroot}%{_datadir}/templates/ -done -popd -pushd %{buildroot}%{_kde4_sharedir}/templates/.source -for i in *.desktop; do -ln -s $i %{buildroot}%{_datadir}/templates/.source/ -done -popd - %package -n dolphin Summary: KDE File Manager Group: Productivity/File utilities ++++++ install-templates-to-xdg-location.patch ++++++ diff --git a/lib/konq/Templates/CMakeLists.txt b/lib/konq/Templates/CMakeLists.txt index 809e324..7afb066 100644 --- a/lib/konq/Templates/CMakeLists.txt +++ b/lib/konq/Templates/CMakeLists.txt @@ -1,6 +1,6 @@ ########### install files ############### -install( FILES +set( templates linkProgram.desktop linkURL.desktop linkPath.desktop @@ -15,11 +15,12 @@ install( FILES linkCAMERA.desktop linkNFS.desktop linkCDWRITER.desktop - linkMO.desktop -DESTINATION ${TEMPLATES_INSTALL_DIR} ) + linkMO.desktop ) +install( FILES ${templates} DESTINATION ${TEMPLATES_INSTALL_DIR} ) +install( FILES ${templates} DESTINATION ${SHARE_INSTALL_PREFIX}/templates ) -install( FILES +set( templates_sources Program.desktop URL.desktop Floppy.desktop @@ -32,5 +33,6 @@ install( FILES CAMERA-Device.desktop NFS.desktop CDWRITER-Device.desktop - MO-Device.desktop -DESTINATION ${TEMPLATES_INSTALL_DIR}/.source ) + MO-Device.desktop ) +install( FILES ${templates_sources} DESTINATION ${TEMPLATES_INSTALL_DIR}/.source ) +install( FILES ${templates_sources} DESTINATION ${SHARE_INSTALL_PREFIX}/templates/.source ) \ No newline at end of file
