summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authoralbator <albator@arcadia.vtf>2011-10-30 21:55:14 +0100
committeralbator <albator@arcadia.vtf>2011-10-30 21:55:14 +0100
commit8ad5f8901297e11bd05eb48488b6315aae50de0b (patch)
tree1aa5d2982b7d09a080f64e178ebc573adab632ee /redhat
parent0061571b57d37f17c074ba869a674fb774fb49b4 (diff)
downloadtde-packaging-8ad5f8901297e11bd05eb48488b6315aae50de0b.tar.gz
tde-packaging-8ad5f8901297e11bd05eb48488b6315aae50de0b.zip
Fix TDE 3.5.13 package dependencies
Diffstat (limited to 'redhat')
-rw-r--r--redhat/components.txt1
-rw-r--r--redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec11
-rw-r--r--redhat/kdepim/trinity-kdepim-3.5.13.spec15
-rw-r--r--redhat/trinity-desktop/trinity-desktop.spec94
4 files changed, 115 insertions, 6 deletions
diff --git a/redhat/components.txt b/redhat/components.txt
index 03544ec7e..3c0de8dbb 100644
--- a/redhat/components.txt
+++ b/redhat/components.txt
@@ -4,6 +4,7 @@ dependencies/qt3
dependencies/tqtinterface
dependencies/dbus-tqt
dependencies/arts
+trinity-desktop
kdelibs
kdebase
kdebindings
diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
index 8d19e5159..a57642152 100644
--- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
+++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
@@ -54,8 +54,10 @@ Provides: kdemultimedia3 = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
-BuildRequires: zlib-devel
+BuildRequires: trinity-arts-devel
BuildRequires: trinity-kdelibs-devel
+
+BuildRequires: zlib-devel
BuildRequires: libvorbis-devel
BuildRequires: audiofile-devel
BuildRequires: desktop-file-utils
@@ -350,6 +352,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_libdir}/mcop/*
%{_libdir}/libkdeinit_*.so
#%{_libdir}/liboggarts.so
+%{_libdir}/libmpeg-0.3.0.so
+%{_libdir}/libyafcore.so
+%{_libdir}/libyafxplayer.so
%{tde_libdir}/*
%{_libdir}/kconf_update_bin/*
%{_bindir}/*
@@ -391,7 +396,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%exclude %{_libdir}/libnoatunarts.*
#exclude %{_libdir}/liboggarts.so
%exclude %{_libdir}/libwinskinvis.so
-
+%exclude %{_libdir}/libmpeg-0.3.0.so
+%exclude %{_libdir}/libyafcore.so
+%exclude %{_libdir}/libyafxplayer.so
%changelog
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec
index e19bcf338..2e5b04d8d 100644
--- a/redhat/kdepim/trinity-kdepim-3.5.13.spec
+++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec
@@ -31,9 +31,9 @@ Prefix: %{_prefix}
Source0: kdepim-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: tqtinterface
-BuildRequires: trinity-arts
-BuildRequires: trinity-kdelibs
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-arts-devel
+BuildRequires: trinity-kdelibs-devel
BuildRequires: gpgme-devel
BuildRequires: libgpg-error-devel
BuildRequires: flex
@@ -46,6 +46,10 @@ BuildRequires: libcarddav-devel
%if 0%{?fedora} >= 15
BuildRequires: flex-static
+%else
+%if 0%{?rhel} <= 5
+BuildRequires: trinity-libcurl-devel
+%endif
%endif
Requires: trinity-kdelibs
@@ -98,7 +102,8 @@ cd build
-DBUILD_ALL=ON \
..
-%__make %{?_smp_mflags}
+# Do not use %{?_smp_mflags} !
+%__make
%install
export PATH="%{_bindir}:${PATH}"
@@ -130,6 +135,7 @@ export PATH="%{_bindir}:${PATH}"
%{_libdir}/kconf_update_bin/*
%{_libdir}/libakregatorprivate.so
%{_libdir}/libkmailprivate.so
+%{_libdir}/libkmobiledevice.so
%{tde_docdir}/HTML/en/*
%files devel
@@ -141,6 +147,7 @@ export PATH="%{_bindir}:${PATH}"
%{tde_libdir}/plugins/designer/*.la
%exclude %{_libdir}/libakregatorprivate.so
%exclude %{_libdir}/libkmailprivate.so
+%exclude %{_libdir}/libkmobiledevice.so
%{_datadir}/cmake/*.cmake
%changelog
diff --git a/redhat/trinity-desktop/trinity-desktop.spec b/redhat/trinity-desktop/trinity-desktop.spec
new file mode 100644
index 000000000..86b9c018e
--- /dev/null
+++ b/redhat/trinity-desktop/trinity-desktop.spec
@@ -0,0 +1,94 @@
+# Default version for this component
+%if "%{?version}" == ""
+%define version 3.5.13
+%endif
+%define release 1
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%define _docdir %{_prefix}/share/doc
+%endif
+
+Name: trinity-desktop
+Version: %{version}
+Release: %{?release}%{?dist}%{?_variant}
+License: GPL
+Summary: Meta-package to install TDE
+Group: User Interface/Desktops
+
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://www.trinitydesktop.org/
+
+Prefix: %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+
+Requires: trinity-kdeaccessibility >= %{version}
+Requires: trinity-kdeaddons >= %{version}
+Requires: trinity-kdeadmin >= %{version}
+Requires: trinity-kdeartwork >= %{version}
+Requires: trinity-kdeartwork-icons >= %{version}
+Requires: trinity-kdebase >= %{version}
+Requires: trinity-kdebindings >= %{version}
+Requires: trinity-kdeedu >= %{version}
+Requires: trinity-kdegames >= %{version}
+Requires: trinity-kdegraphics >= %{version}
+Requires: trinity-kdemultimedia >= %{version}
+Requires: trinity-kdenetwork >= %{version}
+Requires: trinity-kdepim >= %{version}
+Requires: trinity-kdeutils >= %{version}
+Requires: trinity-kdetoys >= %{version}
+
+%description
+The TDE project aims to keep the KDE3.5 computing style alive, as well as
+polish off any rough edges that were present as of KDE 3.5.10. Along
+the way, new useful features will be added to keep the environment
+up-to-date.
+Toward that end, significant new enhancements have already been made in
+areas such as display control, network connectivity, user
+authentication, and much more!
+
+%package dev
+Group: User Interface/Desktops
+Summary: Meta-package to install TDE development tools
+
+Requires: trinity-kdesdk >= %{version}
+Requires: trinity-kdevelop >= %{version}
+Requires: trinity-kdewebdev >= %{version}
+
+%description dev
+%{summary}
+
+%package extras
+Group: User Interface/Desktops
+Summary: Meta-package to install extra TDE packages
+
+Requires: trinity-kdeaddons-extras >= %{version}
+Requires: trinity-kdebase-extras >= %{version}
+Requires: trinity-kdegraphics-extras >= %{version}
+Requires: trinity-kdemultimedia-extras >= %{version}
+Requires: trinity-kdenetwork-extras >= %{version}
+Requires: trinity-kdeutils-extras >= %{version}
+
+%description extras
+%{summary}
+
+%package all
+Group: User Interface/Desktops
+Summary: Meta-package to install all TDE packages
+
+Requires: %{name} == %{version}
+Requires: %{name}-dev == %{version}
+Requires: %{name}-extras == %{version}
+
+%description all
+%{summary}
+
+
+%files
+
+%files dev
+
+%files all