17 files changed, 368 insertions, 13 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index ea917909b..4ad1c8649 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -165,7 +165,7 @@ ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
 endif
 
 imlib1:
-# Do NOT build on Fedora, nor CentOS
+# Do NOT build on Fedora, nor CentOS, nor PCLOS
 ifeq ($(wildcard /etc/fedora-release),)
 ifeq ($(wildcard /etc/centos-release),)
 ifeq ($(wildcard /boot/vmlinuz*.el5*),)
diff --git a/redhat/applications/abakus/abakus-14.0.0.spec b/redhat/applications/abakus/abakus-14.0.0.spec
index 432f84e0d..6657714e1 100644
--- a/redhat/applications/abakus/abakus-14.0.0.spec
+++ b/redhat/applications/abakus/abakus-14.0.0.spec
@@ -151,6 +151,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_tdedocdir}/HTML/en/abakus/
 %{tde_datadir}/applnk/Utilities/abakus.desktop
 
+
 %changelog
 * Fri Jul 05 2013 Francois Andriot <[email protected]> - 2:0.91-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket-14.0.0.spec
index e930a2de1..12132ac3c 100644
--- a/redhat/applications/basket/basket-14.0.0.spec
+++ b/redhat/applications/basket/basket-14.0.0.spec
@@ -36,8 +36,8 @@ Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	1.0.3.1
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-Group:		Applications/Utilities
 Summary:	Taking care of your ideas.
+Group:		Applications/Utilities
 URL:		http://www.trinitydesktop.org/
 
 %if 0%{?suse_version}
diff --git a/redhat/applications/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam-14.0.0.spec
index 15db96b07..d58b9e5c7 100644
--- a/redhat/applications/digikam/digikam-14.0.0.spec
+++ b/redhat/applications/digikam/digikam-14.0.0.spec
@@ -35,7 +35,7 @@
 Name:			trinity-%{tde_pkg}
 Epoch:			%{tde_epoch}
 Version:		0.9.6
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 Summary:		Digital photo management application for TDE
 Group:			Applications/Utilities
 URL:			http://www.trinitydesktop.org/
@@ -389,5 +389,8 @@ install -D -m 644 "%{SOURCE1}" "$RPM_BUILD_ROOT%{tde_datadir}/apps/konqueror/ser
 
 
 %changelog
+* Mon Feb 02 2015 Francois Andriot <[email protected]> - 2:0.9.6-2
+- Rebuild on Fedora 21 for updated libgphoto2
+
 * Mon Jul 29 2013 Francois Andriot <[email protected]> - 2:0.9.6-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index 6803cf68a..52e0369da 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -177,7 +177,7 @@ BuildRequires:	Mesa-libGLU-devel
 
 # OPENJPEG
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}openjpeg-devel
+#BuildRequires:	%{_lib}openjpeg-devel
 %endif
 
 # LIBXI support
diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
index e17320149..8193e5b10 100644
--- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
+++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
@@ -79,6 +79,7 @@ Requires:		%{name}-backends = %{version}-%{release}
 
 # POWERMANAGER support (requires HAL)
 #define with_powermanager 1
+Obsoletes:	trinity-tde-guidance-powermanager
 
 Obsoletes:		trinity-guidance < %{version}-%{release}
 Provides:		trinity-guidance = %{version}-%{release}
diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec b/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec
index d0d2c3112..8c50b6a0e 100644
--- a/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec
+++ b/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec
@@ -66,8 +66,6 @@ most server implementations.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
 
 %configure \
   --prefix=%{tde_prefix} \
@@ -75,6 +73,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
   --bindir=%{tde_bindir} \
   --libdir=%{tde_libdir} \
   --datadir=%{tde_datadir} \
+  --includedir=%{tde_tdeincludedir} \
   \
   --disable-dependency-tracking \
   --disable-debug \
