diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-03-20 21:25:19 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-03-20 21:25:19 +0100 |
| commit | da73a2fcaf9e588f4126d9d7938c1479422dcf27 (patch) | |
| tree | 0ed081587a87c528e947658fd78380309f8f5039 /redhat/tdebase | |
| parent | 4ce928ecce29cc2891fa6b7fdbd36385b1cead00 (diff) | |
| download | tde-packaging-da73a2fcaf9e588f4126d9d7938c1479422dcf27.tar.gz tde-packaging-da73a2fcaf9e588f4126d9d7938c1479422dcf27.zip | |
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat/tdebase')
| -rw-r--r-- | redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch | 2 | ||||
| -rw-r--r-- | redhat/tdebase/tdebase-14.0.0.spec | 34 |
2 files changed, 8 insertions, 28 deletions
diff --git a/redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch b/redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch index d2e7bb520..4aa8bd35a 100644 --- a/redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch +++ b/redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch @@ -7,6 +7,7 @@ +# Default Start Button icon for TDE +if [ ! -e $tdehome/share/config/kickerrc ]; then + if [ -r "%{tde_starticon}" ]; then ++ [ -d "$tdehome/share/config" ] || mkdir -p "$tdehome/share/config" + cat <<EOF >$tdehome/share/config/kickerrc +[KMenu] +CustomIcon=%{tde_starticon} @@ -14,7 +15,6 @@ + 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/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index bf542531c..35a148f16 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -77,9 +77,6 @@ Source9: mgabutton.svg # Patch party ! Patch0: tdebase-14.0.0-ftbfs.patch -Patch2: tdebase-14.0.0-kickoff_confirm_logout.patch -Patch3: tdebase-fadeaway.diff -Patch4: tdebase-fadeaway2.diff # Permanent patches, all TDE versions ## [tdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora] @@ -248,31 +245,13 @@ Requires: indexhtml %define tde_aboutpage /usr/share/mdk/about/index.html %endif -# PCLINUXOS 2012 -%if "%{?pclinuxos}" == "2012" -Requires: trinity-wallpaper-theme-default -%define tde_bg %{tde_datadir}/wallpapers/Pulse2012/contents/images/1600x1200.jpg +# PCLINUXOS +%if 0%{?pclinuxos} Requires: desktop-common-data %define tde_starticon /usr/share/icons/pclinuxos.png Requires: indexhtml -%define tde_aboutlabel PCLinuxOS 2012 -%define tde_aboutpage /usr/share/mdk/about/index.html -%endif - -# PCLINUXOS 2013 -%if "%{?pclinuxos}" == "2013" -Requires: trinity-wallpaper-theme-default -%if "%{_lib}" == "lib64" -%define tde_bg %{tde_datadir}/wallpapers/pclinuxos64.jpg -%else -%define tde_bg %{tde_datadir}/wallpapers/pclinuxos32.jpg -%endif -Requires: desktop-common-data -%define tde_starticon /usr/share/icons/pclinuxos.png - -Requires: indexhtml -%define tde_aboutlabel PCLinuxOS 2013 +%define tde_aboutlabel PCLinuxOS %define tde_aboutpage /usr/share/mdk/about/index.html %endif @@ -3304,9 +3283,6 @@ Windows and Samba shares. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %patch0 -p1 -b .ftbfs -%patch2 -p1 -b .kickofflogout -%patch3 -p1 -b .fadeaway -%patch4 -p1 -b .fadeaway2 %patch101 -p1 -b .openterminalhere %patch102 -p1 -b .startmenuicon @@ -3494,7 +3470,11 @@ NAME=TDM DESCRIPTION=TDM (Trinity Display Manager) PACKAGE=trinity-tdm EXEC=%{tde_bindir}/tdm +%if 0%{?pclinuxos} +FNDSESSION_EXEC="/usr/sbin/chksession -k" +%else FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions" +%endif EOF %endif |