diff options
| author | François Andriot <albator78@libertysurf.fr> | 2015-08-30 12:27:30 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2015-08-30 12:27:30 +0200 |
| commit | 972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2 (patch) | |
| tree | ab6620583bc880bd61cceb0058ecc1f7e896b992 /redhat/main/tdebase | |
| parent | e5f2386a7884932cffd7c862b6ddedbd2e8a6810 (diff) | |
| download | tde-packaging-972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2.tar.gz tde-packaging-972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2.zip | |
RPM packaging: massive update SPEC files
Diffstat (limited to 'redhat/main/tdebase')
| -rw-r--r-- | redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015 (renamed from redhat/main/tdebase/pamd.kcheckpass-trinity.pclos) | 0 | ||||
| -rw-r--r-- | redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015 (renamed from redhat/main/tdebase/pamd.kdm-trinity-np.pclos) | 0 | ||||
| -rw-r--r-- | redhat/main/tdebase/pamd.kdm-trinity.pclos2015 (renamed from redhat/main/tdebase/pamd.kdm-trinity.pclos) | 0 | ||||
| -rw-r--r-- | redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015 (renamed from redhat/main/tdebase/pamd.kscreensaver-trinity.pclos) | 0 | ||||
| -rw-r--r-- | redhat/main/tdebase/tdebase-14.0.0.spec | 9 | ||||
| -rw-r--r-- | redhat/main/tdebase/tdebase-3.5.13.2.spec | 7 |
6 files changed, 3 insertions, 13 deletions
diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015 index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2015 diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015 index 690b4df08..690b4df08 100644 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2015 diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos b/redhat/main/tdebase/pamd.kdm-trinity.pclos2015 index 87d080f58..87d080f58 100644 --- a/redhat/main/tdebase/pamd.kdm-trinity.pclos +++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2015 diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015 index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2015 diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec index 409761703..2eef6ba9f 100644 --- a/redhat/main/tdebase/tdebase-14.0.0.spec +++ b/redhat/main/tdebase/tdebase-14.0.0.spec @@ -37,15 +37,10 @@ %define tdm_datadir %{tde_datadir}/apps/%{tdm} %define starttde starttde -# 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-%{tde_pkg} Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Trinity Base Programs Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -3621,7 +3616,7 @@ fi %endif %{!?with_kbdledsync:-DBUILD_TDEKBDLEDSYNC=OFF} \ %{!?with_tsak:-DBUILD_TSAK=OFF} \ -%if 0%{?fedora} >= 22 +%if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320 -DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \ %endif .. diff --git a/redhat/main/tdebase/tdebase-3.5.13.2.spec b/redhat/main/tdebase/tdebase-3.5.13.2.spec index afd87bfef..bfc75ba13 100644 --- a/redhat/main/tdebase/tdebase-3.5.13.2.spec +++ b/redhat/main/tdebase/tdebase-3.5.13.2.spec @@ -34,15 +34,10 @@ %define tdm_datadir %{tde_datadir}/apps/%{tdm} %define starttde startkde -# 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-%{tde_pkg} Version: %{tde_version} -Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist} Summary: Trinity Base Programs Group: System/GUI/Other URL: http://www.trinitydesktop.org/ |