diff --git a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec
index 5ff803701..c71b4093b 100644
--- a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec
+++ b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec
@@ -74,6 +74,7 @@ export PATH="%{tde_bindir}:${PATH}"
   --bindir=%{tde_bindir} \
   --libdir=%{tde_libdir} \
   --datadir=%{tde_datadir} \
+  --includedir=%{tde_tdeincludedir} \
   \
   --disable-dependency-tracking \
   --disable-debug \
@@ -83,7 +84,7 @@ export PATH="%{tde_bindir}:${PATH}"
   --enable-rpath \
   --disable-gcc-hidden-visibility \
   \
-%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
   --with-sword-dir=%{tde_prefix}
 %endif
 
diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh
index 51b6dc7c6..1694f34f4 100755
--- a/redhat/build/update_repository.sh
+++ b/redhat/build/update_repository.sh
@@ -26,7 +26,7 @@ elif [ -x /usr/bin/yum ]; then
     REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")'
   fi
 elif [ -x /usr/bin/apt-get ]; then
-  REPOUPDATE='(cd ${RPMDIR}; genpkglist $PWD noarch & genpkglist $PWD ${ARCH} & wait; genbasedir $PWD ${ARCH} noarch; sudo apt-get update)'
+  REPOUPDATE='(cd ${RPMDIR}; genpkglist $PWD noarch & genpkglist $PWD ${ARCH} & wait; genbasedir $PWD i586 x86_64 noarch; sudo apt-get update)'
 fi
 
 eval "${REPOUPDATE}; rm -f ${LOCKFILE}" || exit 1
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
index 28f1549e1..79888e4d0 100644
--- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
+++ b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
@@ -15,6 +15,8 @@
 # Please submit bugfixes or comments via http:/www.trinitydesktop.org/
 #
 
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 # TDE variables
 %define tde_epoch 2
 %define tde_version 14.0.0
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 <[email protected]> - 14.0.0-2
+- Fix dependencies and rebuild for Fedora 21
+
 * Fri Jul 05 2013 Francois Andriot <[email protected]> - 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" \
diff --git a/redhat/packages.oss131 b/redhat/packages.oss131
new file mode 100644
index 000000000..2babd2e57
--- /dev/null
+++ b/redhat/packages.oss131
@@ -0,0 +1,167 @@
+aspell
+aspell-devel
+audiofile-devel
+automake
+libavahi-devel
+bind-devel
+binutils-devel
+bison
+boost-devel
+ccache
+cdparanoia
+cdparanoia-devel
+chrpath
+clucene-core-devel
+cmake
+commoncpp2-devel
+createrepo
+cups-devel
+cyrus-sasl-devel
+dbus-1-devel
+dbus-1-glib-devel
+djvulibre
+docbook-xsl-stylesheets
+doxygen GraphicsMagick
+dssi-devel
+fdupes
+ffmpeg-devel
+fftw3-devel
+file-devel
+flac-devel
+flex
+freetype-devel
+fribidi-devel
+gcc-c++
+giflib-devel
+glu-devel
+gmp-devel
+gnokii-devel
+gperf xmlto
+GraphicsMagick-devel
+gsl-devel
+gstreamer-0_10-devel
+gstreamer-0_10-plugins-base-devel 
+gstreamer-devel
+gtk2-devel
+gtk-doc
+html2ps
+hunspell-devel
+ImageMagick-devel
+java-1_7_0-openjdk-devel
+libacl-devel
+libart_lgpl-devel
+libavahi-devel
+libblkid-devel
+libbz2-devel
+libcap-devel
+libcdio-devel
+libcdio-paranoia-devel
+libconfig-devel
+libcurl-devel
+libdb-4_8-devel
+libdvdread-devel
+libexiv2-devel
+libgadu-devel
+libgphoto2-devel
+libgpod-devel
+libical-devel
+libidn-devel
+libiw-devel
+libjasper-devel
+liblo-devel
+liblrdf-devel
+libmad-devel
+libmng-devel
+libmp3lame-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel 
+libnjb-devel
+libofx-devel
+libotr-devel
+libpng16-devel
+libpqxx-devel
+libraw1394-devel
+librsvg-devel
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libtheora-devel
+libtiff-devel
+libtool
+libtunepimp-devel
+libtwolame-devel
+libudev-devel
+libv4l-devel
+libvisual-devel
+libwmf-devel
+libwpd-devel
+libxine-devel
+libxslt-devel
+libzrtpcpp-devel
+lilo
+lirc-devel
+make
+meanwhile-devel
+Mesa-devel
+Mesa-libGL-devel
+NetworkManager-devel
+ocaml
+openexr-devel
+openslp-devel
+opensp-devel
+pam-devel
+patch
+pciutils-devel
+pcre-devel
+pcsc-lite-devel
+postgresql
+postgresql-devel
+python-devel
+python-sip-devel
+recode
+rsvg-view
+ruby
+ruby-devel
+sane-backends-devel
+scons
+speex-devel
+sqlite3-devel
+subversion-devel
+sword-devel
+transfig
+udisks-devel
+udisks2-devel
+unixODBC-devel
+update-desktop-files
+utempter-devel
+valgrind
+wireless-tools
+wv2-devel
+xcb-proto-devel
+xscreensaver
+xscreensaver-data
+xscreensaver-data-extra
+xz-devel
+libaudio-devel
+mysql-devel
+libpth-devel
+alsa-lib-devel
+libvorbis-devel
+esound-devel
+libjack-devel
+libpulse-devel
+htdig
+libtag-devel
+libgpgme-devel
+libneon-devel
+libSDL-devel
+libmysqld-devel
+gamin-devel
+libpoppler-devel
+liblcms-devel
+gtk3-devel
+libffmpeg-devel
+mozilla-nspr-devel
+libpisock-devel
diff --git a/redhat/packages.pclos b/redhat/packages.pclos
index 51db3594c..95faec874 100644
--- a/redhat/packages.pclos
+++ b/redhat/packages.pclos
@@ -75,4 +75,82 @@ libfontenc-devel
 x11-font-util
 libconfig-devel
 xscreensaver-base
