RHEL/Fedora: fix tdebase packaging for MGA/MDV

pull/3/head
Francois Andriot 12 years ago
parent 1ba5d654bf
commit 86c48cec51

@ -0,0 +1,19 @@
--- kdebase/startkde.tdeicon 2012-08-09 10:33:24.000000000 +0200
+++ kdebase/startkde 2012-08-09 10:34:11.484608675 +0200
@@ -302,6 +302,16 @@
fi
fi
+# Default Start Button icon for TDE
+if [ ! -e $kdehome/share/config/kickerrc ]; then
+ if [ -r "%{tde_starticon}" ]; then
+ cat <<EOF >$kdehome/share/config/kickerrc
+[KMenu]
+CustomIcon=%{tde_starticon}
+EOF
+ fi
+fi
+
# XCursor mouse theme needs to be applied here to work even for kded or ksmserver.
if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"

@ -0,0 +1,10 @@
--- kdebase/khotkeys/arts/CMakeLists.txt.ORI 2012-08-07 21:21:45.840401244 +0200
+++ kdebase/khotkeys/arts/CMakeLists.txt 2012-08-07 21:22:06.260974727 +0200
@@ -25,6 +25,7 @@
${CMAKE_SOURCE_DIR}/khotkeys/kcontrol
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
+ ${ARTS_INCLUDE_DIRS}
)
link_directories(

@ -384,9 +384,11 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
update-desktop-database 2> /dev/null || : update-desktop-database 2> /dev/null || :
%post libs -p /sbin/ldconfig %post libs
/sbin/ldconfig
%postun libs -p /sbin/ldconfig %postun libs
/sbin/ldconfig
%post extras %post extras
for f in crystalsvg hicolor ; do for f in crystalsvg hicolor ; do

@ -60,6 +60,8 @@ Source5: pamd.kscreensaver-trinity%{?dist}
Source6: tiles-fixed-png-images.tar.gz Source6: tiles-fixed-png-images.tar.gz
# TDE 3.5.13 patches # TDE 3.5.13 patches
## [kdebase] Missing LDFLAGS cause FTBFS
Patch2: tdebase-3.5.13.1-missing_ldflags.patch
## [kdebase/kdm] adds gcrypt support [Bug #624] ## [kdebase/kdm] adds gcrypt support [Bug #624]
Patch7: kdebase-3.5.13-kdm-crypt.patch Patch7: kdebase-3.5.13-kdm-crypt.patch
## [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes [RHEL/Fedora] ## [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes [RHEL/Fedora]
@ -1786,21 +1788,18 @@ already. Most users won't need this.
%{tde_datadir}/apps/[kt]dm/themes/ %{tde_datadir}/apps/[kt]dm/themes/
%{tde_datadir}/config/[kt]dm/ %{tde_datadir}/config/[kt]dm/
%{tde_tdedocdir}/HTML/en/[kt]dm/ %{tde_tdedocdir}/HTML/en/[kt]dm/
%{_sysconfdir}/pam.d/kdm-trinity
%{_sysconfdir}/pam.d/kdm-trinity-np
# Distribution specific stuff # Distribution specific stuff
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora}
%{_usr}/share/xsessions/tde.desktop %{_usr}/share/xsessions/tde.desktop
%endif %endif
%{_sysconfdir}/pam.d/kdm-trinity
%{_sysconfdir}/pam.d/kdm-trinity-np
%if 0%{?mgaversion} || 0%{?mdkversion}
%{_sysconfdir}/X11/wmsession.d/*
%post -n trinity-tdm # https://wiki.mageia.org/en/How_to_add_a_new_Window_Manager_or_Display_Manager
%make_session %if 0%{?mgaversion} || 0%{?mdkversion}
%{_sysconfdir}/X11/wmsession.d/45TDE
%postun -n trinity-tdm %{_datadir}/X11/dm.d/45TDE.conf
%make_session
%endif %endif
########## ##########
@ -2902,6 +2901,7 @@ Konqueror libraries.
%setup -q -n kdebase %setup -q -n kdebase
%__tar xfz %{SOURCE6} -C kicker/data/tiles %__tar xfz %{SOURCE6} -C kicker/data/tiles
%patch2 -p1
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
@ -2994,7 +2994,7 @@ Konqueror libraries.
%__sed -i "startkde" \ %__sed -i "startkde" \
-e "s|/opt/trinity|%{tde_prefix}|g" -e "s|/opt/trinity|%{tde_prefix}|g"
# TDE default start button icon # TDE default start button icon [See Patch15]
%__sed -i "startkde" \ %__sed -i "startkde" \
-e "s|%%{tde_starticon}|%{tde_starticon}|g" -e "s|%%{tde_starticon}|%{tde_starticon}|g"
@ -3077,6 +3077,15 @@ EXEC=%{tde_bindir}/startkde
SCRIPT: SCRIPT:
exec %{tde_bindir}/startkde exec %{tde_bindir}/startkde
EOF EOF
%__install -d -m 755 %{?buildroot}%{_datadir}/X11/dm.d
cat <<EOF >"%{?buildroot}%{_datadir}/X11/dm.d/45TDE.conf"
NAME=TDM
DESCRIPTION=TDM (Trinity Display Manager)
PACKAGE=trinity-tdm
EXEC=%{tde_bindir}/kdm
FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions"
EOF
%endif %endif
# Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard' # Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard'

Loading…
Cancel
Save