diff options
Diffstat (limited to 'redhat/dependencies/tqca')
| -rw-r--r-- | redhat/dependencies/tqca/tqca-3.5.13.2.spec | 164 | ||||
| -rw-r--r-- | redhat/dependencies/tqca/tqca.spec (renamed from redhat/dependencies/tqca/tqca-14.0.0.spec) | 45 |
2 files changed, 28 insertions, 181 deletions
diff --git a/redhat/dependencies/tqca/tqca-3.5.13.2.spec b/redhat/dependencies/tqca/tqca-3.5.13.2.spec deleted file mode 100644 index 629131436..000000000 --- a/redhat/dependencies/tqca/tqca-3.5.13.2.spec +++ /dev/null @@ -1,164 +0,0 @@ -# -# 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_pkg tqca -%define tde_prefix /opt/trinity -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} - -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%define libtqca %{_lib}tqca -%else -%define libtqca libtqca -%endif - - -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 1.0 -Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} -Summary: TQt Cryptographic Architecture -Group: Development/Libraries/C and C++ -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Desktop -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: tqca-3.5.13.2.tar.gz -Source1: trinity-tqca-rpmlintrc - -BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 -BuildRequires: gcc-c++ - -%description -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! - -########## - -%package -n %{libtqca}1 -Summary: TQt Cryptographic Architecture -Group: Development/Libraries/C and C++ - -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 -n %{libtqca}1 -/sbin/ldconfig - -%files -n %{libtqca}1 -%defattr(-,root,root,-) -%doc COPYING README TODO -%{_libdir}/libqca.so.1 -%{_libdir}/libqca.so.1.0 -%{_libdir}/libqca.so.1.0.0 - -########## - -%package -n %{libtqca}-devel -Summary: TQt Cryptographic Architecture development files -Group: Development/Libraries/C and C++ -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 -n %{libtqca}-devel -This packages contains the development files for TQCA - -%post -n %{libtqca}-devel -/sbin/ldconfig - -%postun -n %{libtqca}-devel -/sbin/ldconfig - -%files -n %{libtqca}-devel -%defattr(-,root,root,-) -%{_includedir}/qca.h -%{_libdir}/libqca.so - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n tqca-3.5.13.2 - -# Fix 'lib64' library directory -perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh - -./configure \ - --prefix=%{_prefix} \ - --qtdir=${QTDIR} \ - --debug - -%__make %{?_smp_mflags} - - -%install -%__rm -rf $RPM_BUILD_ROOT -%__make install INSTALL_ROOT=$RPM_BUILD_ROOT - - -%clean -%__rm -rf $RPM_BUILD_ROOT - - -%changelog diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca.spec index a6e59e772..efb32c3c6 100644 --- a/redhat/dependencies/tqca/tqca-14.0.0.spec +++ b/redhat/dependencies/tqca/tqca.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tqca %define tde_prefix /opt/trinity @@ -56,6 +56,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: trinity-tqca-rpmlintrc BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 +BuildRequires: cmake BuildRequires: gcc-c++ %description @@ -98,9 +99,8 @@ application! %files -n %{libtqca}1 %defattr(-,root,root,-) %doc COPYING README TODO -%{_libdir}/libqca.so.1 -%{_libdir}/libqca.so.1.0 -%{_libdir}/libqca.so.1.0.0 +%{_libdir}/libtqca.so.1 +%{_libdir}/libtqca.so.1.0.0 ########## @@ -124,8 +124,11 @@ This packages contains the development files for TQCA %files -n %{libtqca}-devel %defattr(-,root,root,-) -%{_includedir}/qca.h -%{_libdir}/libqca.so +%{_includedir}/tqt3/tqca.h +%{_includedir}/tqt3/tqcaprovider.h +%{_libdir}/libtqca.la +%{_libdir}/libtqca.so +%{_libdir}/pkgconfig/tqca.pc ########## @@ -145,23 +148,31 @@ perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra %build unset QTDIR QTINC QTLIB -./configure \ - --prefix=%{_prefix} \ - --qtdir=/usr \ - --debug +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DINCLUDE_INSTALL_DIR=%{_includedir} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + \ + -DWITH_ALL_OPTIONS="ON" \ + .. -# Workaround strange tqmake behaviour in RHEL5 -%if 0%{?rhel} == 5 -%__sed -i "Makefile" -e "s|..\/..\/..\/..|%{_prefix}|g" -%endif - -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install %__rm -rf $RPM_BUILD_ROOT -%__make install INSTALL_ROOT="${RPM_BUILD_ROOT}/" +%__make install DESTDIR=%{?buildroot} -C build %clean |