summaryrefslogtreecommitdiffstats
path: root/redhat/trinity-desktop/trinity-desktop.spec
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-14 18:27:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-14 18:27:31 -0600
commit19bc61f5b70a4117ba7bd45f8519c642148a0fbf (patch)
treed6fcc8add9ca11b0eff8fe10033f314d3948b36f /redhat/trinity-desktop/trinity-desktop.spec
parent9cdd60304e49a4037b326ddbaac7c038383fbdf7 (diff)
parent35bee9455536ec115fddfa30cdbd2dcade240cfb (diff)
downloadtde-packaging-19bc61f5b70a4117ba7bd45f8519c642148a0fbf.tar.gz
tde-packaging-19bc61f5b70a4117ba7bd45f8519c642148a0fbf.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/trinity-desktop/trinity-desktop.spec')
-rw-r--r--redhat/trinity-desktop/trinity-desktop.spec33
1 files changed, 32 insertions, 1 deletions
diff --git a/redhat/trinity-desktop/trinity-desktop.spec b/redhat/trinity-desktop/trinity-desktop.spec
index cf9a96d22..1820928c9 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,8 @@ Requires: trinity-kdenetwork >= %{version}
Requires: trinity-kdepim >= %{version}
Requires: trinity-kdeutils >= %{version}
Requires: trinity-kdetoys >= %{version}
+Requires: trinity-repo >= %{version}
+Requires: hal
%description
The TDE project aims to keep the KDE3.5 computing style alive, as well as
@@ -86,6 +91,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 +118,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 <francois.andriot@free.fr> - 3.5.13-2
+- Add 'repo' package