From 86c48cec51f59dd8b6f693fbc4d01817d6f91f96 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Thu, 9 Aug 2012 12:11:07 +0200 Subject: RHEL/Fedora: fix tdebase packaging for MGA/MDV --- .../kdebase/kdebase-3.5.13.1-startkde_icon.patch | 19 ++++++++++++++ .../kdebase/tdebase-3.5.13.1-missing_ldflags.patch | 10 ++++++++ redhat/kdebase/tdebase-r14.spec | 6 +++-- redhat/kdebase/trinity-kdebase-3.5.13.spec | 29 ++++++++++++++-------- 4 files changed, 52 insertions(+), 12 deletions(-) create mode 100644 redhat/kdebase/kdebase-3.5.13.1-startkde_icon.patch create mode 100644 redhat/kdebase/tdebase-3.5.13.1-missing_ldflags.patch diff --git a/redhat/kdebase/kdebase-3.5.13.1-startkde_icon.patch b/redhat/kdebase/kdebase-3.5.13.1-startkde_icon.patch new file mode 100644 index 000000000..8b9052e09 --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.13.1-startkde_icon.patch @@ -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 <$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" diff --git a/redhat/kdebase/tdebase-3.5.13.1-missing_ldflags.patch b/redhat/kdebase/tdebase-3.5.13.1-missing_ldflags.patch new file mode 100644 index 000000000..6f6173ef0 --- /dev/null +++ b/redhat/kdebase/tdebase-3.5.13.1-missing_ldflags.patch @@ -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( diff --git a/redhat/kdebase/tdebase-r14.spec b/redhat/kdebase/tdebase-r14.spec index e1eee6c5b..249b7f4a9 100644 --- a/redhat/kdebase/tdebase-r14.spec +++ b/redhat/kdebase/tdebase-r14.spec @@ -384,9 +384,11 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 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 for f in crystalsvg hicolor ; do diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index fd1e2fa99..9ab4c4985 100644 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -60,6 +60,8 @@ Source5: pamd.kscreensaver-trinity%{?dist} Source6: tiles-fixed-png-images.tar.gz # 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] Patch7: kdebase-3.5.13-kdm-crypt.patch ## [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}/config/[kt]dm/ %{tde_tdedocdir}/HTML/en/[kt]dm/ +%{_sysconfdir}/pam.d/kdm-trinity +%{_sysconfdir}/pam.d/kdm-trinity-np # Distribution specific stuff %if 0%{?rhel} || 0%{?fedora} %{_usr}/share/xsessions/tde.desktop %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 -%make_session - -%postun -n trinity-tdm -%make_session +# https://wiki.mageia.org/en/How_to_add_a_new_Window_Manager_or_Display_Manager +%if 0%{?mgaversion} || 0%{?mdkversion} +%{_sysconfdir}/X11/wmsession.d/45TDE +%{_datadir}/X11/dm.d/45TDE.conf %endif ########## @@ -2902,6 +2901,7 @@ Konqueror libraries. %setup -q -n kdebase %__tar xfz %{SOURCE6} -C kicker/data/tiles +%patch2 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 @@ -2994,7 +2994,7 @@ Konqueror libraries. %__sed -i "startkde" \ -e "s|/opt/trinity|%{tde_prefix}|g" -# TDE default start button icon +# TDE default start button icon [See Patch15] %__sed -i "startkde" \ -e "s|%%{tde_starticon}|%{tde_starticon}|g" @@ -3077,6 +3077,15 @@ EXEC=%{tde_bindir}/startkde SCRIPT: exec %{tde_bindir}/startkde EOF + +%__install -d -m 755 %{?buildroot}%{_datadir}/X11/dm.d +cat <"%{?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 # Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard' -- cgit v1.2.3