diff options
Diffstat (limited to 'redhat/extras')
20 files changed, 34 insertions, 128 deletions
diff --git a/redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec b/redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec index 26f2d1adb..8c3e5dcc0 100644 --- a/redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec +++ b/redhat/extras/icons-nuvola/icons-nuvola-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -46,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: Nuvola icons for TDE Desktop Version: 1.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/extras/kdebluetooth/kdebluetooth.spec b/redhat/extras/kdebluetooth/kdebluetooth.spec index 25b95d31b..1ad3db23b 100644 --- a/redhat/extras/kdebluetooth/kdebluetooth.spec +++ b/redhat/extras/kdebluetooth/kdebluetooth.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE 3.5.13 specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -22,7 +17,7 @@ Name: trinity-kdebluetooth Version: 1.0_beta9_r769275 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} Summary: The TDE Bluetooth Framework diff --git a/redhat/extras/kdevmon/kdevmon-14.0.0.spec b/redhat/extras/kdevmon/kdevmon-14.0.0.spec index 9695f6f0f..becc56d67 100644 --- a/redhat/extras/kdevmon/kdevmon-14.0.0.spec +++ b/redhat/extras/kdevmon/kdevmon-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -46,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: A utility for monitoring the throughput of one network device Version: 0.4.6 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -58,10 +53,10 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{tde_pkg}-14.0.0.tar.gz +Source0: %{tde_pkg}-%{tde_version}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-arts-devel >= 2:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils diff --git a/redhat/extras/kdissert/kdissert-14.0.0.spec b/redhat/extras/kdissert/kdissert-14.0.0.spec index cc5a6ab8a..071a83883 100644 --- a/redhat/extras/kdissert/kdissert-14.0.0.spec +++ b/redhat/extras/kdissert/kdissert-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -46,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: Mindmapping Tool Version: 1.0.6c -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec index ee835164b..2e759de43 100644 --- a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec +++ b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Speed build options %define debug_package %{nil} %define __spec_install_post %{nil} @@ -27,7 +22,7 @@ AutoReq: no Name: trinity-kickoff-i18n Summary: Kickoff translations for Trinity Desktop Environment Version: 1.0 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} Group: System/Internationalization License: GPL URL: http://www.mandriva.com diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec index a0e684814..9a75298ce 100644 --- a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec +++ b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Speed build options %define debug_package %{nil} %define __spec_install_post %{nil} @@ -27,7 +22,7 @@ AutoReq: no Name: trinity-kickoff-i18n Summary: Kickoff translations for Trinity Desktop Environment Version: 1.0 -Release: 3%{?dist}%{?_variant} +Release: 3%{?dist} Group: System/Internationalization License: GPL URL: http://www.mandriva.com diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec index eb4540bd2..5872a0bbb 100644 --- a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec +++ b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Speed build options %define debug_package %{nil} %define __spec_install_post %{nil} @@ -19,7 +14,7 @@ AutoReq: no Name: trinity-kickoff-i18n Summary: Kickoff translations for Trinity Desktop Environment Version: 1.0 -Release: 1%{?dist}%{?_variant} +Release: 1%{?dist} Group: System/Internationalization License: GPL URL: http://www.mandriva.com diff --git a/redhat/extras/kitty/kitty-14.0.0.spec b/redhat/extras/kitty/kitty-14.0.0.spec index 080feb534..1c4317085 100644 --- a/redhat/extras/kitty/kitty-14.0.0.spec +++ b/redhat/extras/kitty/kitty-14.0.0.spec @@ -15,11 +15,6 @@ # Please submit bugfixes or comments via http://www.trinitydesktop.org/ # -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %if "%{?tde_version}" == "" %define tde_version 14.0.0 %endif @@ -42,7 +37,7 @@ Summary: a TQt/TDE based RSS podcast and video aggregator Name: trinity-kitty Version: 0.9.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPL Group: Applications/Network diff --git a/redhat/extras/klamav/klamav-14.0.0.spec b/redhat/extras/klamav/klamav-14.0.0.spec index bc6c6b1b4..dd45f3f31 100644 --- a/redhat/extras/klamav/klamav-14.0.0.spec +++ b/redhat/extras/klamav/klamav-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -46,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: Frontend for clamav Version: 0.46 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -59,10 +54,10 @@ Url: http://klamav.sourceforge.net/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{tde_pkg}-14.0.0.tar.gz +Source0: %{tde_pkg}-%{tde_version}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-arts-devel >= 2:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils diff --git a/redhat/extras/klibido/klibido-14.0.0.spec b/redhat/extras/klibido/klibido-14.0.0.spec index 053f28052..2a2d521b1 100644 --- a/redhat/extras/klibido/klibido-14.0.0.spec +++ b/redhat/extras/klibido/klibido-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -45,7 +40,7 @@ Name: trinity-%{tde_pkg} Summary: A TDE usenet news grabber for Linux. Version: 0.2.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPL Group: Applications/Network @@ -57,7 +52,7 @@ URL: http://klibido.sourceforge.net/ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{tde_pkg}-%{version}.tar.gz +Source0: %{tde_pkg}-%{tde_version}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 diff --git a/redhat/extras/knoda/trinity-knoda.spec b/redhat/extras/knoda/trinity-knoda.spec index 541c23b4d..871b06067 100644 --- a/redhat/extras/knoda/trinity-knoda.spec +++ b/redhat/extras/knoda/trinity-knoda.spec @@ -1,11 +1,7 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - - # TDE 3.5.13 specific building variables +%define tde_version 14.0.1 %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_confdir %{_sysconfdir}/trinity @@ -23,7 +19,7 @@ Name: trinity-knoda Version: 0.8.3 -Release: 1%{?dist}%{?_variant} +Release: 1%{?dist} Summary: A database frontend for TDE. Group: Applications/Productivity @@ -31,7 +27,7 @@ License: GPLv2+ URL: http://sourceforge.net/projects/knoda/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: http://downloads.sourceforge.net/project/knoda/knoda/0.8.3/knoda-0.8.3.tar.gz +Source0: http://downloads.sourceforge.net/project/knoda/knoda/0.8.3/knoda-%{tde_version}.tar.gz BuildRequires: desktop-file-utils BuildRequires: trinity-tdelibs-devel @@ -52,7 +48,7 @@ Requires: %{name} = %{version}-%{release} %{summary} -%if 0%{?suse_version} +%if 0%{?suse_version} || 0%{?pclinuxos} %debug_package %endif diff --git a/redhat/extras/kompose/kompose-14.0.0.spec b/redhat/extras/kompose/kompose-14.0.0.spec index 491aede15..05dbedbae 100644 --- a/redhat/extras/kompose/kompose-14.0.0.spec +++ b/redhat/extras/kompose/kompose-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -46,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: Full-Screen Task Manager for TDE Version: 0.5.3 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -58,7 +53,7 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{tde_pkg}-14.0.0.tar.gz +Source0: %{tde_pkg}-%{tde_version}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 diff --git a/redhat/extras/koverartist/koverartist-14.0.0.spec b/redhat/extras/koverartist/koverartist-14.0.0.spec index 38f6ea51e..6d4a92dc3 100644 --- a/redhat/extras/koverartist/koverartist-14.0.0.spec +++ b/redhat/extras/koverartist/koverartist-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -46,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: Fast Creation of CD/DVD Covers Version: 0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -58,7 +53,7 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{tde_pkg}-14.0.0.tar.gz +Source0: %{tde_pkg}-%{tde_version}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 diff --git a/redhat/extras/kpacman/kpacman-14.0.0.spec b/redhat/extras/kpacman/kpacman-14.0.0.spec index a30c6b6e1..b2517b9bb 100644 --- a/redhat/extras/kpacman/kpacman-14.0.0.spec +++ b/redhat/extras/kpacman/kpacman-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_confdir %{_sysconfdir}/trinity @@ -47,7 +42,7 @@ Name: trinity-%{tde_pkg} Summary: A pacman game for the Trinity Desktop. Version: 0.3.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -59,7 +54,7 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{tde_pkg}-14.0.0.tar.gz +Source0: %{tde_pkg}-%{tde_version}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 diff --git a/redhat/extras/style-ia-ora/style-ia-ora-14.0.0.spec b/redhat/extras/style-ia-ora/style-ia-ora-14.0.0.spec index 9920f039e..ed93d1f4d 100644 --- a/redhat/extras/style-ia-ora/style-ia-ora-14.0.0.spec +++ b/redhat/extras/style-ia-ora/style-ia-ora-14.0.0.spec @@ -21,11 +21,6 @@ %define tde_version 14.0.0 %endif -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -46,7 +41,7 @@ Name: trinity-%{tde_pkg} Summary: Mandriva theme for TDE - Widget design Version: 1.0.8 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPL Group: Environment/Desktop @@ -55,7 +50,7 @@ URL: http://www.mandrivalinux.com/ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{tde_pkg}-14.0.0.tar.gz +Source0: %{tde_pkg}-%{tde_version}.tar.gz Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot diff --git a/redhat/extras/theme-baghira/theme-baghira-3.5.13.1.spec b/redhat/extras/theme-baghira/theme-baghira-3.5.13.1.spec index ef5ef5c7e..7314a98e8 100644 --- a/redhat/extras/theme-baghira/theme-baghira-3.5.13.1.spec +++ b/redhat/extras/theme-baghira/theme-baghira-3.5.13.1.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Speed build options %define debug_package %{nil} %define __spec_install_post %{nil} @@ -25,7 +20,7 @@ AutoReq: no Name: trinity-theme-baghira Version: 0.8 -Release: 1%{?dist}%{?_variant} +Release: 1%{?dist} Summary: Baghira theme for Trinity License: GPL Group: Graphical desktop/KDE diff --git a/redhat/extras/theme-baghira/theme-baghira-3.5.13.2.spec b/redhat/extras/theme-baghira/theme-baghira-3.5.13.2.spec index 09dfee3b6..66fe8b315 100644 --- a/redhat/extras/theme-baghira/theme-baghira-3.5.13.2.spec +++ b/redhat/extras/theme-baghira/theme-baghira-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # Speed build options %define debug_package %{nil} %define __spec_install_post %{nil} @@ -25,7 +20,7 @@ AutoReq: no Name: trinity-theme-baghira Version: 0.8 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} Summary: Baghira theme for Trinity License: GPL Group: Graphical desktop/KDE diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec index 5e1e15108..7f32d520d 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec @@ -24,14 +24,13 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" -%define _variant .opt %define _docdir %{_datadir}/doc %define tde_datadir %{tde_prefix}/share %endif Name: trinity-desktop Version: %{tde_version} -Release: 1%{?dist}%{?_variant} +Release: 1%{?dist} License: GPL Summary: Meta-package to install TDE Group: User Interface/Desktops @@ -210,10 +209,7 @@ Requires: trinity-kpilot # Network management # RHEL 6 and openSUSE 11.x: knetworkmanager8 -%if 0%{?rhel} == 6 -Requires: trinity-knetworkmanager8 -%endif -%if 0%{?suse_version} && 0%{?suse_version} <= 1140 +%if 0%{?suse_version} && 0%{?suse_version} <= 1140 || 0%{?rhel} == 6 Requires: trinity-knetworkmanager %endif # Other distros use tdenetworkmanager (since R14) @@ -284,7 +280,7 @@ Requires: trinity-theme-baghira # GLIBC too old on RHEL <= 5 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 -Requires: trinity-twinkle +#Requires: trinity-twinkle %endif %description extras diff --git a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec index 0aa92d42d..c2380e215 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec @@ -1,13 +1,12 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" -%define _variant .opt %define _docdir %{_datadir}/doc %define tde_datadir %{tde_prefix}/share %endif Name: trinity-desktop Version: 3.5.13.2 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} License: GPL Summary: Meta-package to install TDE Group: User Interface/Desktops diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec index 43d8d31c6..d3bfc0b09 100644 --- a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec +++ b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec @@ -32,15 +32,10 @@ %define tde_libdir %{tde_prefix}/%{_lib} %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-filesystem Version: %{tde_version} -Release: 1%{?dist}%{?_variant} +Release: 1%{?dist} Summary: Trinity Directory Layout Group: System/Fhs URL: http://www.trinitydesktop.org/ |