5 files changed, 107 insertions, 4 deletions
diff --git a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
index 0fc831de1..d0159deeb 100644
--- a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
@@ -710,11 +710,11 @@ This package is part of Trinity, and a component of the TDE artwork module.
 %{tde_datadir}/applnk/System/ScreenSavers/unknownpleasures.desktop
 %endif
 
-%if 0%{?fedora} >= 20 || 0%{?mgaversion} >= 4 || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 20 || 0%{?mgaversion} >= 4 || 0%{?rhel} >= 7 || 0%{?pclinuxos}
 %{tde_datadir}/applnk/System/ScreenSavers/geodesic.desktop
 %endif
 
-%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 || 0%{?pclinuxos}
 %{tde_datadir}/applnk/System/ScreenSavers/projectiveplane.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop
 %endif
diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec
index 7fa33e23f..7a8999d40 100644
--- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -43,7 +43,7 @@
 Name:		trinity-%{tde_pkg}
 Summary:	Multimedia applications for the Trinity Desktop Environment (TDE)
 Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Group:		Productivity/Multimedia/Sound/Utilities
 URL:		http://www.trinitydesktop.org/
 
@@ -113,6 +113,7 @@ BuildRequires:	audiofile-devel
 BuildRequires:	libtheora-devel
 BuildRequires:	alsa-lib-devel 
 BuildRequires:	cdparanoia
+#BuildRequires:	libmpg123-devel
 
 # CDDA support
 %if 0%{?mgaversion} || 0%{?mdkversion}
@@ -1269,7 +1270,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
   %{?with_xine:--with-xine} %{!?with_xine:--without-xine}
 
 # Fix unexplained "undefined reference to `__stack_chk_fail'"
-%if 0%{?mgaversion} == 4
+%if 0%{?mgaversion} == 4 || 0%{?pclinuxos}
 %__sed -i "noatun/app/Makefile" -e "/^libtdeinit_noatun_la_LDFLAGS/ s/$/ -Wl,-lc/"
 %endif
 
@@ -1327,5 +1328,8 @@ popd
 
 
 %changelog
+* Tue Mar 10 2015 Francois Andriot <francois.andriot@free.fr> - 14.0.0-2
+- Fix dependencies and rebuild for Fedora 21
+
 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/main/tdepim/tdepim-14.0.0.patch b/redhat/main/tdepim/tdepim-14.0.0.patch
new file mode 100644
index 000000000..0770a8af9
--- /dev/null
+++ b/redhat/main/tdepim/tdepim-14.0.0.patch
@@ -0,0 +1,90 @@
+diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
+index aa01c96..d27f041 100644
+--- a/kmail/kmkernel.cpp
++++ b/kmail/kmkernel.cpp
+@@ -170,17 +170,8 @@ KMKernel::KMKernel (TQObject *parent, const char *name) :
+   connectDCOPSignal( 0, 0, "kmailSelectFolder(TQString)",
+                      "selectFolder(TQString)", false );
+ 
+-  mNetworkManager = TDEGlobal::networkManager();
+-  if (mNetworkManager) {
+-    connect( mNetworkManager, TQT_SIGNAL( networkDeviceStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ),
+-        this, TQT_SLOT( slotNetworkStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ) );
+-    if (networkStateConnected()) {
+-      resumeNetworkJobs();
+-    }
+-    else {
+-      stopNetworkJobs();
+-    }
+-  }
++  // Assume connected
++  resumeNetworkJobs();
+ }
+ 
+ KMKernel::~KMKernel ()
+@@ -2470,34 +2461,8 @@ int KMKernel::timeOfLastMessageCountChange() const
+ 
+ bool KMKernel::networkStateConnected()
+ {
+-  if (mNetworkManager) {
+-    TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags networkStatus = mNetworkManager->backendStatus();
+-    if ((networkStatus & TDENetworkGlobalManagerFlags::Connected)
+-        || (networkStatus & TDENetworkGlobalManagerFlags::BackendUnavailable)
+-        || (networkStatus == TDENetworkGlobalManagerFlags::Unknown)
+-        ){
+-      // Connected or no backend available
+-      return true;
+-    }
+-    else {
+-      // Not connected
+-      return false;
+-    }
+-  }
+-  else {
+-    // Assume connected
+-    return true;
+-  }
+-}
+-
+-void KMKernel::slotNetworkStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)
+-{
+-  if (networkStateConnected()) {
+-    resumeNetworkJobs();
+-  }
+-  else {
+-    stopNetworkJobs();
+-  }
++  // Assume connected
++  return true;
+ }
+ 
+ Wallet *KMKernel::wallet() {
+diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
+index 0dc4644..37a3eec 100644
+--- a/kmail/kmkernel.h
++++ b/kmail/kmkernel.h
+@@ -14,8 +14,6 @@
+ #include <tdeimproxy.h>
+ #include <tdepimmacros.h>
+ 
+-#include <tdenetworkconnections.h>
+-
+ #include "kmailIface.h"
+ #include "kmmsgbase.h"
+ #include "globalsettings.h"
+@@ -436,7 +434,6 @@ public slots:
+ protected slots:
+   void slotDataReq(TDEIO::Job*,TQByteArray&);
+   void slotResult(TDEIO::Job*);
+-  void slotNetworkStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString);
+ 
+ signals:
+   void configChanged();
+@@ -527,7 +524,6 @@ private:
+   TQString     mAddMessageLastFolder;
+   KMFolder    *mAddMsgCurrentFolder;
+ 
+-  TDEGlobalNetworkManager *mNetworkManager;
+ };
+ 
+ #endif
diff --git a/redhat/main/tdepim/tdepim-14.0.0.spec b/redhat/main/tdepim/tdepim-14.0.0.spec
index 075951afd..9cc470ff8 100644
--- a/redhat/main/tdepim/tdepim-14.0.0.spec
+++ b/redhat/main/tdepim/tdepim-14.0.0.spec
@@ -70,6 +70,7 @@ Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Patch0:		%{tde_pkg}-%{version}.patch
 
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -2271,6 +2272,9 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%if 0%{?rhel} == 5
+%patch0 -p1
+%endif
 
 
 %build
diff --git a/redhat/main/tdesdk/tdesdk-14.0.0.spec b/redhat/main/tdesdk/tdesdk-14.0.0.spec
index 12bc13215..b9c56494d 100644
--- a/redhat/main/tdesdk/tdesdk-14.0.0.spec
+++ b/redhat/main/tdesdk/tdesdk-14.0.0.spec
@@ -1163,6 +1163,11 @@ if ! rpm -E %%cmake|grep -q "cd build"; then
   cd build
 fi
 
+# FIXME PCLinuxOS: '/usr/bin/ld: cannot find -ltdeabc'
+%if 0%{?pclinuxos}
+export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L%{tde_libdir}"
+%endif
+
 %cmake \
   -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
   -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \