[packages/kdebase/dev-trinity] updated kdebase-session.patch for cmake
glen
glen at pld-linux.org
Wed Jun 4 23:11:45 CEST 2014
commit 7358319fdf826c21f57ddf7328e278effea8c2b4
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Jun 4 11:58:34 2014 +0300
updated kdebase-session.patch for cmake
kdebase-session.patch | 23 +++++++++++++++++++++++
kdebase.spec | 6 +-----
2 files changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/kdebase.spec b/kdebase.spec
index b85c3e3..ec07a6d 100644
--- a/kdebase.spec
+++ b/kdebase.spec
@@ -37,7 +37,7 @@ Summary(uk.UTF-8): K Desktop Environment - базові файли
Summary(zh_CN.UTF-8): KDE核心
Name: kdebase
Version: 3.5.13.2
-Release: 0.13
+Release: 0.14
Epoch: 9
License: GPL
Group: X11/Applications
@@ -1274,10 +1274,6 @@ if [ ! -f installed.stamp ]; then
$RPM_BUILD_ROOT/etc/X11/kdm/faces/.default.face.icon
cp -p $RPM_BUILD_ROOT%{_datadir}/apps/kdm/pics/users/root1.png \
$RPM_BUILD_ROOT/etc/X11/kdm/faces/root.face.icon
-
- # kdebase-session.patch patch removes these
- %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/apps/kdm/sessions
-
%endif
# konqueror/dirtree no longer supported
diff --git a/kdebase-session.patch b/kdebase-session.patch
index 2dca5fd..1096d83 100644
--- a/kdebase-session.patch
+++ b/kdebase-session.patch
@@ -52,3 +52,26 @@
+sessionsdir = /usr/share/xsessions
+sessions_DATA = kde.desktop
EXTRA_DIST = $(sessions_DATA)
+--- kdebase-trinity-3.5.13.2/kdm/kfrontend/sessions/CMakeLists.txt~ 2012-09-16 15:52:03.000000000 +0300
++++ kdebase-trinity-3.5.13.2/kdm/kfrontend/sessions/CMakeLists.txt 2014-06-04 11:22:28.208119436 +0300
+@@ -12,18 +12,5 @@
+ configure_file( tde.desktop.cmake tde.desktop @ONLY )
+
+ install( FILES
+- admin.desktop ${CMAKE_CURRENT_BINARY_DIR}/tde.desktop
+- gnome.desktop 9wm.desktop aewm++.desktop aewm.desktop
+- afterstep.desktop amaterus.desktop amiwm.desktop
+- asclassic.desktop blackbox.desktop cde.desktop
+- ctwm.desktop cwwm.desktop enlightenment.desktop
+- evilwm.desktop fluxbox.desktop flwm.desktop fvwm.desktop
+- fvwm95.desktop golem.desktop icewm.desktop ion.desktop
+- larswm.desktop lwm.desktop matchbox.desktop metacity.desktop
+- mwm.desktop olvwm.desktop olwm.desktop openbox.desktop
+- oroborus.desktop phluid.desktop pwm.desktop qvwm.desktop
+- ratpoison.desktop sapphire.desktop sawfish.desktop
+- twm.desktop ude.desktop vtwm.desktop w9wm.desktop
+- waimea.desktop wm2.desktop wmaker.desktop xfce.desktop
+- xfce4.desktop
+- DESTINATION ${DATA_INSTALL_DIR}/kdm/sessions )
++ ${CMAKE_CURRENT_BINARY_DIR}/tde.desktop RENAME kde.desktop
++ DESTINATION ${DATA_INSTALL_DIR}/xsessions )
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kdebase.git/commitdiff/f59a30135a5137d2c2904517cb7332a2714f9ab0
More information about the pld-cvs-commit
mailing list