summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies/tqca-tls
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2018-11-27 21:34:48 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2018-11-27 21:34:48 +0100
commita615d19df88eb2e989316b480519161945dbc7dc (patch)
tree369970b98042998b86c11024598155e037b76fec /redhat/dependencies/tqca-tls
parent76a93e0011ade1583a1ec672f33411dfd35454f3 (diff)
downloadtde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.tar.gz
tde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.zip
RPM: merge redhat directory with master branch
Diffstat (limited to 'redhat/dependencies/tqca-tls')
-rw-r--r--redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec10
-rw-r--r--redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec16
2 files changed, 9 insertions, 17 deletions
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
index d078dee46..0323731dc 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tqca-tls (version R14.0.0)
+# spec file for package tqca-tls (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,12 +12,14 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tqca-tls
%define tde_prefix /opt/trinity
%define tde_includedir %{tde_prefix}/include
@@ -33,7 +35,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.0
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: TLS plugin for the TQt Cryptographic Architecture
Group: Applications/Internet
URL: http://delta.affinix.com/qca/
@@ -114,5 +116,3 @@ unset QTDIR QTINC QTLIB
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0-1
-- Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
index 808415d93..8892b1ec2 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# TDE variables
@@ -24,16 +24,16 @@
%define tde_libdir %{tde_prefix}/%{_lib}
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
-%define libtqt3 %{_lib}tqt3
+%define libtqt3 %{_lib}qt3
%else
-%define libtqt3 libtqt3
+%define libtqt3 libqt3
%endif
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.0
-Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}
Summary: TLS plugin for the TQt Cryptographic Architecture
Group: Applications/Internet
URL: http://delta.affinix.com/qca/
@@ -120,11 +120,3 @@ unset QTDIR QTINC QTLIB
%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
-- Build for Fedora 19
-
-* Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Renames TQCA to QCA in source code
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial release for TDE 3.5.13.2