summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-10-26 11:58:36 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2014-10-26 11:58:36 +0100
commitd4ba6219bc4eaf2b1345ebf401cab6cb061b05b0 (patch)
treec89bf76caa8306fd32a066f04284cd105adcffa6
parenta52bed2a6e309308976405619d0548902edceb2a (diff)
downloadtde-packaging-d4ba6219bc4eaf2b1345ebf401cab6cb061b05b0.tar.gz
tde-packaging-d4ba6219bc4eaf2b1345ebf401cab6cb061b05b0.zip
RPM Packaging: update tdemultimedia
-rw-r--r--redhat/dependencies/libcarddav/libcarddav-14.0.0.spec2
-rw-r--r--redhat/tdeartwork/tdeartwork-14.0.0.spec2
-rw-r--r--redhat/tdebase/tdebase-14.0.0.spec9
-rw-r--r--redhat/tdemultimedia/tdemultimedia-14.0.0.spec2
4 files changed, 10 insertions, 5 deletions
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
index c503d8a1f..d950d847b 100644
--- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
@@ -153,7 +153,7 @@ This package contains the development files.
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 b05600151..c0d5a01a2 100644
--- a/redhat/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec
@@ -59,7 +59,7 @@ BuildRequires: nas-devel
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 cbca91d44..90a1e5ee3 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -3412,8 +3412,13 @@ Windows and Samba shares.
# 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 764be53c2..1e0fb1bcb 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -174,7 +174,7 @@ BuildRequires: libXxf86vm-devel
%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}