summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-07-23 11:24:47 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-07-23 11:24:47 +0200
commita4fc005efadcb5b34959d0bb8448db3b5e030157 (patch)
tree128366696ef198dd1df69e47295ad203a8c228b1 /redhat/dependencies
parent74621724ffaa3c693ea3dc84493a9010326ee11a (diff)
downloadtde-packaging-a4fc005efadcb5b34959d0bb8448db3b5e030157.tar.gz
tde-packaging-a4fc005efadcb5b34959d0bb8448db3b5e030157.zip
RPM Packaging: R14 updates
Diffstat (limited to 'redhat/dependencies')
-rw-r--r--redhat/dependencies/python-tqt/python-tqt-14.0.0.spec3
-rw-r--r--redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec21
-rw-r--r--redhat/dependencies/tqca/tqca-14.0.0.spec1
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0.spec3
4 files changed, 15 insertions, 13 deletions
diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
index e86012b01..36323f4e2 100644
--- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
+++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
@@ -141,6 +141,7 @@ packages based on them, like PyKDE.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch0 -p1 -b .ftbfs
+
%build
unset QTDIR QTINC QTLIB
@@ -171,8 +172,6 @@ echo yes | python ../configure.py \
%__rm -rf %{?buildroot}
-
%changelog
* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE R14, using 'tqt3' instead of 'qt3'
-
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 1112dfbbb..b8bbfb5c8 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
@@ -14,19 +14,19 @@
%define _docdir %{tde_datadir}/doc
-Name: trinity-tqca-tls
-Version: 1.0
-Release: 3%{?dist}%{?_variant}
+Name: trinity-tqca-tls
+Version: 1.0
+Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
-Summary: TLS plugin for the TQt Cryptographic Architecture
-License: LGPLv2+
-Group: Applications/Internet
+Summary: TLS plugin for the TQt Cryptographic Architecture
+License: LGPLv2+
+Group: Applications/Internet
-URL: http://delta.affinix.com/qca/
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://delta.affinix.com/qca/
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
@@ -79,6 +79,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%doc README COPYING
%{_libdir}/tqt3/plugins/crypto/libqca-tls.so
+
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
- Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec
index 083cfcf91..1a0686928 100644
--- a/redhat/dependencies/tqca/tqca-14.0.0.spec
+++ b/redhat/dependencies/tqca/tqca-14.0.0.spec
@@ -117,7 +117,6 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%__rm -rf $RPM_BUILD_ROOT
-
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
- Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 9c7169d79..aa2813914 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -26,6 +26,8 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch1: tqt3-14.0.0-shared_lib.patch
# [tqt3] Fix FTBFS
Patch2: tqt3-14.0.0-fix_ftbfs.patch
+# [tqt3] Fix GLIB initialization
+Patch3: tqt3-14.0.0-fix_glib_init.patch
BuildRequires: desktop-file-utils
BuildRequires: libmng-devel
@@ -428,6 +430,7 @@ for the TQt 3 toolkit.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .sharedlibs
%patch2 -p1 -b .ftbfs
+%patch3 -p1 -b .glibinit
%build
unset QTDIR QTINC QTLIB