Branch: master

d4ba6219 2014-10-26 05:58:36 François Andriot
RPM Packaging: update tdemultimedia
M redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
M redhat/tdeartwork/tdeartwork-14.0.0.spec
M redhat/tdebase/tdebase-14.0.0.spec
M redhat/tdemultimedia/tdemultimedia-14.0.0.spec
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
index c503d8a..d950d84 100644
--- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
@@ -153,7 +153,7 @@
 echo "%{name} (%{version})" >ChangeLog
 
 # Fix invalid return value
-sed -i "src/get-carddav-report.c" -e "89s/TRUE/NULL/" 
+sed -i "src/get-carddav-report.c" -e "89s/TRUE/NULL/"
 
 ./autogen.sh
 
diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec
index b056001..c0d5a01 100644
--- a/redhat/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec
@@ -59,7 +59,7 @@
 BuildRequires:	libart_lgpl-devel
 
 # XSCREENSAVER support
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?with_xscreensaver}
 %if 0%{?rhel} == 0 || 0%{?rhel} <= 6
 %define with_xscreensaver 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index cbca91d..90a1e5e 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -3412,8 +3412,13 @@
 
 # TDE default directory and icon in startup script
 %__sed -i "%{starttde}" \
-	-e "s|/opt/trinity|%{tde_prefix}|g" \
-	-e "s|%%{tde_starticon}|%{tde_starticon}|g"
+	-e "s|/opt/trinity|%{tde_prefix}|g"
+
+# Sets default TDE menu icon
+%if "%{tde_starticon}" != ""
+%__sed -i "kicker/libkicker/kickerSettings.kcfg" \
+	-e "s|QString(\"kmenu\")|QString(\"%{tde_starticon}\")|"
+%endif
 
 # Xsession script location may vary on some distro
 %if 0%{?rhel} || 0%{?fedora}
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
index 764be53..1e0fb1b 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -174,7 +174,7 @@
 %endif
 
 # XINE support
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?with_xine}
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?with_xine}
 %define with_xine 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?pclinuxos}