From 98fb5463ab641be48edac73740b1e716c2aaefb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Fri, 7 Nov 2014 23:28:36 +0100 Subject: RPM packaging: update tqca --- redhat/dependencies/tqca/tqca-14.0.0.spec | 126 +++++++++++++++++--------- redhat/dependencies/tqca/tqca-3.5.13.2.spec | 131 ++++++++++++++++++---------- 2 files changed, 173 insertions(+), 84 deletions(-) (limited to 'redhat/dependencies') diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec index 66c0c5f35..1a5732033 100644 --- a/redhat/dependencies/tqca/tqca-14.0.0.spec +++ b/redhat/dependencies/tqca/tqca-14.0.0.spec @@ -1,39 +1,58 @@ -# 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 - +# +# spec file for package tqca (version R14.0.0) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# 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/ +# + +# TDE variables +%define tde_epoch 2 %define tde_version 14.0.0 - -%define tde_bindir %{tde_prefix}/bin +%define tde_pkg tqca +%define tde_prefix /opt/trinity %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} -%define tde_datadir %{tde_prefix}/share - -%define tde_tdeincludedir %{tde_includedir}/tde - -%define _docdir %{tde_datadir}/doc +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%define libtqca %{_lib}tqca +%else +%define libtqca libtqca +%endif -Name: trinity-tqca -Version: 1.0 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -Summary: TQt Cryptographic Architecture +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.0 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: TQt Cryptographic Architecture +Group: System Environment/Libraries +URL: http://www.trinitydesktop.org/ -Group: System Environment/Libraries -License: LGPLv2+ +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -URL: http://www.trinitydesktop.org/ -Packager: Francois Andriot +#Vendor: Trinity Desktop +#Packager: Francois Andriot -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: libtqt4-devel >= 2:4.2.0 +BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 %description @@ -46,37 +65,64 @@ on any particular cryptographic library. This allows one to easily change or upgrade crypto implementations without even needing to recompile the application! -%post +########## + +%package -n %{libtqca}1 +Summary: TQt Cryptographic Architecture +Group: System Environment/Libraries + +Obsoletes: trinity-libtqca < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-libtqca = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: libtqca = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: libtqca1 = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n %{libtqca}1 +Taking a hint from the similarly-named Java Cryptography Architecture, +TQCA aims to provide a straightforward and cross-platform crypto API, +using TQt datatypes and conventions. TQCA separates the API from the +implementation, using plugins known as Providers. The advantage of this +model is to allow applications to avoid linking to or explicitly depending +on any particular cryptographic library. This allows one to easily change +or upgrade crypto implementations without even needing to recompile the +application! + +%post -n %{libtqca}1 /sbin/ldconfig -%postun +%postun -n %{libtqca}1 /sbin/ldconfig -%files +%files -n %{libtqca}1 %defattr(-,root,root,-) %doc COPYING README TODO -%{tde_libdir}/libqca.so.* +%{_libdir}/libqca.so.1 +%{_libdir}/libqca.so.1.0 +%{_libdir}/libqca.so.1.0.0 ########## -%package devel -Summary: TQt Cryptographic Architecture development files -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +%package -n %{libtqca}-devel +Summary: TQt Cryptographic Architecture development files +Group: Development/Libraries +Requires: %{libtqca}1 = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: trinity-libtqca-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-libtqca-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: libtqca-devel = %{?epoch:%{epoch}:}%{version}-%{release} -%description devel +%description -n %{libtqca}-devel This packages contains the development files for TQCA -%post devel +%post -n %{libtqca}-devel /sbin/ldconfig -%postun devel +%postun -n %{libtqca}-devel /sbin/ldconfig -%files devel +%files -n %{libtqca}-devel %defattr(-,root,root,-) -%{tde_includedir}/qca.h -%{tde_libdir}/libqca.so +%{_includedir}/qca.h +%{_libdir}/libqca.so ########## @@ -99,7 +145,7 @@ export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" ./configure \ - --prefix=%{tde_prefix} \ + --prefix=%{_prefix} \ --qtdir=/usr \ --debug @@ -116,5 +162,5 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot - 1.0-4 +* Fri Jul 05 2013 Francois Andriot - 2:1.0-1 - Initial release for TDE 14.0.0 diff --git a/redhat/dependencies/tqca/tqca-3.5.13.2.spec b/redhat/dependencies/tqca/tqca-3.5.13.2.spec index ba8acba8a..00035feb2 100644 --- a/redhat/dependencies/tqca/tqca-3.5.13.2.spec +++ b/redhat/dependencies/tqca/tqca-3.5.13.2.spec @@ -1,41 +1,59 @@ -# 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 - +# +# spec file for package tqca (version 3.5.13-SRU) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# 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/ +# + +# TDE variables +%define tde_epoch 1 %define tde_version 3.5.13.2 - -%define tde_bindir %{tde_prefix}/bin +%define tde_pkg tqca +%define tde_prefix /opt/trinity %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} -%define tde_datadir %{tde_prefix}/share - -%define tde_tdeincludedir %{tde_includedir}/tde - -%define _docdir %{tde_datadir}/doc +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%define libtqca %{_lib}tqca +%else +%define libtqca libtqca +%endif -Name: trinity-tqca -Version: 1.0 -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} -Summary: TQt Cryptographic Architecture +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 1.0 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Summary: TQt Cryptographic Architecture +Group: System Environment/Libraries +URL: http://www.trinitydesktop.org/ -Group: System Environment/Libraries -License: LGPLv2+ +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -#URL: http://delta.affinix.com/qca -URL: http://www.trinitydesktop.org/ -Packager: Francois Andriot +#Vendor: Trinity Desktop +#Packager: Francois Andriot -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: tqca-3.5.13.2.tar.gz -BuildRequires: qt3-devel >= 3.3.8.d -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 + %description Taking a hint from the similarly-named Java Cryptography Architecture, @@ -47,41 +65,68 @@ on any particular cryptographic library. This allows one to easily change or upgrade crypto implementations without even needing to recompile the application! -%post +########## + +%package -n %{libtqca}1 +Summary: TQt Cryptographic Architecture +Group: System Environment/Libraries + +Obsoletes: trinity-libtqca < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-libtqca = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: libtqca = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: libtqca1 = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n %{libtqca}1 +Taking a hint from the similarly-named Java Cryptography Architecture, +TQCA aims to provide a straightforward and cross-platform crypto API, +using TQt datatypes and conventions. TQCA separates the API from the +implementation, using plugins known as Providers. The advantage of this +model is to allow applications to avoid linking to or explicitly depending +on any particular cryptographic library. This allows one to easily change +or upgrade crypto implementations without even needing to recompile the +application! + +%post -n %{libtqca}1 /sbin/ldconfig -%postun +%postun -n %{libtqca}1 /sbin/ldconfig -%files +%files -n %{libtqca}1 %defattr(-,root,root,-) %doc COPYING README TODO -%{tde_libdir}/libqca.so.* +%{_libdir}/libqca.so.1 +%{_libdir}/libqca.so.1.0 +%{_libdir}/libqca.so.1.0.0 ########## -%package devel -Summary: TQt Cryptographic Architecture development files -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +%package -n %{libtqca}-devel +Summary: TQt Cryptographic Architecture development files +Group: Development/Libraries +Requires: %{libtqca}1 = %{?epoch:%{epoch}:}%{version}-%{release} -%description devel +Obsoletes: trinity-libtqca-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-libtqca-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: libtqca-devel = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n %{libtqca}-devel This packages contains the development files for TQCA -%post devel +%post -n %{libtqca}-devel /sbin/ldconfig -%postun devel +%postun -n %{libtqca}-devel /sbin/ldconfig -%files devel +%files -n %{libtqca}-devel %defattr(-,root,root,-) -%{tde_includedir}/qca.h -%{tde_libdir}/libqca.so +%{_includedir}/qca.h +%{_libdir}/libqca.so ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -98,11 +143,10 @@ perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra unset QTDIR QTINC QTLIB . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" ./configure \ - --prefix=%{tde_prefix} \ + --prefix=%{_prefix} \ --qtdir=${QTDIR} \ --debug @@ -118,7 +162,6 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" %__rm -rf $RPM_BUILD_ROOT - %changelog * Fri Aug 16 2013 Francois Andriot - 1.0-3 - Build for Fedora 19 -- cgit v1.2.3