summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
Diffstat (limited to 'redhat')
-rw-r--r--redhat/applications/amarok/amarok-3.5.13.2.spec4
-rw-r--r--redhat/applications/bibletime/bibletime-3.5.13.2.spec12
-rw-r--r--redhat/applications/k3b/k3b-3.5.13.2.spec3
-rw-r--r--redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch11
-rw-r--r--redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec6
-rw-r--r--redhat/applications/kaffeine/kaffeine-3.5.13.2.spec16
-rw-r--r--redhat/applications/kcmautostart/kcmautostart-3.5.13-ftbfs.patch2
-rw-r--r--redhat/applications/kmplayer/kmplayer-3.5.13.2.spec4
-rw-r--r--redhat/applications/kmymoney/kmymoney-3.5.13.2.spec12
-rw-r--r--redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec3
-rw-r--r--redhat/applications/kvirc/kvirc-3.5.13.2.spec2
-rw-r--r--redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec2
-rw-r--r--redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec26
-rw-r--r--redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec13
-rw-r--r--redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch56
-rw-r--r--redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec16
-rw-r--r--redhat/tdeaccessibility/tdeaccessibility-3.5.13.2.spec23
-rw-r--r--redhat/tdeartwork/tdeartwork-3.5.13.2.spec62
-rw-r--r--redhat/tdebase/tdebase-3.5.13.2.spec98
-rw-r--r--redhat/tdebindings/tdebindings-3.5.13.2.spec62
-rw-r--r--redhat/tdegraphics/tdegraphics-3.5.13.2.spec54
-rw-r--r--redhat/tdelibs/tdelibs-3.5.13.2.spec4
-rw-r--r--redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec4
-rw-r--r--redhat/tdepim/tdepim-3.5.13.2.spec62
24 files changed, 389 insertions, 168 deletions
diff --git a/redhat/applications/amarok/amarok-3.5.13.2.spec b/redhat/applications/amarok/amarok-3.5.13.2.spec
index c2395dd2c..58764c6de 100644
--- a/redhat/applications/amarok/amarok-3.5.13.2.spec
+++ b/redhat/applications/amarok/amarok-3.5.13.2.spec
@@ -147,8 +147,12 @@ BuildRequires: %{_lib}inotifytools-devel
%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}
+BuildRequires: %{_lib}xine-devel
+%else
BuildRequires: %{_lib}xine1.2-devel
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
%endif
diff --git a/redhat/applications/bibletime/bibletime-3.5.13.2.spec b/redhat/applications/bibletime/bibletime-3.5.13.2.spec
index 95521dbc6..9a1848430 100644
--- a/redhat/applications/bibletime/bibletime-3.5.13.2.spec
+++ b/redhat/applications/bibletime/bibletime-3.5.13.2.spec
@@ -40,6 +40,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch0: bibletime-14.0.0-ftbfs.patch
+
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -75,6 +77,7 @@ texts, write own notes, save, print etc.).
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch0 -p1 -b .ftbfs
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -85,6 +88,7 @@ texts, write own notes, save, print etc.).
unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%configure \
--prefix=%{tde_prefix} \
@@ -99,13 +103,17 @@ export PATH="%{tde_bindir}:${PATH}"
--enable-new-ldflags \
--enable-final \
--enable-closure \
- --enable-rpath
+ --enable-rpath \
+ \
+%if 0%{?fedora} >= 20 || 0%{?pclinuxos}
+ --with-sword-dir=%{tde_prefix}
+%endif
# Not SMP safe !
%__make -C bibletime/frontend
# SMP safe !
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
diff --git a/redhat/applications/k3b/k3b-3.5.13.2.spec b/redhat/applications/k3b/k3b-3.5.13.2.spec
index 9b1a81056..052511e2a 100644
--- a/redhat/applications/k3b/k3b-3.5.13.2.spec
+++ b/redhat/applications/k3b/k3b-3.5.13.2.spec
@@ -402,7 +402,8 @@ and a generic audio and video file converter.
%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}"
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch
new file mode 100644
index 000000000..e4a255dce
--- /dev/null
+++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch
@@ -0,0 +1,11 @@
+--- trinity-kaffeine-mozilla-3.5.13.2/admin/cvs.sh.ORI 2014-03-23 11:29:59.873837637 +0100
++++ trinity-kaffeine-mozilla-3.5.13.2/admin/cvs.sh 2014-03-23 11:30:39.942924217 +0100
+@@ -130,7 +130,7 @@
+ fi
+
+ echo "*** Creating Makefile templates"
+-$AUTOMAKE || exit 1
++$AUTOMAKE --add-missing || exit 1
+
+ if test "$UNSERMAKE" = no; then
+ echo "*** Postprocessing Makefile templates"
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
index e1e3ded56..21fc166b0 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
+++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
@@ -43,6 +43,8 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
# Fix 'nspr' includes location
Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch
+# Fix build with newer automake
+Patch2: kaffeine-mozilla-3.5.13.2-fix_automake.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
@@ -78,6 +80,7 @@ when a page containing a supported media format is loaded.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .nspr
+%patch2 -p1 -b .automake
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh"
@@ -85,7 +88,8 @@ when a page containing a supported media format is loaded.
%build
-unset QTDIR; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
%configure \
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
index 79a14f4df..7b9b2f2e5 100644
--- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
@@ -62,10 +62,16 @@ BuildRequires: libcdio-paranoia-devel
# X11 stuff
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xext-devel
+BuildRequires: %{_lib}xtst-devel
+BuildRequires: %{_lib}xinerama-devel
+%else
BuildRequires: %{_lib}xext%{?mgaversion:6}-devel
BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel
BuildRequires: %{_lib}xinerama%{?mgaversion:1}-devel
%endif
+%endif
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
%endif
@@ -102,8 +108,12 @@ 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}
+BuildRequires: %{_lib}xine-devel
+%else
BuildRequires: %{_lib}xine1.2-devel
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
%endif
@@ -121,8 +131,10 @@ BuildRequires: lame-devel
# WTF support
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos} == 0
BuildRequires: kernel-headers
%endif
+%endif
%if 0%{?rhel} >= 5 || 0%{?fedora}
BuildRequires: glibc-kernheaders
%endif
@@ -214,11 +226,11 @@ Requires: %{name} = %{version}-%{release}
##########
-
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
+##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -227,6 +239,7 @@ Requires: %{name} = %{version}-%{release}
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
+
%build
unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
@@ -273,6 +286,7 @@ export PATH="%{tde_bindir}:${PATH}"
rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
rm -f $RPM_BUILD_ROOT%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
+
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13-ftbfs.patch b/redhat/applications/kcmautostart/kcmautostart-3.5.13-ftbfs.patch
index 282538a90..0807b3a9b 100644
--- a/redhat/applications/kcmautostart/kcmautostart-3.5.13-ftbfs.patch
+++ b/redhat/applications/kcmautostart/kcmautostart-3.5.13-ftbfs.patch
@@ -32,7 +32,7 @@
exit 1
;;
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12*)
-+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12* | automake*1.13*)
++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]* )
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
index 9cd8ffe9b..a919c6023 100644
--- a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
+++ b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
@@ -78,8 +78,12 @@ BuildRequires: gstreamer-0_10-plugins-base-devel
%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}
+BuildRequires: %{_lib}xine-devel
+%else
BuildRequires: %{_lib}xine1.2-devel
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
%endif
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
index a7ccc0a4d..acb5a1905 100644
--- a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
+++ b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
@@ -80,7 +80,11 @@ BuildRequires: libofx-devel
# OPENSP support
%if 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?mdkversion}
%if 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}osp-devel
+%else
BuildRequires: %{_lib}OpenSP5-devel
+%endif
%else
BuildRequires: opensp-devel
%endif
@@ -92,7 +96,7 @@ BuildRequires: opensp-devel
BuildRequires: openjade-devel
%endif
-Requires: %{name}-common == %{version}
+Requires: %{name}-common == %{version}-%{release}
%description
KMyMoney is the Personal Finance Manager for TDE. It operates similar to
@@ -142,7 +146,8 @@ This package contains development files needed for KMyMoney 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}"
export KDEDIR="%{tde_prefix}"
@@ -183,7 +188,8 @@ grep -v "^#~" po/it.po >/tmp/it.po && mv -f /tmp/it.po po/it.po
# Fix FTBFS inside sqlite3 archive
patch -p1 < %{PATCH4}
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
+
%install
export PATH="%{tde_bindir}:${PATH}"
diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec b/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec
index 5e54222d0..03a9332dc 100644
--- a/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec
+++ b/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec
@@ -70,7 +70,8 @@ you with managing/ripping your preferred streams.
-e "s|include/kde|include/tde|g"
%build
-unset QTDIR; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
scons -Q -j4 \
diff --git a/redhat/applications/kvirc/kvirc-3.5.13.2.spec b/redhat/applications/kvirc/kvirc-3.5.13.2.spec
index c285b9265..36374f071 100644
--- a/redhat/applications/kvirc/kvirc-3.5.13.2.spec
+++ b/redhat/applications/kvirc/kvirc-3.5.13.2.spec
@@ -105,7 +105,7 @@ with the K Desktop Environment version 3.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1
+#patch0 -p1
%patch1 -p1
%patch2 -p1 -b .installdir
diff --git a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec
index e086535d3..3202747e0 100644
--- a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec
+++ b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec
@@ -260,7 +260,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .mountconfig
+#patch1 -p1 -b .mountconfig
%if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion}
%__sed -i "userconfig/unixauthdb.py" \
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 98fcf9277..fa69466f0 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
@@ -24,9 +24,6 @@ Source0: trinity-3.5.13-fedora.repo
Source1: trinity-3.5.13-rhel.repo
Source2: RPM-GPG-KEY-trinity
-Source11: pclinuxos201304-32.jpg
-Source12: pclinuxos201304-64.jpg
-
Requires: trinity-tdeaccessibility >= %{version}
Requires: trinity-tdeaddons >= %{version}
Requires: trinity-tdeadmin >= %{version}
@@ -165,7 +162,9 @@ 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
@@ -301,22 +300,6 @@ Requires(pre): coreutils
##########
-%if 0%{?pclinuxos}
-%package -n trinity-wallpaper-theme-default
-Group: User Interface/Desktops
-Summary: Default wallpaper for Trinity
-
-%description -n trinity-wallpaper-theme-default
-%{summary}
-
-%files -n trinity-wallpaper-theme-default
-%defattr(-,root,root,-)
-%{tde_datadir}/wallpapers/pclinuxos32.jpg
-%{tde_datadir}/wallpapers/pclinuxos64.jpg
-%endif
-
-##########
-
%prep
%build
@@ -350,11 +333,6 @@ Summary: Default wallpaper for Trinity
%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-trinity"
%endif
-# PCLinuxOS wallpaper
-%if 0%{?pclinuxos} == 2013
-%__install -D -m 644 "%{SOURCE11}" "%{?buildroot}%{tde_datadir}/wallpapers/pclinuxos32.jpg"
-%__install -D -m 644 "%{SOURCE12}" "%{?buildroot}%{tde_datadir}/wallpapers/pclinuxos64.jpg"
-%endif
%changelog
* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
index 3dbfa02d8..16c1ca7c4 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
@@ -79,7 +79,9 @@ BuildRequires: xmedcon-devel
%define with_svg 1
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: librsvg2
-BuildRequires: librsvg2-devel
+%endif
+%if 0%{?fedora}
+BuildRequires: librsvg2-tools
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: librsvg
@@ -156,13 +158,20 @@ Tools for KSquirrel.
%patch0 -p1 -b .netpbm
%patch1 -p1 -b .giflib5
+# FIXME: under PCLinuxOS, headers are under 'freetype2' not 'freetype'
+if [ -r /usr/include/freetype2/ftbitmap.h ]; then
+ %__sed -i "configure.ac" -e "s|freetype/ftbitmap.h|freetype2/ftbitmap.h|"
+ %__sed -i "kernel/kls_ttf/ttf2pnm.cpp" -e "s|freetype/config/|freetype2/config/|"
+fi
+
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
-unset QTDIR; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch
new file mode 100644
index 000000000..fb41680f1
--- /dev/null
+++ b/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch
@@ -0,0 +1,56 @@
+--- trinity-python-trinity-3.5.13.2/sip/kdecore/kconfigbase.sip.ORI 2014-03-22 23:47:29.217935267 +0100
++++ trinity-python-trinity-3.5.13.2/sip/kdecore/kconfigbase.sip 2014-03-22 23:47:53.355370778 +0100
+@@ -153,10 +153,8 @@
+ bool deleteGroup (const QString&, bool = 1, bool = 0);
+ void setDollarExpansion (bool = 1);
+ bool isDollarExpansion () const;
+- virtual void rollback (bool = 1);
+ virtual void sync ();
+ bool isDirty () const;
+- virtual void setReadOnly (bool);
+ bool isReadOnly () const;
+ bool hasKey (const QString&) const;
+ virtual QMap<QString,QString> entryMap (const QString&) const = 0;
+@@ -182,6 +180,9 @@
+ bool hasDefault (const QString&) const;
+ %End
+
++private:
++ virtual void rollback (bool = 1);
++ virtual void setReadOnly (bool);
+
+ protected:
+ void setLocale ();
+--- trinity-python-trinity-3.5.13.2/sip/kdeui/kactivelabel.sip.ORI 2014-03-22 23:56:28.448338190 +0100
++++ trinity-python-trinity-3.5.13.2/sip/kdeui/kactivelabel.sip 2014-03-22 23:58:44.540121011 +0100
+@@ -53,6 +53,8 @@
+ virtual void keyPressEvent (QKeyEvent*);
+ %End
+
++private:
++ virtual void setSource(const QString&);
+
+ }; // class KActiveLabel
+
+--- trinity-python-trinity-3.5.13.2/sip/kdeui/kpixmapregionselectorwidget.sip.ORI 2014-03-23 00:02:17.343077605 +0100
++++ trinity-python-trinity-3.5.13.2/sip/kdeui/kpixmapregionselectorwidget.sip 2014-03-23 00:03:42.151069824 +0100
+@@ -54,6 +54,8 @@
+ protected:
+ virtual KPopupMenu* createPopupMenu ();
+
++private:
++ virtual bool eventFilter(QObject*, QEvent*);
+ }; // class KPixmapRegionSelectorWidget
+
+ %End
+--- trinity-python-trinity-3.5.13.2/sip/kfile/knotifydialog.sip.ORI 2014-03-23 00:13:21.583382771 +0100
++++ trinity-python-trinity-3.5.13.2/sip/kfile/knotifydialog.sip 2014-03-23 00:17:02.715146838 +0100
+@@ -77,6 +77,8 @@
+ virtual void addApplicationEvents (const QString&);
+ virtual void clearApplicationEvents ();
+
++private slots:
++ virtual void slotDefault();
+ }; // class KNotifyDialog
+
+ %End
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec
index 3dc55c64d..ee6f31361 100644
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec
+++ b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec
@@ -45,6 +45,8 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
# Fix include subdirectory 'tde' instead of 'kde'
Patch1: python-trinity-3.5.13.2-fix_tde_includedir.patch
+# Fix "is private" FTBFS using SIP >= 4.15
+Patch2: python-trinity-3.5.13.2-fix_is_private.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
@@ -116,10 +118,12 @@ tips and working code you can use to learn from.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .inc
+%patch2 -p1 -b .private
%build
-unset QTDIR; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LD_RUN_PATH="%{tde_libdir}"
export KDEDIR=%{tde_prefix}
@@ -139,7 +143,15 @@ export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
-e "/^LIBS = / s|$| -lpython2.7 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|"
%endif
-%__make %{_smp_mflags}
+# Shitty hack to fix issue with SIP >= 4.15
+%__sed -i "kfile/sipkfilepart0.cpp" \
+ -e "s| KFileIconView::selectionMode(| KFileView::selectionMode(|g" \
+ -e "s| KFileIconView::clear()| KFileView::clear()|g" \
+ -e "s| KFileDetailView::selectionMode(| KFileView::selectionMode(|g" \
+ -e "s| KFileDetailView::clear()| KFileView::clear()|g"
+
+
+%__make %{_smp_mflags} || %__make
%install
diff --git a/redhat/tdeaccessibility/tdeaccessibility-3.5.13.2.spec b/redhat/tdeaccessibility/tdeaccessibility-3.5.13.2.spec
index dac3ffdfa..3f28a0b96 100644
--- a/redhat/tdeaccessibility/tdeaccessibility-3.5.13.2.spec
+++ b/redhat/tdeaccessibility/tdeaccessibility-3.5.13.2.spec
@@ -61,12 +61,19 @@ BuildRequires: %{_lib}xcb-devel
%endif
%endif
+# X11 stuff
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xi-devel
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xext-devel
+BuildRequires: %{_lib}x11-devel
+BuildRequires: %{_lib}xau-devel
+%else
BuildRequires: %{_lib}xext%{?mgaversion:6}-devel
BuildRequires: %{_lib}x11%{?mgaversion:_6}-devel
BuildRequires: %{_lib}xau%{?mgaversion:6}-devel
%endif
+%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
BuildRequires: libXi-devel
BuildRequires: libXext-devel
@@ -102,16 +109,19 @@ Included with this package are:
##########
-%package -n trinity-kde-icons-mono
+%package -n trinity-tde-icons-mono
Summary: A monochromatic icons theme for TDE
Group: User Interface/Desktops
-%description -n trinity-kde-icons-mono
+Obsoletes: trinity-kde-icons-mono < %{version}-%{release}
+Provides: trinity-kde-icons-mono = %{version}-%{release}
+
+%description -n trinity-tde-icons-mono
A monochromatic icon theme for TDE, designed for accessibility purposes.
This package is part of Trinity, as a component of the TDE accessibility module.
-%files -n trinity-kde-icons-mono
+%files -n trinity-tde-icons-mono
%defattr(-,root,root,-)
%{tde_datadir}/icons/mono/index.theme
%{tde_datadir}/icons/mono/scalable/*/*.svgz
@@ -141,7 +151,7 @@ Summary: A screen magnifier for TDE
Group: User Interface/Desktops
%description -n trinity-kmag
-KDE's screen magnifier tool.
+TDE's screen magnifier tool.
You can use KMagnifier to magnify a part of the screen just as you would use
a lens to magnify a newspaper fine-print or a photograph. This application is
@@ -451,7 +461,8 @@ Provides: trinity-kdeaccessibility-devel = %{version}-%{release}
%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"
@@ -462,7 +473,7 @@ export KDEDIR=%{tde_prefix}
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
%configure \
diff --git a/redhat/tdeartwork/tdeartwork-3.5.13.2.spec b/redhat/tdeartwork/tdeartwork-3.5.13.2.spec
index c56410ecd..6513a8bfe 100644
--- a/redhat/tdeartwork/tdeartwork-3.5.13.2.spec
+++ b/redhat/tdeartwork/tdeartwork-3.5.13.2.spec
@@ -67,7 +67,11 @@ BuildRequires: libart_lgpl-devel
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xscrnsaver-devel
+%else
BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
+%endif
BuildRequires: xscreensaver
BuildRequires: xscreensaver-base
BuildRequires: xscreensaver-extrusion
@@ -114,13 +118,13 @@ Requires: %{name}-style = %{version}-%{release}
Requires: %{name}-theme-icon = %{version}-%{release}
Requires: %{name}-theme-window = %{version}-%{release}
Requires: trinity-tdewallpapers = %{version}-%{release}
-Requires: trinity-kscreensaver = %{version}-%{release}
+Requires: trinity-tdescreensaver = %{version}-%{release}
%if 0%{?with_xscreensaver}
-Requires: trinity-kscreensaver-xsavers = %{version}-%{release}
-Requires: trinity-kscreensaver-xsavers-extra = %{version}-%{release}
+Requires: trinity-tdescreensaver-xsavers = %{version}-%{release}
+Requires: trinity-tdescreensaver-xsavers-extra = %{version}-%{release}
%if 0%{?with_webcollage}
-Requires: trinity-kscreensaver-xsavers-webcollage = %{version}-%{release}
+Requires: trinity-tdescreensaver-xsavers-webcollage = %{version}-%{release}
%endif
%endif
@@ -265,22 +269,25 @@ This package is part of Trinity, and a component of the TDE artwork module.
##########
-%package -n trinity-kscreensaver
+%package -n trinity-tdescreensaver
Summary: additional screen savers released with Trinity
Group: User Interface/Desktops
-%description -n trinity-kscreensaver
+Obsoletes: trinity-kscreensaver < %{version}-%{release}
+Provides: trinity-kscreensaver = %{version}-%{release}
+
+%description -n trinity-tdescreensaver
This package contains the screen savers for Trinity. They can be tested and
selected within the Appearance and Themes section of the Trinity Control
Center.
The hooks for the standard xscreensavers are no longer part of this
package. To select and/or configure the standard xscreensavers through
-the TDE Control Center, install the separate package kscreensaver-xsavers.
+the TDE Control Center, install the separate package tdescreensaver-xsavers.
This package is part of Trinity, and a component of the TDE artwork module.
-%files -n trinity-kscreensaver
+%files -n trinity-tdescreensaver
%defattr(-,root,root,-)
%{tde_bindir}/kslideshow.kss
%{tde_bindir}/kpolygon.kss
@@ -334,13 +341,16 @@ This package is part of Trinity, and a component of the TDE artwork module.
%if 0%{?with_xscreensaver}
-%package -n trinity-kscreensaver-xsavers
+%package -n trinity-tdescreensaver-xsavers
Summary: Trinity hooks for standard xscreensavers
Group: User Interface/Desktops
Requires: trinity-tdebase-bin >= %{tde_version}
Requires: xscreensaver
-%description -n trinity-kscreensaver-xsavers
+Obsoletes: trinity-kscreensaver-xsavers < %{version}-%{release}
+Provides: trinity-kscreensaver-xsavers = %{version}-%{release}
+
+%description -n trinity-tdescreensaver-xsavers
This package allows a smooth integration of the standard xscreensavers
into Trinity. With this package installed you can select and/or configure
the standard xscreensavers through the Appearances and Themes section of
@@ -348,13 +358,13 @@ the Trinity Control Centre.
Note that this package does not actually contain any screensavers itself.
For the additional screensavers shipped with Trinity, see the separate package
-kscreensaver-trinity. This package does depend on the xscreensaver package, and
+tdescreensaver-trinity. This package does depend on the xscreensaver package, and
recommend the xscreensaver-gl package, as well as contain the necessary
files to integrate these packages into Trinity.
This package is part of Trinity, and a component of the TDE artwork module.
-%files -n trinity-kscreensaver-xsavers
+%files -n trinity-tdescreensaver-xsavers
%defattr(-,root,root,-)
%{tde_bindir}/xscreensaver-getimage-file
%{tde_bindir}/xscreensaver-getimage
@@ -435,13 +445,16 @@ This package is part of Trinity, and a component of the TDE artwork module.
%if 0%{?with_webcollage}
-%package -n trinity-kscreensaver-xsavers-webcollage
+%package -n trinity-tdescreensaver-xsavers-webcollage
Summary: webcollage screensaver Trinity hook
Group: User Interface/Desktops
-Requires: trinity-kscreensaver-xsavers-extra = %{version}-%{release}
+Requires: trinity-tdescreensaver-xsavers-extra = %{version}-%{release}
Requires: netpbm
-%description -n trinity-kscreensaver-xsavers-webcollage
+Obsoletes: trinity-kscreensaver-xsavers-webcollage < %{version}-%{release}
+Provides: trinity-kscreensaver-xsavers-webcollage = %{version}-%{release}
+
+%description -n trinity-tdescreensaver-xsavers-webcollage
This package give access to the webcollage screensaver through the Trinity
screensaver configuration.
@@ -459,7 +472,7 @@ installation.
This package is part of Trinity, and a component of the TDE artwork module.
-%files -n trinity-kscreensaver-xsavers-webcollage
+%files -n trinity-tdescreensaver-xsavers-webcollage
%defattr(-,root,root,-)
%{tde_datadir}/applnk/System/ScreenSavers/webcollage.desktop
@@ -467,12 +480,15 @@ This package is part of Trinity, and a component of the TDE artwork module.
##########
-%package -n trinity-kscreensaver-xsavers-extra
+%package -n trinity-tdescreensaver-xsavers-extra
Summary: Trinity hooks for standard xscreensavers
Group: User Interface/Desktops
-Requires: trinity-kscreensaver-xsavers = %{version}-%{release}
+Requires: trinity-tdescreensaver-xsavers = %{version}-%{release}
+
+Obsoletes: trinity-kscreensaver-xsavers-extra < %{version}-%{release}
+Provides: trinity-kscreensaver-xsavers-extra = %{version}-%{release}
-%description -n trinity-kscreensaver-xsavers-extra
+%description -n trinity-tdescreensaver-xsavers-extra
This package allows a smooth integration of the universe xscreensavers
into Trinity. With this package installed you can select and/or configure
the universe xscreensavers through the Appearances and Themes section of
@@ -480,11 +496,11 @@ the Trinity Control Centre.
Note that this package does not actually contain any screensavers itself.
For the additional screensavers shipped with TDE, see the separate package
-kscreensaver.
+tdescreensaver.
This package is part of Trinity, and a component of the TDE artwork module.
-%files -n trinity-kscreensaver-xsavers-extra
+%files -n trinity-tdescreensaver-xsavers-extra
%defattr(-,root,root,-)
%{tde_datadir}/applnk/System/ScreenSavers/anemone.desktop
%{tde_datadir}/applnk/System/ScreenSavers/anemotaxis.desktop
@@ -644,14 +660,14 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
%endif
-%if 0%{?fedora} >= 18 || 0%{?pclinuxos}
+%if 0%{?fedora} >= 18 || 0%{?pclinuxos} || 0%{?mgaversion} >= 4
%{tde_datadir}/applnk/System/ScreenSavers/hexadrop.desktop
%{tde_datadir}/applnk/System/ScreenSavers/kaleidocycle.desktop
%{tde_datadir}/applnk/System/ScreenSavers/quasicrystal.desktop
%{tde_datadir}/applnk/System/ScreenSavers/unknownpleasures.desktop
%endif
-%if 0%{?fedora} >= 20
+%if 0%{?fedora} >= 20 || 0%{?mgaversion} >= 4
%{tde_datadir}/applnk/System/ScreenSavers/geodesic.desktop
%endif
diff --git a/redhat/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec
index cf1cb3cfa..e8167a10b 100644
--- a/redhat/tdebase/tdebase-3.5.13.2.spec
+++ b/redhat/tdebase/tdebase-3.5.13.2.spec
@@ -254,6 +254,17 @@ Requires: indexhtml
%define tde_aboutpage /usr/share/mga/about/index.html
%endif
+# Mageia 4 Theme
+%if 0%{?mgaversion} == 4
+Requires: mageia-theme-Default
+%define tde_bg /usr/share/mga/backgrounds/default.jpg
+%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
+
+Requires: indexhtml
+%define tde_aboutlabel Mageia 4
+%define tde_aboutpage /usr/share/mga/about/index.html
+%endif
+
# Mandriva 2011 Theme: "rosa"
%if "%{distribution}" == "Mandriva Linux" && "%{?mdkversion}" == "201100"
Requires: mandriva-theme
@@ -265,31 +276,13 @@ Requires: indexhtml
%define tde_aboutpage /usr/share/mdk/about/index.html
%endif
-# PCLINUXOS 2012
-%if "%{?pclinuxos}" == "2012"
-Requires: trinity-wallpaper-theme-default
-%define tde_bg %{tde_datadir}/wallpapers/Pulse2012/contents/images/1600x1200.jpg
-Requires: desktop-common-data
-%define tde_starticon /usr/share/icons/pclinuxos.png
-
-Requires: indexhtml
-%define tde_aboutlabel PCLinuxOS 2012
-%define tde_aboutpage /usr/share/mdk/about/index.html
-%endif
-
-# PCLINUXOS 2013
-%if "%{?pclinuxos}" == "2013"
-Requires: trinity-wallpaper-theme-default
-%if "%{_lib}" == "lib64"
-%define tde_bg %{tde_datadir}/wallpapers/pclinuxos64.jpg
-%else
-%define tde_bg %{tde_datadir}/wallpapers/pclinuxos32.jpg
-%endif
+# PCLINUXOS
+%if 0%{?pclinuxos}
Requires: desktop-common-data
%define tde_starticon /usr/share/icons/pclinuxos.png
Requires: indexhtml
-%define tde_aboutlabel PCLinuxOS 2013
+%define tde_aboutlabel PCLinuxOS
%define tde_aboutpage /usr/share/mdk/about/index.html
%endif
@@ -355,7 +348,12 @@ BuildRequires: glib2-devel
BuildRequires: pcre-devel
# SASL support
+%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
+BuildRequires: %{_lib}sasl2-devel
+%endif
+%if 0%{?suse_version}
BuildRequires: cyrus-sasl-devel
+%endif
# LIBUSB support
BuildRequires: pam-devel
@@ -429,8 +427,12 @@ BuildRequires: xorg-x11-proto-devel
BuildRequires: gnome-screensaver
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xscrnsaver-devel
+%else
BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
BuildRequires: xscreensaver
BuildRequires: libXScrnSaver-devel
@@ -515,7 +517,51 @@ BuildRequires: xorg-x11-libxkbfile-devel
BuildRequires: libxkbfile-devel
%endif
-# X11 stuff ...
+# XDMCP support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xdmcp-devel
+%else
+BuildRequires: %{_lib}xdmcp%{?mgaversion:6}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires: libXdmcp-devel
+%endif
+
+# XTST support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xtst-devel
+%else
+BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires: libXtst-devel
+%endif
+
+# XDAMAGE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}xdamage-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires: libXdamage-devel
+%endif
+
+# XCOMPOSITE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xcomposite-devel
+%else
+BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel
+%endif
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
+BuildRequires: libXcomposite-devel
+%endif
+
+# Other X11 stuff ...
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
%endif
@@ -529,19 +575,11 @@ BuildRequires: libfontenc-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel
-BuildRequires: %{_lib}xdamage-devel
-BuildRequires: %{_lib}xdmcp%{?mgaversion:6}-devel
-BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel
BuildRequires: x11-font-util
BuildRequires: x11-proto-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
-BuildRequires: libXcomposite-devel
-BuildRequires: libXdamage-devel
-BuildRequires: libXdmcp-devel
-BuildRequires: libXtst-devel
BuildRequires: xorg-x11-proto-devel
%endif
diff --git a/redhat/tdebindings/tdebindings-3.5.13.2.spec b/redhat/tdebindings/tdebindings-3.5.13.2.spec
index cb0d0fb6b..ff0c96d59 100644
--- a/redhat/tdebindings/tdebindings-3.5.13.2.spec
+++ b/redhat/tdebindings/tdebindings-3.5.13.2.spec
@@ -93,7 +93,7 @@ BuildRequires: gtk2-devel
# XULRUNNER support
%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
-BuildRequires: xulrunner-devel
+#BuildRequires: xulrunner-devel
%endif
%if 0%{?suse_version} == 1140
BuildRequires: mozilla-xulrunner20-devel
@@ -200,7 +200,7 @@ Provides: trinity-kdebindings = %{version}-%{release}
# Metapackage requires
Requires: trinity-tdebindings-java = %{version}-%{release}
Requires: trinity-libsmokeqt1 = %{version}-%{release}
-Requires: trinity-libsmokekde1 = %{version}-%{release}
+Requires: trinity-libsmoketde = %{version}-%{release}
Requires: trinity-perl-dcop = %{version}-%{release}
Requires: trinity-python-dcop = %{version}-%{release}
Requires: trinity-libkjsembed1 = %{version}-%{release}
@@ -254,7 +254,7 @@ This package is part of the official TDE bindings module.
%files -n trinity-libdcop3-java
%defattr(-,root,root,-)
#%{tde_datadir}/java/dcopjava*.jar
-%{tde_libdir}/java/org/kde/DCOP/*.class
+%{tde_libdir}/java/org/*/DCOP/*.class
##########
@@ -474,35 +474,41 @@ This package is part of the official TDE bindings module.
##########
-%package -n trinity-libsmokekde1
+%package -n trinity-libsmoketde
Summary: SMOKE Binding Library to TDE
Group: Environment/Libraries
-%description -n trinity-libsmokekde1
+Obsoletes: trinity-libsmokekde1 < %{version}-%{release}
+Provides: trinity-libsmokekde1 = %{version}-%{release}
+
+%description -n trinity-libsmoketde
The "Scripting Meta Object Kompiler Engine" library is used by
various TDE language bindings packages to provide interfaces to the
TDE libraries.
This package is part of the official TDE bindings module.
-%files -n trinity-libsmokekde1
+%files -n trinity-libsmoketde
%defattr(-,root,root,-)
%{tde_libdir}/libsmokekde.so.*
-%post -n trinity-libsmokekde1
+%post -n trinity-libsmoketde
/sbin/ldconfig || :
-%postun -n trinity-libsmokekde1
+%postun -n trinity-libsmoketde
/sbin/ldconfig || :
##########
-%package -n trinity-libsmokekde-devel
+%package -n trinity-libsmoketde-devel
Summary: SMOKE Binding Library to TDE - Development Files
Group: Development/Libraries
-Requires: trinity-libsmokekde1 = %{version}-%{release}
+Requires: trinity-libsmoketde = %{version}-%{release}
+
+Obsoletes: trinity-libsmokekde-devel < %{version}-%{release}
+Provides: trinity-libsmokekde-devel = %{version}-%{release}
-%description -n trinity-libsmokekde-devel
+%description -n trinity-libsmoketde-devel
The "Scripting Meta Object Kompiler Engine" library is used by
various TDE language bindings packages to provide interfaces to the
Qt and TDE libraries. This package contains the development files for
@@ -513,15 +519,15 @@ package.
This package is part of the official TDE bindings module.
-%files -n trinity-libsmokekde-devel
+%files -n trinity-libsmoketde-devel
%defattr(-,root,root,-)
%{tde_libdir}/libsmokekde.so
%{tde_libdir}/libsmokekde.la
-%post -n trinity-libsmokekde-devel
+%post -n trinity-libsmoketde-devel
/sbin/ldconfig || :
-%postun -n trinity-libsmokekde-devel
+%postun -n trinity-libsmoketde-devel
/sbin/ldconfig || :
##########
@@ -834,22 +840,25 @@ Group: Environment/Libraries
##########
-%package -n trinity-libkdexparts1
-Summary: Xparts library for KDE
+%package -n trinity-libtdexparts
+Summary: Xparts library for TDE
Group: Environment/Libraries
-%description -n trinity-libkdexparts1
+Obsoletes: trinity-libkdexparts1 < %{version}-%{release}
+Provides: trinity-libkdexparts1 = %{version}-%{release}
+
+%description -n trinity-libtdexparts
%{summary}
-%files -n trinity-libkdexparts1
+%files -n trinity-libtdexparts
%defattr(-,root,root,-)
%{tde_libdir}/libkdexparts.so.*
%{tde_libdir}/libkdexparts.la
-%post -n trinity-libkdexparts1
+%post -n trinity-libtdexparts
/sbin/ldconfig || :
-%postun -n trinity-libkdexparts1
+%postun -n trinity-libtdexparts
/sbin/ldconfig || :
##########
@@ -860,7 +869,7 @@ Group: Development/Libraries
%if 0%{?with_gtk1}
Requires: trinity-libgtkxparts1 = %{version}-%{release}
%endif
-Requires: trinity-libkdexparts1 = %{version}-%{release}
+Requires: trinity-libtdexparts = %{version}-%{release}
%description -n trinity-libxparts-devel
%{summary}
@@ -890,7 +899,7 @@ Requires: trinity-xpart-notepad = %{version}-%{release}
%if 0%{?with_gtk1}
Requires: trinity-libgtkxparts1 = %{version}-%{release}
%endif
-Requires: trinity-libkdexparts1 = %{version}-%{release}
+Requires: trinity-libtdexparts = %{version}-%{release}
Requires: trinity-libdcop-c = %{version}-%{release}
%description xparts-extras
@@ -958,7 +967,7 @@ Provides: trinity-kdebindings-devel = %{version}-%{release}
# Metapackage
Requires: trinity-libsmokeqt-devel = %{version}-%{release}
Requires: trinity-libdcop3-java-devel = %{version}-%{release}
-Requires: trinity-libsmokekde-devel = %{version}-%{release}
+Requires: trinity-libsmoketde-devel = %{version}-%{release}
Requires: trinity-libkjsembed-devel = %{version}-%{release}
Requires: trinity-libxparts-devel = %{version}-%{release}
Requires: trinity-libdcop-c-devel = %{version}-%{release}
@@ -1014,9 +1023,14 @@ unset JAVA_HOME ||:
# sip/PyQt/PyKDE built separately, not here
export DO_NOT_COMPILE="$DO_NOT_COMPILE python"
+# Ruby headers, strange location ...
+if [ -d "/usr/include/%{_normalized_cpu}-linux" ]; then
+ export EXTRA_INCLUDES="/usr/include/%{_normalized_cpu}-linux"
+fi
+
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
if [ -d /usr/evolution28 ]; then
export PATH="/usr/evolution28/bin:${PATH}"
diff --git a/redhat/tdegraphics/tdegraphics-3.5.13.2.spec b/redhat/tdegraphics/tdegraphics-3.5.13.2.spec
index 9fc24e792..f75915f34 100644
--- a/redhat/tdegraphics/tdegraphics-3.5.13.2.spec
+++ b/redhat/tdegraphics/tdegraphics-3.5.13.2.spec
@@ -111,7 +111,11 @@ BuildRequires: %{_lib}xi-devel
# kgamma
BuildRequires: %{_lib}xxf86vm-devel
# ksvg
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xmu-devel
+%else
BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
+%endif
# kpovmodeler
BuildRequires: %{_lib}mesagl1-devel
BuildRequires: %{_lib}mesaglu1-devel
@@ -233,7 +237,7 @@ Requires: trinity-ksvg = %{version}-%{release}
Requires: trinity-kview = %{version}-%{release}
Requires: trinity-kviewshell = %{version}-%{release}
Requires: trinity-libkscan = %{version}-%{release}
-Requires: %{name}-libpoppler-tqt = %{version}-%{release}
+Requires: trinity-libpoppler-tqt = %{version}-%{release}
%description
Graphics applications for the Trinity Desktop Environment, including
@@ -599,14 +603,17 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
-%package -n trinity-kiconedit
+%package -n trinity-tdeiconedit
Summary: An icon editor for Trinity
Group: Applications/Graphics
-%description -n trinity-kiconedit
-KIconedit allows you easily to create and edit icons.
+Obsoletes: trinity-kiconedit < %{version}-%{release}
+Provides: trinity-kiconedit = %{version}-%{release}
+
+%description -n trinity-tdeiconedit
+TDEIconedit allows you easily to create and edit icons.
-%files -n trinity-kiconedit
+%files -n trinity-tdeiconedit
%defattr(-,root,root,-)
%{tde_bindir}/kiconedit
%{tde_tdeappdir}/kiconedit.desktop
@@ -614,14 +621,14 @@ KIconedit allows you easily to create and edit icons.
%{tde_datadir}/icons/hicolor/*/apps/kiconedit.png
%{tde_tdedocdir}/HTML/en/kiconedit/
-%post -n trinity-kiconedit
+%post -n trinity-tdeiconedit
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-%postun -n trinity-kiconedit
+%postun -n trinity-tdeiconedit
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
@@ -1125,38 +1132,44 @@ This package contains development files for Trinity's scanner library.
##########
-%package libpoppler-tqt
+%package -n trinity-libpoppler-tqt
Summary: TQt support for Poppler
Group: Environment/Libraries
+Obsoletes: poppler-tqt < %{version}-%{release}
Provides: poppler-tqt = %{version}-%{release}
+Obsoletes: %{name}-libpoppler-tqt < %{version}-%{release}
+Provides: %{name}-libpoppler-tqt = %{version}-%{release}
-%description libpoppler-tqt
+%description -n trinity-libpoppler-tqt
TQt support library for Poppler.
This library is used by the Trinity graphics file plugins for PDF support.
-%files libpoppler-tqt
+%files -n trinity-libpoppler-tqt
%defattr(-,root,root,-)
%{tde_libdir}/libpoppler-tqt.so.*
-%post libpoppler-tqt
+%post -n trinity-libpoppler-tqt
/sbin/ldconfig || :
-%postun libpoppler-tqt
+%postun -n trinity-libpoppler-tqt
/sbin/ldconfig || :
##########
-%package libpoppler-tqt-devel
+%package -n trinity-libpoppler-tqt-devel
Summary: Development files for TQt support for Poppler
Group: Development/Libraries
-Requires: %{name}-libpoppler-tqt
+Requires: trinity-libpoppler-tqt = %{version}-%{release}
+Obsoletes: poppler-tqt-devel < %{version}-%{release}
Provides: poppler-tqt-devel = %{version}-%{release}
+Obsoletes: %{name}-libpoppler-tqt-devel < %{version}-%{release}
+Provides: %{name}-libpoppler-tqt-devel = %{version}-%{release}
-%description libpoppler-tqt-devel
+%description -n trinity-libpoppler-tqt-devel
Development files of TQt support library for Poppler.
This package contains the development files needed to compile applications against poppler-tqt.
-%files libpoppler-tqt-devel
+%files -n trinity-libpoppler-tqt-devel
%defattr(-,root,root,-)
%{tde_tdeincludedir}/poppler-link-qt3.h
%{tde_tdeincludedir}/poppler-page-transition.h
@@ -1165,10 +1178,10 @@ This package contains the development files needed to compile applications again
%{tde_libdir}/libpoppler-tqt.so
%{tde_libdir}/pkgconfig/poppler-tqt.pc
-%post libpoppler-tqt-devel
+%post -n trinity-libpoppler-tqt-devel
/sbin/ldconfig || :
-%postun libpoppler-tqt-devel
+%postun -n trinity-libpoppler-tqt-devel
/sbin/ldconfig || :
##########
@@ -1182,7 +1195,7 @@ Provides: trinity-kdegraphics-devel = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires: trinity-libkscan-devel = %{version}-%{release}
-Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
+Requires: trinity-libpoppler-tqt-devel = %{version}-%{release}
%description devel
%{summary}.
@@ -1262,7 +1275,8 @@ Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
%endif
%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}"
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2.spec b/redhat/tdelibs/tdelibs-3.5.13.2.spec
index 016acd3e3..61d08bfe8 100644
--- a/redhat/tdelibs/tdelibs-3.5.13.2.spec
+++ b/redhat/tdelibs/tdelibs-3.5.13.2.spec
@@ -167,8 +167,12 @@ BuildRequires: libtool
# X11 support
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: x11-proto-devel
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xcomposite-devel
+%else
BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel
%endif
+%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
BuildRequires: xorg-x11-proto-devel
%endif
diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec b/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
index d5181f3a0..2f7ae3e4e 100644
--- a/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
+++ b/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
@@ -116,8 +116,12 @@ BuildRequires: gstreamer-0_10-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xxf86dga-devel
BuildRequires: %{_lib}xxf86vm-devel
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xtst-devel
+%else
BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel
%endif
+%endif
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
%endif
diff --git a/redhat/tdepim/tdepim-3.5.13.2.spec b/redhat/tdepim/tdepim-3.5.13.2.spec
index 7d83cd64f..193d5d800 100644
--- a/redhat/tdepim/tdepim-3.5.13.2.spec
+++ b/redhat/tdepim/tdepim-3.5.13.2.spec
@@ -85,8 +85,12 @@ BuildRequires: cyrus-sasl-devel
# XCOMPOSITE support
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xcomposite-devel
+%else
BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel
%endif
+%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
BuildRequires: libXcomposite-devel
%endif
@@ -100,8 +104,12 @@ BuildRequires: xorg-x11-proto-devel
BuildRequires: gnome-screensaver
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xscrnsaver-devel
+%else
BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
BuildRequires: libXScrnSaver-devel
%endif
@@ -114,7 +122,7 @@ BuildRequires: xscreensaver
Requires: trinity-libtdepim = %{version}-%{release}
Requires: %{name}-kfile-plugins = %{version}-%{release}
Requires: %{name}-tdeio-plugins = %{version}-%{release}
-Requires: %{name}-kresources = %{version}-%{release}
+Requires: %{name}-tderesources = %{version}-%{release}
Requires: %{name}-wizards = %{version}-%{release}
Requires: trinity-akregator = %{version}-%{release}
Requires: trinity-kaddressbook = %{version}-%{release}
@@ -189,7 +197,7 @@ Requires: trinity-libkpimidentities-devel = %{version}-%{release}
Requires: trinity-libksieve-devel = %{version}-%{release}
Requires: trinity-libktnef-devel = %{version}-%{release}
Requires: trinity-libmimelib-devel = %{version}-%{release}
-Requires: %{name}-kresources-devel = %{version}-%{release}
+Requires: %{name}-tderesources-devel = %{version}-%{release}
%description devel
This metapackage includes all development files for TDE PIM.
@@ -279,7 +287,7 @@ Requires: trinity-akregator = %{version}-%{release}
Summary: TDE addressbook application
Group: Applications/Communications
Requires: trinity-kdebase-pim-ioslaves
-Requires: %{name}-kresources = %{version}-%{release}
+Requires: %{name}-tderesources = %{version}-%{release}
%description -n trinity-kaddressbook
KAddressBook is the main address book application for TDE; it enables you
@@ -573,7 +581,7 @@ and mbox.
##########
-%package kresources
+%package tderesources
Summary: Trinity pim resource plugins
Group: Environment/Libraries
#Requires: trinity-kaddressbook = %{version}-%{release}
@@ -583,13 +591,15 @@ Requires: libcaldav
Requires: libcarddav
Obsoletes: tdepim-kresources < %{version}-%{release}
+Obsoletes: trinity-tdepim-kresources < %{version}-%{release}
+Provides: trinity-tdepim-kresources = %{version}-%{release}
-%description kresources
+%description tderesources
This package includes several plugins needed to interface with groupware
servers. It also includes plugins for features such as blogging and
tracking feature plans.
-%files kresources
+%files tderesources
%defattr(-,root,root,-)
%{tde_tdelibdir}/kcal_caldav.la
%{tde_tdelibdir}/kcal_caldav.so
@@ -685,27 +695,29 @@ tracking feature plans.
%{tde_tdelibdir}/kabc_xmlrpc.la
%{tde_tdelibdir}/kabc_xmlrpc.so
-%post kresources
+%post tderesources
/sbin/ldconfig || :
-%postun kresources
+%postun tderesources
/sbin/ldconfig || :
##########
-%package kresources-devel
-Summary: Development files for kresources
+%package tderesources-devel
+Summary: Development files for tderesources
Group: Development/Libraries
-Requires: %{name}-kresources = %{version}-%{release}
+Requires: %{name}-tderesources = %{version}-%{release}
Requires: libcaldav
Requires: libcarddav
-Obsoletes: tdepim-kresources-devel < %{version}-%{release}
+Obsoletes: tdepim-tderesources-devel < %{version}-%{release}
+Obsoletes: trinity-tdepim-kresources-devel < %{version}-%{release}
+Provides: trinity-tdepim-kresources-devel = %{version}-%{release}
-%description kresources-devel
+%description tderesources-devel
%{summary}
-%files kresources-devel
+%files tderesources-devel
%defattr(-,root,root,-)
%{tde_libdir}/libkslox.la
%{tde_libdir}/libkslox.so
@@ -757,10 +769,10 @@ Obsoletes: tdepim-kresources-devel < %{version}-%{release}
%{tde_libdir}/libknotesscalix.so
%{tde_tdeincludedir}/kpimprefs.h
-%post kresources-devel
+%post tderesources-devel
/sbin/ldconfig || :
-%postun kresources-devel
+%postun tderesources-devel
/sbin/ldconfig || :
##########
@@ -1125,7 +1137,7 @@ Requires: trinity-knode = %{version}-%{release}
%package -n trinity-knotes
Summary: Trinity sticky notes
Group: Applications/Utilities
-Requires: trinity-tdepim-kresources = %{version}-%{release}
+Requires: trinity-tdepim-tderesources = %{version}-%{release}
%description -n trinity-knotes
KNotes is a program that lets you write sticky notes. The notes are saved
@@ -1171,7 +1183,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
Summary: Development files for knots
Group: Development/Libraries
Requires: trinity-knotes = %{version}-%{release}
-Requires: %{name}-kresources-devel = %{version}-%{release}
+Requires: %{name}-tderesources-devel = %{version}-%{release}
%description -n trinity-knotes-devel
%{summary}
@@ -1370,7 +1382,7 @@ Summary: Trinity personal organizer
Group: Applications/Productivity
Requires: trinity-libkpimidentities = %{version}-%{release}
Requires: trinity-libkpimexchange = %{version}-%{release}
-Requires: %{name}-kresources = %{version}-%{release}
+Requires: %{name}-tderesources = %{version}-%{release}
Requires: perl
%description -n trinity-korganizer
@@ -1600,7 +1612,7 @@ library.
%package -n trinity-libkcal
Summary: Trinity calendaring library
Group: Environment/Libraries
-#Requires: %{name}-kresources = %{version}-%{release}
+#Requires: %{name}-tderesources = %{version}-%{release}
%description -n trinity-libkcal
This library provides a C++ API for handling the vCalendar and iCalendar
@@ -1726,9 +1738,9 @@ library.
%files -n trinity-libtdepim-devel
%defattr(-,root,root,-)
-%{tde_tdeincludedir}/[kt]depimmacros.h
-%{tde_libdir}/lib[kt]depim.la
-%{tde_libdir}/lib[kt]depim.so
+%{tde_tdeincludedir}/kdepimmacros.h
+%{tde_libdir}/libkdepim.la
+%{tde_libdir}/libkdepim.so
%post -n trinity-libtdepim-devel
/sbin/ldconfig || :
@@ -1934,8 +1946,8 @@ libkpimexchange-trinity library.
%files -n trinity-libkpimexchange-devel
%defattr(-,root,root,-)
-%{tde_tdeincludedir}/[kt]depim/exchangeaccount.h
-%{tde_tdeincludedir}/[kt]depim/exchangeclient.h
+%{tde_tdeincludedir}/kdepim/exchangeaccount.h
+%{tde_tdeincludedir}/kdepim/exchangeclient.h
%{tde_libdir}/libkpimexchange.la
%{tde_libdir}/libkpimexchange.so