From 8e06f1c504ca3e13e3d5b239638f7b3a7ce4aa0b Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Wed, 17 Jul 2013 10:22:23 +0200 Subject: RPM Packaging: some R14 updates --- redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec | 6 ++-- redhat/dependencies/tqca/tqca-14.0.0.spec | 6 ++-- redhat/dependencies/tqt3/tqt3-14.0.0.spec | 41 ++++++++++++++--------- 3 files changed, 30 insertions(+), 23 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 be6f406dc..4e79cdf00 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec @@ -16,7 +16,7 @@ Name: trinity-tqca-tls Version: 1.0 -Release: 2%{?dist}%{?_variant} +Release: 3%{?dist}%{?_variant} Summary: TLS plugin for the TQt Cryptographic Architecture License: LGPLv2+ @@ -80,8 +80,6 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" %{_libdir}/tqt3/plugins/crypto/libqca-tls.so %changelog -* Thu Jun 27 2013 Francois Andriot - 1.0-2 +* Fri Jul 05 2013 Francois Andriot - 1.0-3 - Initial build for TDE 14.0.0 -* Mon Jun 03 2013 Francois Andriot - 1.0-1 -- Initial build for TDE 3.5.13.2 diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec index 9cc4131ad..52ce3decd 100644 --- a/redhat/dependencies/tqca/tqca-14.0.0.spec +++ b/redhat/dependencies/tqca/tqca-14.0.0.spec @@ -17,7 +17,7 @@ Name: trinity-tqca Version: 1.0 -Release: 2%{?dist}%{?_variant} +Release: 3%{?dist}%{?_variant} Summary: TQt Cryptographic Architecture @@ -119,5 +119,5 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" %changelog -* Mon Jun 03 2013 Francois Andriot - 1.0-1 -- Initial build for TDE 3.5.13.2 +* Fri Jul 05 2013 Francois Andriot - 1.0-3 +- Initial build 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 6194aee16..7796ab647 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -49,6 +49,15 @@ BuildRequires: cups-devel BuildRequires: tar BuildRequires: freetype-devel BuildRequires: fontconfig-devel +BuildRequires: gcc-c++ +BuildRequires: libuuid-devel +BuildRequires: glib2-devel + +# NAS support +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define with_nas 1 +BuildRequires: nas-devel +%endif # Xrender support %if 0%{?rhel} || 0%{?fedora} @@ -219,8 +228,8 @@ applications, as well as the README files for TQt 3. %{tde_libdir}/tqt3/plugins/inputmethods/libqsimple.so %{tde_libdir}/tqt3/plugins/inputmethods/libqxim.so %{tde_libdir}/libtqt-mt.so.3 -%{tde_libdir}/libtqt-mt.so.3.3 -%{tde_libdir}/libtqt-mt.so.3.3.8 +%{tde_libdir}/libtqt-mt.so.3.5 +%{tde_libdir}/libtqt-mt.so.3.5.0 %{tde_libdir}/libtqt-mt.la %{tde_libdir}/libtqui.so.1 %{tde_libdir}/libtqui.so.1.0 @@ -238,7 +247,7 @@ applications, as well as the README files for TQt 3. ########## %package config -Summary: Graphical configuration tool for programs using Qt 3 +Summary: Graphical configuration tool for programs using TQt 3 Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} @@ -258,7 +267,7 @@ This package contains a graphical configuration tool for programs using TQt 3. ########## %package devel -Summary: Development files for the Qt 3 GUI toolkit +Summary: Development files for the TQt 3 GUI toolkit Group: Development/Libraries Requires: %{name} = %{version}-%{release} @@ -387,7 +396,7 @@ sqlite driver for TQt 3's SQL classes (QSQL) ########## -%if %{?with_ibase} +%if 0%{?with_ibase} %package ibase Summary: ibase drivers for TQt 3's SQL classes Group: System Environment/Libraries @@ -404,7 +413,7 @@ ibase driver for TQt 3's SQL classes (QSQL) ########## %package designer -Summary: In3erface designer (IDE) for the Qt 3 toolkit +Summary: In3erface designer (IDE) for the TQt 3 toolkit Group: Development/Tools Requires: %{name}-devel = %{version}-%{release} @@ -435,13 +444,13 @@ export LD_LIBRARY_PATH=${QTDIR}/lib:$LD_LIBRARY_PATH # Checks for supplementary include dir INCDIRS="" for d in \ - /usr/include/fontconfig \ - /usr/include/pgsql/server \ - /usr/include/postgresql/server \ - /usr/include/Xft2 \ - /usr/include/Xft2/X11/Xft \ - /usr/include/mysql \ - /usr/include/libpng15 \ + %{_includedir}/fontconfig \ + %{_includedir}/pgsql/server \ + %{_includedir}/postgresql/server \ + %{_includedir}/Xft2 \ + %{_includedir}/Xft2/X11/Xft \ + %{_includedir}/mysql \ + %{_includedir}/libpng15 \ ; do if [ -d "${d}" ]; then INCDIRS="${INCDIRS} -I${d}" @@ -503,7 +512,7 @@ echo yes | ./configure \ -system-libpng \ -system-libmng \ -system-libjpeg \ - -system-nas-sound \ + %{?with_nas:-system-nas-sound} %{?!with_nas:-no-nas-sound} \ \ -enable-opengl \ -dlopen-opengl \ @@ -544,7 +553,7 @@ ln -s ../src/inputmethod/ntqinputcontextplugin.h include/ntqinputcontextplugin.h # fix QTDIR in 'qmake.conf' %__sed -i mkspecs/*/qmake.conf \ - -e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT = \$(QTDIR)/include/tqt3|" \ + -e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT = /usr/include/tqt3|" \ -e "s|\$(QTDIR)|/usr|g" \ -e "s|-lqt|-ltqt|g" @@ -574,5 +583,5 @@ export PATH=${QTDIR}/stripbin:${QTDIR}/bin:$PATH %changelog -* Mon Feb 13 2012 Francois Andriot - 3.5.0-1 +* Fri Jul 05 2013 Francois Andriot - 3.5.0-1 - Initial build for TDE R14.0.0 -- cgit v1.2.3