summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-09-02 23:16:51 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-09-02 23:16:51 +0200
commit9deeed971d2b07c3f855e0af3e6c9f047ae46e89 (patch)
treeb632719193da35bf0ae000bd7e5a7479af58fc71
parent211ce4a54e04ece6ee31c2495abf6702ad83db6d (diff)
downloadtde-packaging-9deeed971d2b07c3f855e0af3e6c9f047ae46e89.tar.gz
tde-packaging-9deeed971d2b07c3f855e0af3e6c9f047ae46e89.zip
RPM Packaging: update R14 dependencies
-rw-r--r--redhat/applications/krusader/krusader-3.5.13.2-ftbfs.patch11
-rw-r--r--redhat/applications/kvirc/kvirc-3.5.13.2-install_directory.patch (renamed from redhat/applications/kvirc/kvirc-14.0.0-install_directory.patch)0
-rw-r--r--redhat/dependencies/arts/arts-14.0.0.spec8
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec3
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec6
-rw-r--r--redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec4
-rw-r--r--redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec9
-rw-r--r--redhat/dependencies/libcaldav/libcaldav-14.0.0.spec20
-rw-r--r--redhat/dependencies/libcarddav/libcarddav-14.0.0.spec11
-rw-r--r--redhat/dependencies/python-tqt/python-tqt-14.0.0.spec7
-rw-r--r--redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec4
-rw-r--r--redhat/dependencies/tqca/tqca-14.0.0.spec5
-rw-r--r--redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec1
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0.spec105
-rwxr-xr-xredhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec7
15 files changed, 107 insertions, 94 deletions
diff --git a/redhat/applications/krusader/krusader-3.5.13.2-ftbfs.patch b/redhat/applications/krusader/krusader-3.5.13.2-ftbfs.patch
deleted file mode 100644
index b34855e51..000000000
--- a/redhat/applications/krusader/krusader-3.5.13.2-ftbfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-krusader-3.5.13.2/krusader/VFS/temp_vfs.cpp.ORI 2013-08-17 18:57:18.857074444 +0200
-+++ trinity-krusader-3.5.13.2/krusader/VFS/temp_vfs.cpp 2013-08-17 18:57:21.352017680 +0200
-@@ -56,7 +56,7 @@
- }
-
- temp_vfs::~temp_vfs(){
-- if( vfs_type == "-iso" ){
-+ if( vfs_type == TEMP ){
- // unmount the ISO image
- KShellProcess umount;
- umount << "umount -f" << tmpDir;
diff --git a/redhat/applications/kvirc/kvirc-14.0.0-install_directory.patch b/redhat/applications/kvirc/kvirc-3.5.13.2-install_directory.patch
index 33bdda5a7..33bdda5a7 100644
--- a/redhat/applications/kvirc/kvirc-14.0.0-install_directory.patch
+++ b/redhat/applications/kvirc/kvirc-3.5.13.2-install_directory.patch
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index 7168e69cb..cd767bd1e 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -17,7 +17,7 @@
Name: trinity-arts
Epoch: 1
Version: 1.5.10
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
License: GPL
Summary: aRts (analog realtime synthesizer) - the TDE sound system
Group: System Environment/Daemons
@@ -197,6 +197,10 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build
cd build
@@ -243,5 +247,5 @@ cd build
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.5.10-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1:1.5.10-2
- Initial release for TDE R14.0.0
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index 13085962b..99f4c20bc 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -6,7 +6,7 @@
Name: trinity-avahi-tqt
-Epoch: 1
+Epoch: 2
Version: 0.6.30
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL
@@ -92,6 +92,7 @@ Development files for %{name}
%build
unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
%configure \
--exec-prefix=%{tde_prefix} \
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index 2ffa3b19c..80617a600 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -6,7 +6,7 @@
%define tde_libdir %{tde_prefix}/%{_lib}
Name: trinity-dbus-1-tqt
-Epoch: 1
+Epoch: 2
Version: 0.9
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL
@@ -90,7 +90,7 @@ Development files for %{name}
%build
-unset QTDIR
+unset QTDIR QTINC QTLIB
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
@@ -124,5 +124,5 @@ cd build
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.9-1
- Initial release for TDE R14.0.0
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
index 583eac275..9353394e6 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -5,7 +5,7 @@
%define tde_libdir %{tde_prefix}/%{_lib}
Name: trinity-dbus-tqt
-Epoch: 1
+Epoch: 2
Version: 0.63
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL
@@ -132,5 +132,5 @@ cd build
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.63-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.63-1
- Initial release for TDE R14.0.0
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
index 3cdb3cd82..c74ac86fc 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -146,7 +146,6 @@ autoreconf -fiv
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%configure \
@@ -157,13 +156,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --disable-rpath \
- --enable-gcc-hidden-visibility
+ --disable-dependency-tracking
%__make %{?_smp_mflags}
diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
index 47b0a98c4..67b2d884c 100644
--- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
+++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
@@ -12,7 +12,7 @@
Name: trinity-libcaldav
Version: 0.6.5
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
Vendor: Trinity Project
URL: http://www.trinitydesktop.org/
@@ -27,6 +27,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch1: libcaldav-14.0.0-older_libcurl.patch
+
BuildRequires: libtool
%if 0%{?rhel} == 4
BuildRequires: evolution28-gtk2-devel
@@ -46,7 +48,7 @@ BuildRequires: libcurl-devel
BuildRequires: %{_lib}curl-devel
%else
# Specific CURL version for TDE on RHEL 5 (and older)
-BuildRequires: trinity-libcurl-devel
+#BuildRequires: trinity-libcurl-devel
%endif
%endif
@@ -73,6 +75,7 @@ Provides: libcaldav-devel = %{version}-%{release}
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch1 -p1 -b .libcurl
./autogen.sh
@@ -81,6 +84,7 @@ Provides: libcaldav-devel = %{version}-%{release}
export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+# RHEL4 stuff
if [ -d /usr/evolution28 ]; then
export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
fi
@@ -133,15 +137,5 @@ fi
%Changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.5-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.5-5
- Initial release for TDE R14.0.0
-
-* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3
-- Renames to 'trinity-libcaldav'
-- Build on MGA2
-
-* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.2
-- Add missing BuildRequires
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.1
-- Initial release for RHEL 6, RHEL 5, and Fedora 15
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
index a4837cd4b..40d457fb1 100644
--- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
@@ -10,7 +10,7 @@
Name: trinity-libcarddav
Version: 0.6.2
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
Vendor: Trinity Project
URL: http://www.trinitydesktop.org/
@@ -133,12 +133,5 @@ fi
%Changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.2-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.2-5
- Initial release for TDE R14.0.0
-
-* Sat Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.2-3
-- Renames to 'trinity-libcarddav'
-- Build on MGA2
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.2-2
-- Initial release for RHEL 6, RHEL 5, and Fedora 15
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 81d48d0a5..f516327d7 100644
--- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
+++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
@@ -30,12 +30,15 @@ BuildRequires: gcc-c++
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-tqscintilla-devel
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?rhel} || 0%{?fedora}
BuildRequires: sip-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: python-sip
%endif
+%if 0%{?suse_version}
+BuildRequires: python-sip-devel
+%endif
# TDE specific building variables
BuildRequires: trinity-tqt3-devel >= 3.5.0
@@ -137,7 +140,7 @@ packages based on them, like PyTDE.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .ftbfs
+%patch0 -p1
%build
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 3f4137398..a85bae95c 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: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
Summary: TLS plugin for the TQt Cryptographic Architecture
License: LGPLv2+
@@ -57,11 +57,11 @@ contains the TLS plugin.
%build
unset QTDIR
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
./configure \
--qtdir=/usr
+
%__make %{?_smp_mflags}
diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec
index 71dc7e348..19010e5db 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: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
Summary: TQt Cryptographic Architecture
@@ -97,7 +97,6 @@ perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
./configure \
@@ -118,5 +117,5 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-4
- Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
index 227759bc6..134b4e99f 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
@@ -91,6 +91,7 @@ Requires: %{name} = %{version}-%{release}
-e "s|\$(QTDIR)|%{_libdir}/tqt3|" \
-e "s|# DESTDIR|DESTDIR|"
+export QTDIR=%{_libdir}/tqt3
( cd qt; tqmake "DESTDIR=$PWD/../tmplib" )
( cd designer; tqmake )
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 44fffcf34..4abafed20 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -20,12 +20,10 @@ Url: http://www.trinitydesktop.org
Prefix: %{tde_prefix}
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
# [tqt3] Build shared libraries
Patch1: tqt3-14.0.0-shared_lib.patch
-# [tqt3] Fix FTBFS
-Patch2: tqt3-14.0.0-fix_ftbfs.patch
BuildRequires: desktop-file-utils
BuildRequires: libmng-devel
@@ -37,23 +35,38 @@ BuildRequires: giflib-devel
BuildRequires: perl
BuildRequires: sed
BuildRequires: findutils
-BuildRequires: cups-devel
BuildRequires: tar
BuildRequires: freetype-devel
BuildRequires: fontconfig-devel
BuildRequires: gcc-c++
-BuildRequires: libuuid-devel
-BuildRequires: glib2-devel
BuildRequires: make
+BuildRequires: desktop-file-utils
+
+# CUPS support
+BuildRequires: cups-devel
+
+# GLIB2 support
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%define with_glibmainloop 1
+BuildRequires: glib2-devel
+%endif
+
+# UUID support
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+BuildRequires: libuuid-devel
+%endif
+%if 0%{?rhel} == 5
+BuildRequires: e2fsprogs-devel
+%endif
# NAS support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_nas 1
BuildRequires: nas-devel
%endif
# Xrender support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: libXrender-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
@@ -61,7 +74,7 @@ BuildRequires: libxrender-devel
%endif
# Xrandr support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: libXrandr-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
@@ -69,7 +82,7 @@ BuildRequires: libxrandr-devel
%endif
# Xcursor support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: libXcursor-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
@@ -77,7 +90,7 @@ BuildRequires: libxcursor-devel
%endif
# Xinerama support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: libXinerama-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
@@ -85,7 +98,7 @@ BuildRequires: libxinerama-devel
%endif
# Xft support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: libXft-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
@@ -93,7 +106,7 @@ BuildRequires: libxft-devel
%endif
# Xext support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: libXext-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
@@ -101,7 +114,7 @@ BuildRequires: libxext-devel
%endif
# X11 support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: libX11-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
@@ -109,7 +122,7 @@ BuildRequires: libx11-devel
%endif
# SM support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: libSM-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
@@ -117,7 +130,7 @@ BuildRequires: libsm-devel
%endif
# ICE support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: libICE-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
@@ -125,12 +138,12 @@ BuildRequires: libice-devel
%endif
# XT support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: libXt-devel
%endif
# XMU support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: libXmu-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
@@ -138,12 +151,12 @@ BuildRequires: libxmu-devel
%endif
# XI support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: libXi-devel
%endif
# Xorg support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: xorg-x11-proto-devel
%endif
@@ -155,13 +168,24 @@ BuildRequires: mesa-libGLU-devel
%if 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: mesaglu-devel
%endif
+%if 0%{?suse_version}
+BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libGLU-devel
+%endif
-BuildRequires: desktop-file-utils
+# MYSQL support
BuildRequires: mysql-devel
-BuildRequires: postgresql-devel
+
+# unixODBC support
BuildRequires: unixODBC-devel
+
+# SQLITE support
BuildRequires: sqlite-devel
+# POSTGRESQL support
+BuildRequires: postgresql
+BuildRequires: postgresql-devel
+
# Firebird support
%if 0%{?mdkversion} || 0%{?mgaversion}
%define with_ibase 1
@@ -177,6 +201,11 @@ BuildRequires: util-linux
%endif
%endif
+# GCC visibility stuff
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%define EXTRA_CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden
+%endif
+
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Requires: coreutils
@@ -427,30 +456,35 @@ for the TQt 3 toolkit.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .sharedlibs
-%patch2 -p1 -b .ftbfs
# fix variables in 'qmake.conf'
%__sed -i mkspecs/*/qmake.conf \
- -e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT = /usr/include/tqt3|" \
+ -e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT = %{_includedir}/tqt3|" \
-e "s|\$(QTDIR)|/usr|g" \
-e "s|-lqt|-ltqt|g" \
+ -e "s|^QMAKE_CFLAGS =.*|QMAKE_CFLAGS = %{?optflags}|" \
-e "s|^QMAKE_INCDIR =.*|QMAKE_INCDIR = %{_includedir}|" \
-e "s|^QMAKE_LIBDIR =.*|QMAKE_LIBDIR = %{_libdir}|" \
+ -e "s|^QMAKE_RPATH = .*|QMAKE_RPATH =|" \
-e "s|^QMAKE_STRIP =.*|QMAKE_STRIP =|" \
-e "s|^QMAKE_STRIPFLAGS_LIB +=.*|QMAKE_STRIPFLAGS_LIB +=|" \
-
+ -e "s|^QMAKE_MOC =.*|QMAKE_MOC = %{_bindir}/tqmoc|" \
+ -e "s|^QMAKE_UIC =.*|QMAKE_UIC = %{_bindir}/tquic|" \
+ -e "s|^QMAKE_INCDIR_QT =.*|QMAKE_INCDIR_QT = %{_includedir}/tqt3|" \
+ -e "s|^QMAKE_LIBDIR_QT =.*|QMAKE_LIBDIR_QT = %{_libdir}|" \
%build
unset QTDIR QTINC QTLIB
export QTDIR=$(pwd)
-export PATH=${QTDIR}/stripbin:${QTDIR}/bin:$PATH
+export PATH=${QTDIR}/bin:$PATH
export MANPATH=${QTDIR}/doc/man:$MANPATH
-export LD_LIBRARY_PATH=${QTDIR}/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH="${QTDIR}/lib"
# Checks for supplementary include dir
INCDIRS=""
for d in \
%{_includedir}/fontconfig \
+ %{_includedir}/pgsql \
%{_includedir}/pgsql/server \
%{_includedir}/postgresql/server \
%{_includedir}/Xft2 \
@@ -536,15 +570,9 @@ echo yes | ./configure \
\
-lfontconfig \
-inputmethod \
- -glibmainloop \
- -debug
-
-
-# Fix bad headers
-rm -rf include/ntqinputcontext.h include/ntqinputcontextfactory.h include/ntqinputcontextplugin.h
-ln -s ../src/kernel/ntqinputcontext.h include/ntqinputcontext.h
-ln -s ../src/inputmethod/ntqinputcontextfactory.h include/ntqinputcontextfactory.h
-ln -s ../src/inputmethod/ntqinputcontextplugin.h include/ntqinputcontextplugin.h
+ %{?with_glibmainloop:-glibmainloop} \
+ -debug \
+ -v
# proceed
%__make %{?_smp_mflags} sub-src sub-plugins sub-tools
@@ -562,9 +590,12 @@ ln -s ../src/inputmethod/ntqinputcontextplugin.h include/ntqinputcontextplugin.h
%install
%__rm -rf %{buildroot}
export QTDIR=$(pwd)
-export PATH=${QTDIR}/stripbin:${QTDIR}/bin:$PATH
+export PATH=${QTDIR}/bin:$PATH
+# Installs 'libtqt-mt.so.3' library
%__make -C src INSTALL_ROOT=%{?buildroot} install_target
+
+# Installs all the remaining
%__make INSTALL_ROOT=%{?buildroot} install
%__make INSTALL_ROOT=%{?buildroot} plugins-install
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 060b89b04..4624ccbe9 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -49,9 +49,11 @@ BuildRequires: libXi6-devel
Obsoletes: tqtinterface < %{version}-%{release}
Provides: tqtinterface = %{version}-%{release}
+
%description
Trinity QT Interface
+
%post
/sbin/ldconfig || :
@@ -138,9 +140,12 @@ cd build
-DQT_INCLUDE_DIRS="%{tde_includedir}/tqt3" \
-DQT_LIBRARY_DIRS="%{tde_libdir}" \
\
- -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+ -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+\
-DCMAKE_LIBRARY_PATH="%{tde_libdir}" \
-DCMAKE_INCLUDE_PATH="%{tde_includedir}" \
\