RPM: updates for future 14.0.9 release

2 files changed, 12 insertions, 116 deletions

diff --git a/redhat/extras/style-ia-ora/style-ia-ora.spec b/redhat/extras/style-ia-ora/style-ia-ora.spec
deleted file mode 100644
index 351771520..000000000
--- a/redhat/extras/style-ia-ora/style-ia-ora.spec
+++ /dev/null
@@ -1,114 +0,0 @@
-# Default version for this component
-%define tde_pkg style-ia-ora
-%define tde_version 14.0.7
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:        Mandriva theme for TDE - Widget design
-Version:        1.0.8
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
-
-License:        GPL
-Group:          Environment/Desktop
-URL:            http://www.mandrivalinux.com/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:        %{tde_pkg}-%{tde_version}.tar.gz
-
-Prefix:		%{_prefix}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-
-Requires:	trinity-twin
-
-%description
-Mandriva theme for Trinity
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n ia_ora-kde-%{version}
-
-%__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"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  \
-  --enable-rpath \
-  --enable-closure \
-  --disable-dependency-tracking \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-shared \
-  --disable-static
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-# Removes useless files
-%__rm -f %{?buildroot}%{tde_tdelibdir}/*.a
-%__rm -f %{?buildroot}%{tde_tdelibdir}/plugins/styles/*.a
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/twin3_iaora.la
-%{tde_tdelibdir}/twin3_iaora.so
-%{tde_tdelibdir}/twin_iaora_config.la
-%{tde_tdelibdir}/twin_iaora_config.so
-%{tde_tdelibdir}/plugins/styles/ia_ora.la
-%{tde_tdelibdir}/plugins/styles/ia_ora.so
-%{tde_datadir}/apps/kstyle/themes/ia_ora.themerc
-%{tde_datadir}/apps/twin/iaora.desktop
-
-
-
-
-%changelog
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index 024c38cad..a22540fd1 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -107,6 +107,7 @@ Requires: trinity-abakus
 Requires: trinity-amarok
 Requires: trinity-basket
 Requires: trinity-bibletime
+Requires: trinity-codeine
 Requires: trinity-digikam
 Requires: trinity-dolphin
 Requires: trinity-filelight
@@ -134,6 +135,8 @@ Requires: trinity-kdiff3
 Requires: trinity-kdirstat
 Requires: trinity-keep
 Requires: trinity-kerberostray
+#Requires: trinity-kerry
+Requires: trinity-keximdb
 Requires: trinity-kftpgrabber
 Requires: trinity-kile
 Requires: trinity-kima
@@ -151,6 +154,7 @@ Requires: trinity-knowit
 Requires: trinity-knmap
 Requires: trinity-knutclient
 Requires: trinity-koffice-suite
+Requires: trinity-kooldock
 Requires: trinity-konversation
 Requires: trinity-kopete-otr
 Requires: trinity-kpicosim
@@ -160,10 +164,10 @@ Requires: trinity-krename
 Requires: trinity-krusader
 Requires: trinity-kscope
 Requires: trinity-ksensors
-Requires: trinity-ksplash-engine-moodin
-Requires: trinity-ksquirrel
 Requires: trinity-kshowmail
 Requires: trinity-kshutdown
+Requires: trinity-ksplash-engine-moodin
+Requires: trinity-ksquirrel
 Requires: trinity-kstreamripper
 Requires: trinity-ksystemlog
 Requires: trinity-ktechlab
@@ -171,13 +175,18 @@ Requires: trinity-ktorrent
 Requires: trinity-kvirc
 Requires: trinity-kvkbd
 Requires: trinity-kvpnc
+Requires: trinity-kxmleditor
 Requires: trinity-mplayerthumbs
 Requires: trinity-piklab
 Requires: trinity-potracegui
 Requires: trinity-smb4k
 Requires: trinity-smartcardauth
 Requires: trinity-soundkonverter
+Requires: trinity-tastymenu
 Requires: trinity-tde-guidance
+Requires: trinity-tde-style-baghira
+Requires: trinity-tde-style-domino
+Requires: trinity-tde-style-ia-ora
 Requires: trinity-tde-style-lipstik
 Requires: trinity-tde-style-qtcurve
 Requires: trinity-tde-systemsettings
@@ -186,6 +195,7 @@ Requires: trinity-tdeio-ftps
 Requires: trinity-tdeio-locate
 Requires: trinity-tdeio-sword
 Requires: trinity-tdeio-umountwrapper
+Requires: trinity-tdepacman
 Requires: trinity-tdepowersave
 Requires: trinity-tderadio
 Requires: trinity-tdesudo