From 972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 30 Aug 2015 12:27:30 +0200 Subject: RPM packaging: massive update SPEC files --- redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec | 7 +------ redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'redhat/dependencies/tqtinterface') diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec index 7b8406a36..49b652985 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec @@ -27,11 +27,6 @@ %define tde_pkg tqtinterface %define cmake_modules_dir %{_datadir}/cmake/Modules -# 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 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libtqt4 %{_lib}tqt4 %else @@ -41,7 +36,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 4.2.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: The Trinity Qt Interface Libraries Group: System/GUI/Other URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec index fbfd72ce2..f67ae2dfb 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec @@ -25,11 +25,6 @@ %define tde_pkg tqtinterface %define cmake_modules_dir %{_datadir}/cmake/Modules -# 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 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libtqt4 %{_lib}tqt4 %else @@ -39,7 +34,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 4.2.0 -Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist} Summary: The Trinity Qt Interface Libraries Group: System/GUI/Other URL: http://www.trinitydesktop.org/ -- cgit v1.2.3