RHEL/Fedora: updates trinity-desktop

pull/3/head
Francois Andriot 12 years ago
parent 143d7c6059
commit d9294e2415

@ -1,36 +1,41 @@
[trinity-3.5.13-fedora] [trinity-3.5.13]
name=trinity-3.5.13-fedora name=trinity-3.5.13
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-$basearch.list
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0
[trinity-3.5.13-fedora-noarch] [trinity-3.5.13-noarch]
name=trinity-3.5.13-fedora-noarch name=trinity-3.5.13-noarch
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-noarch.list
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0
[trinity-3.5.13-fedora-source] [trinity-3.5.13-source]
name=trinity-3.5.13-fedora-source name=trinity-3.5.13-source
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0
[trinity-extras-fedora] [trinity-extras]
name=trinity-extras-fedora name=trinity-extras
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/RPMS/$basearch #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/RPMS/$basearch
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras-$basearch.list
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0
[trinity-extras-fedora-noarch] [trinity-extras-noarch]
name=trinity-extras-fedora-noarch name=trinity-extras-noarch
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/RPMS/noarch #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/RPMS/noarch
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras-noarch.list
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0
[trinity-extras-fedora-source] [trinity-extras-source]
name=trinity-extras-fedora-source name=trinity-extras-source
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/SRPMS #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/SRPMS
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras-SRPMS.list
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0

@ -1,36 +1,41 @@
[trinity-3.5.13-rhel] [trinity-3.5.13]
name=trinity-3.5.13-rhel name=trinity-3.5.13
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-$basearch.list
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0
[trinity-3.5.13-rhel-noarch] [trinity-3.5.13-noarch]
name=trinity-3.5.13-rhel-noarch name=trinity-3.5.13-noarch
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-noarch.list
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0
[trinity-3.5.13-rhel-source] [trinity-3.5.13-source]
name=trinity-3.5.13-rhel-source name=trinity-3.5.13-source
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0
[trinity-extras-rhel] [trinity-extras]
name=trinity-extras-rhel name=trinity-extras
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/RPMS/$basearch #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/RPMS/$basearch
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras-$basearch.list
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0
[trinity-extras-rhel-noarch] [trinity-extras-noarch]
name=trinity-extras-rhel-noarch name=trinity-extras-noarch
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/RPMS/noarch #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/RPMS/noarch
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras-noarch.list
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0
[trinity-extras-rhel-source] [trinity-extras-source]
name=trinity-extras-rhel-source name=trinity-extras-source
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/SRPMS #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/SRPMS
mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras-SRPMS.list
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0

@ -1,18 +1,12 @@
# Default version for this component
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
%define _docdir %{_prefix}/share/doc %define _docdir %{_datadir}/doc
%endif %endif
Name: trinity-desktop Name: trinity-desktop
Version: %{version} Version: 3.5.13
Release: %{?release}%{?dist}%{?_variant} Release: 4%{?dist}%{?_variant}
License: GPL License: GPL
Summary: Meta-package to install TDE Summary: Meta-package to install TDE
Group: User Interface/Desktops Group: User Interface/Desktops
@ -74,7 +68,7 @@ Requires: trinity-kdeaddons-extras >= %{version}
Requires: trinity-kdebase-extras >= %{version} Requires: trinity-kdebase-extras >= %{version}
Requires: trinity-kdegraphics-extras >= %{version} Requires: trinity-kdegraphics-extras >= %{version}
Requires: trinity-kdemultimedia-extras >= %{version} Requires: trinity-kdemultimedia-extras >= %{version}
Requires: trinity-kdenetwork-extras >= %{version} #Requires: trinity-kdenetwork-extras >= %{version}
Requires: trinity-kdeutils-extras >= %{version} Requires: trinity-kdeutils-extras >= %{version}
%description extras %description extras
@ -118,7 +112,6 @@ Summary: Yum configuration files for Trinity
%if 0%{?rhel} > 0 %if 0%{?rhel} > 0
%__sed %{SOURCE1} \ %__sed %{SOURCE1} \
-e 's/\$releasever/%{rhel}/g' \ -e 's/\$releasever/%{rhel}/g' \
-e 's/-rhel/-el%{rhel}/g' \
>%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13-el%{rhel}.repo >%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13-el%{rhel}.repo
%endif %endif
@ -136,6 +129,9 @@ Summary: Yum configuration files for Trinity
%{_sysconfdir}/yum.repos.d/*.repo %{_sysconfdir}/yum.repos.d/*.repo
%changelog %changelog
* Wed Jun 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
- Enable mirrorlist
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 * Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Fix repo files name and content - Fix repo files name and content

Loading…
Cancel
Save