summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--redhat/applications/kaffeine/kaffeine-3.5.13.2.spec2
-rw-r--r--redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec9
-rw-r--r--redhat/tdebase/tdebase-3.5.13.2.spec4
-rw-r--r--redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec34
4 files changed, 33 insertions, 16 deletions
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
index 7b9b2f2e5..0570ac1ac 100644
--- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
@@ -108,7 +108,7 @@ BuildRequires: libgstreamer-plugins-base-devel >= 0.10
%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_xine 1
%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{pclinuxos}
+%if 0%{?pclinuxos}
BuildRequires: %{_lib}xine-devel
%else
BuildRequires: %{_lib}xine1.2-devel
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec
index fa69466f0..2a03dabce 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec
@@ -162,14 +162,15 @@ Requires: trinity-tdeio-apt
Requires: trinity-tdeio-locate
Requires: trinity-tdeio-umountwrapper
Requires: trinity-tderadio
-%if 0%{?pclinuxos} == 0
-Requires: trinity-tdesudo
-%endif
Requires: trinity-tdmtheme
Requires: trinity-tellico
Requires: trinity-wlassistant
Requires: trinity-yakuake
+# PCLinuxOS does not have sudo ...
+%if 0%{?pclinuxos} == 0
+Requires: trinity-tdesudo
+%endif
# Disabled applications for RHEL5
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
@@ -185,7 +186,7 @@ Requires: trinity-kpilot
# This one causes several crashes . Obsolete.
#Requires: trinity-kgtk-qt3
-Obsoletes: trinity-kgtk-qt3
+#Obsoletes: trinity-kgtk-qt3
# OBSOLETE: beagle does not exist anymore. Kerry is now useless.
# RHEL, openSUSE 12: no Beagle library
diff --git a/redhat/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec
index e8167a10b..8aab6a970 100644
--- a/redhat/tdebase/tdebase-3.5.13.2.spec
+++ b/redhat/tdebase/tdebase-3.5.13.2.spec
@@ -3539,7 +3539,11 @@ NAME=TDM
DESCRIPTION=TDM (Trinity Display Manager)
PACKAGE=trinity-tdm
EXEC=%{tde_bindir}/kdm
+%if 0%{?pclinuxos}
FNDSESSION_EXEC="/usr/sbin/chksession -k"
+%else
+FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions"
+%endif
EOF
%endif
diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec b/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
index 2f7ae3e4e..9e5978c22 100644
--- a/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
+++ b/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
@@ -134,15 +134,17 @@ BuildRequires: libXt-devel
# XINE support
%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_xine 1
-%if 0%{?pclinuxos} == 0
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires: %{_lib}xine-devel
+%else
BuildRequires: %{_lib}xine1.2-devel
%endif
%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
%endif
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?suse_version}
BuildRequires: libxine-devel
%endif
%endif
@@ -172,7 +174,7 @@ Requires: trinity-kaudiocreator = %{version}-%{release}
Requires: %{name}-kfile-plugins = %{version}-%{release}
Requires: %{name}-kappfinder-data = %{version}-%{release}
Requires: %{name}-tdeio-plugins = %{version}-%{release}
-Requires: trinity-kmid = %{version}-%{release}
+Requires: trinity-tdemid = %{version}-%{release}
Requires: trinity-kmix = %{version}-%{release}
Requires: trinity-krec = %{version}-%{release}
Requires: trinity-kscd = %{version}-%{release}
@@ -191,7 +193,7 @@ System. The %{name} package contains multimedia applications for
TDE, including:
artsbuilder, Synthesizer designer for aRts
juk, a media player
- kmid, a midi player
+ tdemid, a midi player
kmix, an audio mixer
arts, additional functionality for the aRts sound system
krec, a recording tool
@@ -622,14 +624,17 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
-%package -n trinity-kmid
+%package -n trinity-tdemid
Summary: MIDI/karaoke player for Trinity
Group: Applications/Multimedia
-%description -n trinity-kmid
+Obsoletes: trinity-kmid < %{version}-%{release}
+Provides: trinity-kmid = %{version}-%{release}
+
+%description -n trinity-tdemid
This package provides a MIDI and karaoke player for TDE.
-%files -n trinity-kmid
+%files -n trinity-tdemid
%defattr(-,root,root,-)
%{tde_bindir}/kmid
%{tde_tdelibdir}/libkmidpart.la
@@ -642,7 +647,7 @@ This package provides a MIDI and karaoke player for TDE.
%{tde_datadir}/servicetypes/audiomidi.desktop
%{tde_tdedocdir}/HTML/en/kmid/
-%post -n trinity-kmid
+%post -n trinity-tdemid
/sbin/ldconfig
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
@@ -650,7 +655,7 @@ for f in hicolor ; do
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-%postun -n trinity-kmid
+%postun -n trinity-tdemid
/sbin/ldconfig
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
@@ -1142,6 +1147,12 @@ noatun plugins.
##########
+# FIXME 2014/03/15: FTBFS on PCLINUXOS ... Need to remove -fstack-protector
+# UPDATE 2014/04/07: FBTFS on Mageia 4 too !
+%if 0%{?pclinuxos} || 0%{?mgaversion} >= 4
+%define _ssp_cflags -fno-stack-protector --param=ssp-buffer-size=4%{?_serverbuild_flags: %_serverbuild_flags}
+%endif
+
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
@@ -1154,7 +1165,8 @@ noatun plugins.
%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
@@ -1195,7 +1207,7 @@ fi
%{?_with_taglib} %{!?_with_taglib:--without-taglib} \
%{?with_xine:--with-xine} %{!?with_xine:--without-xine}
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install