RPM Packaging: update R14 packages

4 files changed, 10 insertions, 55 deletions

diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index f7a1c07ff..13ffbccf2 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -22,8 +22,6 @@ Prefix:		%{tde_prefix}
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch1:		tqt3-14.0.0-threads.patch
-
 BuildRequires: desktop-file-utils
 BuildRequires: libmng-devel
 BuildRequires: glibc-devel
@@ -460,7 +458,6 @@ for the TQt 3 toolkit.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1
 
 # fix variables in 'qmake.conf'
 %__sed -i mkspecs/*/qmake.conf \
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
index 662174c06..22e50b160 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
@@ -27,9 +27,6 @@ Source0:	trinity-3.5.13-fedora.repo
 Source1:	trinity-3.5.13-rhel.repo
 Source2:	RPM-GPG-KEY-trinity
 
-Source11:	pclinuxos201304-32.jpg
-Source12:	pclinuxos201304-64.jpg
-
 Requires:	trinity-tdeaccessibility >= %{version}
 Requires:	trinity-tdeaddons >= %{version}
 Requires:	trinity-tdeadmin >= %{version}
@@ -173,7 +170,9 @@ Requires: trinity-tdeio-umountwrapper
 Requires: trinity-tdenetworkmanager
 Requires: trinity-tdepowersave
 Requires: trinity-tderadio
+%if 0%{?pclinuxos} == 0
 Requires: trinity-tdesudo
+%endif
 Requires: trinity-tdesvn
 Requires: trinity-tdmtheme
 Requires: trinity-tellico
@@ -282,22 +281,6 @@ Summary:	Yum configuration files for Trinity
 
 ##########
 
-%if 0%{?pclinuxos}
-%package -n trinity-wallpaper-theme-default
-Group:		User Interface/Desktops
-Summary:	Default wallpaper for Trinity
-
-%description -n trinity-wallpaper-theme-default
-%{summary}
-
-%files -n trinity-wallpaper-theme-default
-%defattr(-,root,root,-)
-%{tde_datadir}/wallpapers/pclinuxos32.jpg
-%{tde_datadir}/wallpapers/pclinuxos64.jpg
-%endif
-
-##########
-
 %prep
 
 %build
@@ -332,11 +315,6 @@ Summary:	Default wallpaper for Trinity
 %__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-trinity"
 %endif
 
-# PCLinuxOS wallpaper
-%if 0%{?pclinuxos} == 2013
-%__install -D -m 644 "%{SOURCE11}" "%{?buildroot}%{tde_datadir}/wallpapers/pclinuxos32.jpg"
-%__install -D -m 644 "%{SOURCE12}" "%{?buildroot}%{tde_datadir}/wallpapers/pclinuxos64.jpg"
-%endif
 
 %changelog
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
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