[packages/kdebase/dev-trinity] fix fonts and xsessions and kscreensaver packaging paths

[glen]

commit 37f30ab3ee913c9d3899df83f9831c3b83d7e6d5
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Jun 5 23:36:42 2014 +0300

    fix fonts and xsessions and kscreensaver packaging paths

 kdebase-fontdir.patch |  2 +-
 kdebase-session.patch |  2 +-
 kdebase.spec          | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/kdebase.spec b/kdebase.spec
index 02723bc..d7778bf 100644
--- a/kdebase.spec
+++ b/kdebase.spec
@@ -57,7 +57,7 @@ Summary(uk.UTF-8):	K Desktop Environment - базові файли
 Summary(zh_CN.UTF-8):	KDE核心
 Name:		kdebase
 Version:	3.5.13.2
-Release:	0.16
+Release:	0.17
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
@@ -1670,7 +1670,7 @@ fi
 
 %files common-konsole
 %defattr(644,root,root,755)
-#%{_fontsdir}/misc/console*.gz
+%{_fontsdir}/misc/console*.gz
 %{_datadir}/apps/konsole
 %{_datadir}/mimelnk/application/x-konsole.desktop
 %{_iconsdir}/crystalsvg/*/apps/bell.png
@@ -2001,7 +2001,7 @@ fi
 %{_datadir}/wallpapers/world-desktop.jpg
 %{_datadir}/wallpapers/*.svgz
 %{_datadir}/wallpapers/*.desktop
-#%{_datadir}/xsessions/kde.desktop
+%{_datadir}/xsessions/kde.desktop
 %{_applnkdir}/.hidden/.directory
 %{_applnkdir}/.hidden/battery.desktop
 %{_applnkdir}/.hidden/bwarning.desktop
@@ -2457,7 +2457,9 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*.kss
 %attr(755,root,root) %{_libexecdir}/kcm_screensaver.so
-#%{_datadir}/apps/kscreensaver
+%dir %{_datadir}/apps/kscreensaver
+%{_datadir}/apps/kscreensaver/KBlankscreen.desktop
+%{_datadir}/apps/kscreensaver/KRandom.desktop
 %{_desktopdir}/kde/screensaver.desktop
 #%{_iconsdir}/*/*/apps/kscreensaver.png
 
diff --git a/kdebase-fontdir.patch b/kdebase-fontdir.patch
index 496b3a1..a569b8d 100644
--- a/kdebase-fontdir.patch
+++ b/kdebase-fontdir.patch
@@ -6,7 +6,7 @@
      ${CMAKE_CURRENT_BINARY_DIR}/console8x16.pcf.gz
 -    ${CMAKE_CURRENT_BINARY_DIR}/9x15.pcf.gz
 -  DESTINATION ${DATA_INSTALL_DIR}/konsole/fonts )
-+  DESTINATION ${DATA_INSTALL_DIR}/fonts/misc )
++  DESTINATION ${SHARE_INSTALL_PREFIX}/fonts/misc )
  
  # FIXME this should be improved, to guarantee that mkfontdir is executed after fonts are installed
  install( CODE "execute_process( COMMAND mkfontdir \$ENV{DESTDIR}${DATA_INSTALL_DIR}/konsole/fonts )" )
diff --git a/kdebase-session.patch b/kdebase-session.patch
index 30f3cd4..8bea7ad 100644
--- a/kdebase-session.patch
+++ b/kdebase-session.patch
@@ -20,4 +20,4 @@
 -    xfce4.desktop
 -  DESTINATION ${DATA_INSTALL_DIR}/kdm/sessions )
 +  ${CMAKE_CURRENT_BINARY_DIR}/tde.desktop RENAME kde.desktop
-+  DESTINATION ${DATA_INSTALL_DIR}/xsessions )
++  DESTINATION ${SHARE_INSTALL_PREFIX}/xsessions )
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kdebase.git/commitdiff/37f30ab3ee913c9d3899df83f9831c3b83d7e6d5