From 8ad5f8901297e11bd05eb48488b6315aae50de0b Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 30 Oct 2011 21:55:14 +0100 Subject: Fix TDE 3.5.13 package dependencies --- redhat/trinity-desktop/trinity-desktop.spec | 94 +++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 redhat/trinity-desktop/trinity-desktop.spec (limited to 'redhat/trinity-desktop/trinity-desktop.spec') 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 +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 -- cgit v1.2.1 From 22f1373d3e0c69b54532e118571e46a3e2c9b7a6 Mon Sep 17 00:00:00 2001 From: albator Date: Mon, 31 Oct 2011 09:58:18 +0100 Subject: Add meta package "trinity-desktop" for RHEL/Fedora --- redhat/trinity-desktop/trinity-desktop.spec | 2 ++ 1 file changed, 2 insertions(+) (limited to 'redhat/trinity-desktop/trinity-desktop.spec') diff --git a/redhat/trinity-desktop/trinity-desktop.spec b/redhat/trinity-desktop/trinity-desktop.spec index 86b9c018e..cf9a96d22 100644 --- a/redhat/trinity-desktop/trinity-desktop.spec +++ b/redhat/trinity-desktop/trinity-desktop.spec @@ -91,4 +91,6 @@ Requires: %{name}-extras == %{version} %files dev +%files extras + %files all -- cgit v1.2.1 From ba0a15d74e98b4cb42279dcda25e1730197a003e Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 12 Nov 2011 17:24:02 +0100 Subject: RHEL/Fedora: better integration with distribution, small fixes --- redhat/trinity-desktop/trinity-desktop.spec | 32 ++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'redhat/trinity-desktop/trinity-desktop.spec') diff --git a/redhat/trinity-desktop/trinity-desktop.spec b/redhat/trinity-desktop/trinity-desktop.spec index cf9a96d22..c109fd82b 100644 --- a/redhat/trinity-desktop/trinity-desktop.spec +++ b/redhat/trinity-desktop/trinity-desktop.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -25,6 +25,9 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +Source0: trinity-3.5.13-fedora.repo +Source1: trinity-3.5.13-rhel.repo + Requires: trinity-kdeaccessibility >= %{version} Requires: trinity-kdeaddons >= %{version} Requires: trinity-kdeadmin >= %{version} @@ -40,6 +43,7 @@ Requires: trinity-kdenetwork >= %{version} Requires: trinity-kdepim >= %{version} Requires: trinity-kdeutils >= %{version} Requires: trinity-kdetoys >= %{version} +Requires: trinity-repo >= %{version} %description The TDE project aims to keep the KDE3.5 computing style alive, as well as @@ -86,6 +90,25 @@ Requires: %{name}-extras == %{version} %description all %{summary} +%package -n trinity-repo +Group: User Interface/Desktops +Summary: Yum configuration files for Trinity + +%description -n trinity-repo +%{summary} + +%prep + +%build + +%install +%__rm -rf %{?buildroot} +%__mkdir_p %{?buildroot}%{_sysconfdir}/yum.repos.d +%if 0%{?fedora} +%__install -m 644 %{SOURCE0} %{?buildroot}%{_sysconfdir}/yum.repos.d +%else +%__install -m 644 %{SOURCE1} %{?buildroot}%{_sysconfdir}/yum.repos.d +%endif %files @@ -94,3 +117,10 @@ Requires: %{name}-extras == %{version} %files extras %files all + +%files -n trinity-repo +%{_sysconfdir}/yum.repos.d/*.repo + +%changelog +* Sat Nov 12 2011 Francois Andriot - 3.5.13-2 +- Add 'repo' package -- cgit v1.2.1