diff options
Diffstat (limited to 'redhat/extras/trinity-desktop')
| -rw-r--r-- | redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo | 12 | ||||
| -rw-r--r-- | redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo | 12 | ||||
| -rw-r--r-- | redhat/extras/trinity-desktop/trinity-desktop.spec (renamed from redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec) | 63 |
3 files changed, 25 insertions, 62 deletions
diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo index 7a292aa39..05e45748c 100644 --- a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo +++ b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo @@ -1,23 +1,23 @@ [trinity-3.5.13] name=trinity-3.5.13 -#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch -mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-$basearch.list +#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch +mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13-$basearch.list enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity [trinity-3.5.13-noarch] name=trinity-3.5.13-noarch -#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch -mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-noarch.list +#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch +mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13-noarch.list enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity [trinity-3.5.13-source] name=trinity-3.5.13-source -#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS -mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list +#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS +mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo index f415f006a..7ce5d3e31 100644 --- a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo +++ b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo @@ -1,23 +1,23 @@ [trinity-3.5.13] name=trinity-3.5.13 -#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch -mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-$basearch.list +#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch +mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13-$basearch.list enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity [trinity-3.5.13-noarch] name=trinity-3.5.13-noarch -#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch -mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-noarch.list +#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch +mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13-noarch.list enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity [trinity-3.5.13-source] name=trinity-3.5.13-noarch -#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS -mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list +#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS +mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec index 430a7168a..5766196c3 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop.spec @@ -15,11 +15,8 @@ # Please submit bugfixes or comments via http://www.trinitydesktop.org/ # -# Starting with TDE R14.0.0, TDE is not intended to run in RHEL4 and older. -# Minimum (oldest) distribution supported is RHEL5. - %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.0.7 %endif # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". @@ -64,8 +61,8 @@ Requires: trinity-tdegraphics >= %{version} Requires: trinity-tdemultimedia >= %{version} Requires: trinity-tdenetwork >= %{version} Requires: trinity-tdepim >= %{version} -Requires: trinity-tdeutils >= %{version} Requires: trinity-tdetoys >= %{version} +Requires: trinity-tdeutils >= %{version} %if 0%{?rhel} || 0%{?fedora} # YUM configuration file @@ -89,9 +86,6 @@ authentication, and much more! Group: User Interface/Desktops Summary: Meta-package to install TDE development tools -Obsoletes: trinity-desktop-dev < %{version}-%{release} -Provides: trinity-desktop-dev = %{version}-%{release} - Requires: trinity-tdesdk >= %{version} Requires: trinity-tdevelop >= %{version} Requires: trinity-tdewebdev >= %{version} @@ -108,7 +102,6 @@ Group: User Interface/Desktops Summary: Meta-package to install all TDE applications # Warning, k9copy requires ffmpeg -# Warning, tderadio requires libmp3lame Requires: trinity-abakus Requires: trinity-amarok @@ -118,6 +111,8 @@ Requires: trinity-digikam Requires: trinity-dolphin Requires: trinity-filelight Requires: trinity-gwenview +Requires: trinity-k3b +Requires: trinity-k9copy Requires: trinity-kaffeine Requires: trinity-kaffeine-mozilla Requires: trinity-kasablanca @@ -129,15 +124,19 @@ Requires: trinity-kbiff Requires: trinity-kbookreader Requires: trinity-kchmviewer Requires: trinity-kcmautostart +Requires: trinity-kcmldap +Requires: trinity-kcmldapcontroller +Requires: trinity-kcmldapmanager Requires: trinity-kcpuload Requires: trinity-kdbg Requires: trinity-kdbusnotification Requires: trinity-kdiff3 Requires: trinity-kdirstat Requires: trinity-keep -Requires: trinity-keximdb +Requires: trinity-kerberostray Requires: trinity-kftpgrabber Requires: trinity-kile +Requires: trinity-kima Requires: trinity-kiosktool Requires: trinity-kkbswitch Requires: trinity-klcddimmer @@ -153,10 +152,9 @@ Requires: trinity-knmap Requires: trinity-knutclient Requires: trinity-koffice-suite Requires: trinity-konversation -Requires: trinity-kooldock Requires: trinity-kopete-otr Requires: trinity-kpicosim -Requires: trinity-kplayer +Requires: trinity-kpilot Requires: trinity-krecipes Requires: trinity-krename Requires: trinity-krusader @@ -170,22 +168,16 @@ Requires: trinity-kstreamripper Requires: trinity-ksystemlog Requires: trinity-ktechlab Requires: trinity-ktorrent -Requires: trinity-kuickshow 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 @@ -194,39 +186,17 @@ Requires: trinity-tdeio-ftps Requires: trinity-tdeio-locate Requires: trinity-tdeio-sword Requires: trinity-tdeio-umountwrapper +Requires: trinity-tdepowersave Requires: trinity-tderadio +Requires: trinity-tdesudo Requires: trinity-tdesvn +Requires: trinity-tellico Requires: trinity-tdmtheme Requires: trinity-tork Requires: trinity-twin-style-crystal Requires: trinity-wlassistant Requires: trinity-yakuake -# PCLinuxOS does not have sudo ... -%if 0%{?pclinuxos} == 0 -Requires: trinity-tdesudo -%endif - -# PCLinuxOS and RHEL 5 don't have heimdal ... -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%if 0%{?pclinuxos} == 0 -Requires: trinity-kcmldap -Requires: trinity-kcmldapcontroller -Requires: trinity-kcmldapmanager -Requires: trinity-kerberostray -%endif -%endif - -# RHEL5: UDEV is too old -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -Requires: trinity-k3b -Requires: trinity-k9copy -Requires: trinity-kima -Requires: trinity-kpilot -Requires: trinity-tellico -Requires: trinity-tdepowersave -%endif - # Network management # RHEL 6 and openSUSE 11.x: knetworkmanager8 %if 0%{?suse_version} && 0%{?suse_version} <= 1140 || 0%{?rhel} == 6 @@ -235,8 +205,6 @@ Requires: trinity-knetworkmanager # Other distros use tdenetworkmanager (since R14) %if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} Requires: trinity-tdenetworkmanager -Obsoletes: trinity-knetworkmanager -Obsoletes: trinity-knetworkmanager8 %endif # Power management @@ -248,11 +216,6 @@ Obsoletes: trinity-tde-guidance-powermanager #Requires: trinity-gtk3-tqt-engine #Requires: trinity-qt4-tqt-theme-engine -# Missing qalculate on older RHEL ... -%if 0%{?rhel} == 0 || 0%{?rhel} >= 7 -Requires: trinity-qalculate-tde -%endif - # On RHEL 5/7, lilypond is not available, so no rosegarden :'-( %if 0%{?rhel} == 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} Requires: trinity-rosegarden |