-
+libtheora-devel
+taglib-devel
+libcdda-devel
+libgstreamer0.10-devel
+libxxf86dga-devel
+libxine-devel
+liblame-devel
+gnokii-devel
+gpgme-devel
+flex
+libical-devel
+boost-devel
+rpm-devel
+perl-devel
+java-devel
+ruby-devel
+subversion-devel
+neon-devel
+libbinutils-devel
+gnutls-devel
+libgadu-devel
+lib64iw29-devel
+valgrind
+openslp-devel
+libv4l-devel
+SDL-devel
+xscreensaver-extrusion
+xscreensaver-gl
+ocaml
+gphoto2-devel
+libpaper-devel
+libt1lib-devel
+lib64sane1-devel
+lib64poppler-devel
+fribidi-devel
+net-snmp-devel
+lib64exiv2-devel
+transfig
+djvulibre
+librsvg
+libwmf-devel
+libgpod-devel
+libmtp-devel
+libmusicbrainz-devel
+libnjb-devel
+libvisual-devel
+libtunepimp-devel
+lib64inotifytools-devel
+libmp4v2-devel
+sword-devel
+gtk+3.0-devel
+lib64mpcdec-devel
+lib64dvdread-devel
+libflac++-devel
+libffmpeg-devel
+lib64xaw-devel
+libofx-devel
+libOpenSP5-devel
+ImageMagick-devel
+doxygen
+lib64readline-devel
+GraphicsMagick-devel
+libpqxx-devel
+libwpd-devel
+lib64wv2-devel
+lib64openjpeg-devel
+libotr-devel
+pilot-link-devel
+scons
+libxcb-devel
+libxcb-xlib-devel
+chrpath
+liblo-devel
+dssi-devel
+liblrdf-devel
+lirc-devel
+NetworkManager-glib-devel
+lib64yaz-devel
+yaz