summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/dependencies')
-rw-r--r--redhat/dependencies/arts/arts-14.0.0.spec64
-rw-r--r--redhat/dependencies/arts/arts-3.5.12.spec153
-rw-r--r--redhat/dependencies/arts/arts-3.5.13-enable_jack.patch52
-rw-r--r--redhat/dependencies/arts/arts-3.5.13-enable_oss.patch139
-rw-r--r--redhat/dependencies/arts/arts-3.5.13.1.spec182
-rw-r--r--redhat/dependencies/arts/arts-3.5.13.2-debug.patch12
-rw-r--r--redhat/dependencies/arts/arts-3.5.13.2-fix_esd_buffer.patch20
-rw-r--r--redhat/dependencies/arts/arts-3.5.13.spec201
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec77
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec156
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec154
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec36
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec115
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec116
-rw-r--r--redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec38
-rw-r--r--redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec125
-rw-r--r--redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec135
-rw-r--r--redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec182
-rw-r--r--redhat/dependencies/sip4-tqt/sip4-tqt.spec2
-rw-r--r--redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec3
-rw-r--r--redhat/dependencies/tqca/tqca-14.0.0.spec5
l---------redhat/dependencies/tqt3/assistant-tqt3.desktop1
l---------redhat/dependencies/tqt3/designer-tqt3.desktop1
l---------redhat/dependencies/tqt3/linguist-tqt3.desktop1
-rw-r--r--redhat/dependencies/tqt3/tqassistant.desktop13
-rw-r--r--redhat/dependencies/tqt3/tqdesigner.desktop78
-rw-r--r--redhat/dependencies/tqt3/tqlinguist.desktop26
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0.spec284
l---------redhat/dependencies/tqt3/tqt3config.desktop1
-rw-r--r--redhat/dependencies/tqt3/tqtconfig.desktop13
-rwxr-xr-xredhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec53
31 files changed, 560 insertions, 1878 deletions
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index 184c5b24b..781df345c 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -15,28 +15,27 @@
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
-# 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
-
-# TDE specific variables
+# TDE variables
%define tde_version 14.0.0
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%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 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
+
+
Name: trinity-arts
-Epoch: 1
+Epoch: 2
Version: 1.5.10
Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
-Summary: aRts (analog realtime synthesizer) - the TDE sound system
+Summary: ARTS (analog realtime synthesizer) - the TDE sound system
Group: System Environment/Daemons
URL: http://www.trinitydesktop.org/
@@ -54,7 +53,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: libtqt4-devel >= 1:4.2.0
+BuildRequires: libtqt4-devel >= 2:4.2.0
+BuildRequires: trinity-filesystem >= %{tde_version}
+Requires: trinity-filesystem >= %{tde_version}
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
@@ -117,7 +118,7 @@ BuildRequires: libmad-devel
%define with_pulseaudio 1
%endif
-Requires: libtqt4 >= 1:4.2.0
+Requires: libtqt4 >= 2:4.2.0
Requires: audiofile
%if "%{?tde_prefix}" == "/usr"
@@ -139,17 +140,8 @@ playing a wave file with some effects.
%files
%defattr(-,root,root,-)
%doc COPYING.LIB
-%dir %{tde_prefix}
-%dir %{tde_bindir}
-%dir %{tde_datadir}
-%dir %{tde_datadir}/config
-%dir %{tde_datadir}/doc
-%dir %{tde_libdir}
%dir %{tde_libdir}/mcop
%dir %{tde_libdir}/mcop/Arts
-%dir %{tde_libdir}/pkgconfig
-%dir %{tde_includedir}
-%dir %{tde_tdeincludedir}
%{tde_libdir}/mcop/Arts/*
%{tde_libdir}/mcop/*.mcopclass
%{tde_libdir}/mcop/*.mcoptype
@@ -174,12 +166,39 @@ playing a wave file with some effects.
%package devel
Group: Development/Libraries
-Summary: aRts (analog realtime synthesizer) - the TDE sound system (Development files)
+Summary: ARTS (analog realtime synthesizer) - the TDE sound system (Development files)
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{?tde_prefix}" == "/usr"
Obsoletes: arts-devel
%endif
+Requires: alsa-lib-devel
+Requires: audiofile-devel
+Requires: libvorbis-devel
+Requires: esound-devel
+
+%if 0%{?with_libmad}
+%if 0%{?mdkversion} || 0%{?mgaversion}
+Requires: %{_lib}mad-devel
+%endif
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+Requires: libmad-devel
+%endif
+%endif
+
+%if 0%{?with_jack}
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Requires: %{_lib}jack-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora}
+Requires: jack-audio-connection-kit-devel
+%endif
+%if 0%{?suse_version}
+Requires: libjack-devel
+%endif
+%endif
+
+
%description devel
arts (analog real-time synthesizer) is the sound system of TDE.
@@ -236,7 +255,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
##########
-
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
diff --git a/redhat/dependencies/arts/arts-3.5.12.spec b/redhat/dependencies/arts/arts-3.5.12.spec
deleted file mode 100644
index 1a72133d6..000000000
--- a/redhat/dependencies/arts/arts-3.5.12.spec
+++ /dev/null
@@ -1,153 +0,0 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.12
-%endif
-%define release 6
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-
-
-Name: trinity-arts
-Version: %{?version}
-Release: %{?release}%{?dist}%{?_variant}
-License: GPL
-Summary: aRts (analog realtime synthesizer) - the KDE sound system
-Group: System Environment/Daemons
-
-Vendor: Trinity Project
-URL: http://www.trinitydesktop.org/
-Packager: Francois Andriot <francois.andriot@free.fr>
-
-Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: arts-%{version}.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: audiofile-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: glib2-devel
-BuildRequires: libtool-ltdl-devel
-BuildRequires: gsl-devel
-
-Requires: tqtinterface
-Requires: audiofile
-
-%if "%{?_prefix}" == "/usr"
-Obsoletes: arts
-%endif
-
-%description
-arts (analog real-time synthesizer) is the sound system of KDE 3.
-
-The principle of arts is to create/process sound using small modules which do
-certain tasks. These may be create a waveform (oscillators), play samples,
-filter data, add signals, perform effects like delay/flanger/chorus, or
-output the data to the soundcard.
-
-By connecting all those small modules together, you can perform complex
-tasks like simulating a mixer, generating an instrument or things like
-playing a wave file with some effects.
-
-
-%package devel
-Group: Development/Libraries
-Summary: %{name} - Development files
-Requires: %{name} = %{version}-%{release}
-%if "%{?_prefix}" == "/usr"
-Obsoletes: arts-devel
-%endif
-
-%description devel
-Development files for %{name}
-
-%prep
-%setup -q -n dependencies/arts
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-%build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
- --disable-rpath \
- --disable-debug --disable-warnings \
- --disable-dependency-tracking \
- --enable-new-ldflags \
- --disable-libmad \
- --with-alsa \
- --enable-final \
- --enable-closure \
- --with-extra-includes=%{_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-%clean
-%__rm -rf %{?buildroot}
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING.LIB
-%dir %{_libdir}/mcop
-%dir %{_libdir}/mcop/Arts
-%{_libdir}/mcop/Arts/*
-%{_libdir}/mcop/*.mcopclass
-%{_libdir}/mcop/*.mcoptype
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-%{_bindir}/artscat
-%{_bindir}/artsd
-%{_bindir}/artsdsp
-%{_bindir}/artsplay
-%{_bindir}/artsrec
-%{_bindir}/artsshell
-%{_bindir}/artswrapper
-
-%files devel
-%defattr(-,root,root,-)
-%{_bindir}/mcopidl
-%dir %{_includedir}
-%{_includedir}/arts/
-%{_includedir}/artsc/
-%{_bindir}/artsc-config
-%{_libdir}/lib*.so
-
-
-%changelog
-* Fri Sep 16 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
-- Add support for RHEL 5.
-
-* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
-- Add "Group" field
-
-* Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
-- Import to GIT
-- Removes cmake stuff, build with autotools only
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
-- Correct macro to install under "/opt", if desired
-
-* Sat Dec 18 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
-- Add cmake support
-- Add some BuildRequires
-
-* Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/trinity)
-- Add '--with-extra-includes=%{_includedir}/tqt'
-
-* Tue Dec 07 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
-- Initial version
-
diff --git a/redhat/dependencies/arts/arts-3.5.13-enable_jack.patch b/redhat/dependencies/arts/arts-3.5.13-enable_jack.patch
deleted file mode 100644
index 28dfa50a5..000000000
--- a/redhat/dependencies/arts/arts-3.5.13-enable_jack.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Nuar arts.ORI/CMakeLists.txt arts/CMakeLists.txt
---- arts.ORI/CMakeLists.txt 2011-12-16 20:58:30.000000000 +0100
-+++ arts/CMakeLists.txt 2011-12-16 20:59:20.462377316 +0100
-@@ -34,6 +34,7 @@
- option( WITH_VORBIS "Enable Ogg/Vorbis support" ON )
- option( WITH_MAD "Enable MAD mp3 decoder support" ON )
- option( WITH_ESOUND "Enable ESOUND support" OFF )
-+option( WITH_JACK "Enable JACK support" OFF )
-
-
- ##### paths setup ###############################
-@@ -163,6 +164,19 @@
- endif( WITH_ESOUND )
-
-
-+##### check for JACK ############################
-+
-+set( HAVE_LIBJACK 0 )
-+if( WITH_JACK )
-+ pkg_search_module( LIBJACK jack )
-+ if( LIBJACK_FOUND )
-+ set( HAVE_LIBJACK 1 )
-+ else( LIBJACK_FOUND )
-+ message(FATAL_ERROR "\nJACK support is requested, but `jack.pc` was not found" )
-+ endif( LIBJACK_FOUND )
-+endif( WITH_JACK )
-+
-+
- ##### check for glib/gthread modules ############
-
- pkg_search_module( GLIB2 glib-2.0 )
-diff -Nuar arts.ORI/config.h.cmake arts/config.h.cmake
---- arts.ORI/config.h.cmake 2011-12-16 20:58:30.000000000 +0100
-+++ arts/config.h.cmake 2011-12-16 20:59:24.095343176 +0100
-@@ -34,3 +34,5 @@
- #cmakedefine HAVE_SYS_SOUNDCARD_H 1
- #cmakedefine HAVE_LIBPTHREAD 1
- #define HAVE_IOCTL_INT_ULONGINT_DOTS 3
-+
-+#cmakedefine HAVE_LIBJACK 1
-diff -Nuar arts.ORI/flow/CMakeLists.txt arts/flow/CMakeLists.txt
---- arts.ORI/flow/CMakeLists.txt 2011-12-16 21:00:29.000000000 +0100
-+++ arts/flow/CMakeLists.txt 2011-12-16 21:02:29.831594171 +0100
-@@ -66,7 +66,7 @@
- tde_add_library( ${target} SHARED
- SOURCES ${${target}_SRCS}
- VERSION 1.0.0
-- LINK artsgsl-static artsgslpp-static artsflow_idl-shared ${AUDIOFILE_LIBRARIES}
-+ LINK artsgsl-static artsgslpp-static artsflow_idl-shared ${AUDIOFILE_LIBRARIES} ${LIBJACK_LIBRARIES}
- DESTINATION ${LIB_INSTALL_DIR}
- )
-
diff --git a/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch b/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch
deleted file mode 100644
index ca89ed76c..000000000
--- a/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -Nuar arts.ORI/artsc/CMakeLists.txt arts.PATCHED/artsc/CMakeLists.txt
---- arts.ORI/artsc/CMakeLists.txt 2011-06-12 07:57:03.000000000 +0200
-+++ arts.PATCHED/artsc/CMakeLists.txt 2011-11-14 21:53:12.000000000 +0100
-@@ -43,6 +43,7 @@
- include_directories(
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}
-+ ${CMAKE_SOURCE_DIR}/artsc
- ${CMAKE_BINARY_DIR}/mcop
- ${CMAKE_SOURCE_DIR}/mcop
- ${CMAKE_BINARY_DIR}/flow
-@@ -64,7 +65,7 @@
- tde_add_library( artsdsp SHARED
- SOURCES artsdsp.c
- VERSION 0.0.0
-- LINK artsc-shared
-+ LINK artsc-shared dl
- DESTINATION ${LIB_INSTALL_DIR}
- )
-
-diff -Nuar arts.ORI/CMakeLists.txt arts.PATCHED/CMakeLists.txt
---- arts.ORI/CMakeLists.txt 2011-03-28 04:09:15.000000000 +0200
-+++ arts.PATCHED/CMakeLists.txt 2011-11-14 21:53:46.000000000 +0100
-@@ -33,6 +33,7 @@
- option( WITH_AUDIOFILE "Enable audiofile (wav) support" ON )
- option( WITH_VORBIS "Enable Ogg/Vorbis support" ON )
- option( WITH_MAD "Enable MAD mp3 decoder support" ON )
-+option( WITH_ESOUND "Enable ESOUND support" OFF )
-
-
- ##### paths setup ###############################
-@@ -58,6 +59,8 @@
- check_include_file( "malloc.h" HAVE_MALLOC_H )
- check_include_file( "memory.h" HAVE_MEMORY_H )
- check_include_file( "dlfcn.h" HAVE_DLFCN_H )
-+check_include_file( "sys/soundcard.h" HAVE_SYS_SOUNDCARD_H )
-+check_include_file( "pthread.h" HAVE_LIBPTHREAD )
-
-
- ##### check for system libraries ################
-@@ -145,6 +148,21 @@
- endif( WITH_ALSA )
-
-
-+##### check for esound #######################
-+
-+set( HAVE_LIBESD 0 )
-+if( WITH_ESOUND )
-+
-+ pkg_search_module( ESOUND esound )
-+ if( ESOUND_FOUND )
-+ set( HAVE_LIBESD 1 )
-+ else( ESOUND_FOUND )
-+ message(FATAL_ERROR "\nESOUND support is requested, but `libesd` not found" )
-+ endif( ESOUND_FOUND )
-+
-+endif( WITH_ESOUND )
-+
-+
- ##### check for glib/gthread modules ############
-
- pkg_search_module( GLIB2 glib-2.0 )
-diff -Nuar arts.ORI/config.h.cmake arts.PATCHED/config.h.cmake
---- arts.ORI/config.h.cmake 2010-10-12 03:53:06.000000000 +0200
-+++ arts.PATCHED/config.h.cmake 2011-11-14 22:00:50.000000000 +0100
-@@ -23,8 +23,14 @@
-
- #cmakedefine HAVE_LIBAUDIOFILE 1
-
-+#cmakedefine HAVE_LIBESD 1
-+
- #cmakedefine HAVE_LIBASOUND2 1
- #cmakedefine HAVE_ALSA_ASOUNDLIB_H 1
- #cmakedefine HAVE_SND_PCM_RESUME 1
- #cmakedefine ALSA_PCM_OLD_SW_PARAMS_API 1
- #cmakedefine ALSA_PCM_OLD_HW_PARAMS_API 1
-+
-+#cmakedefine HAVE_SYS_SOUNDCARD_H 1
-+#cmakedefine HAVE_LIBPTHREAD 1
-+#define HAVE_IOCTL_INT_ULONGINT_DOTS 3
-diff -Nuar arts.ORI/flow/CMakeLists.txt arts.PATCHED/flow/CMakeLists.txt
---- arts.ORI/flow/CMakeLists.txt 2011-10-04 04:01:15.000000000 +0200
-+++ arts.PATCHED/flow/CMakeLists.txt 2011-11-14 21:53:12.000000000 +0100
-@@ -15,6 +15,7 @@
-
- include_directories(
- ${CMAKE_BINARY_DIR}
-+ ${CMAKE_SOURCE_DIR}/artsc
- ${CMAKE_BINARY_DIR}/mcop
- ${CMAKE_SOURCE_DIR}/mcop
- ${CMAKE_CURRENT_BINARY_DIR}
-diff -Nuar arts.ORI/mcop/CMakeLists.txt arts.PATCHED/mcop/CMakeLists.txt
---- arts.ORI/mcop/CMakeLists.txt 2010-10-12 03:53:05.000000000 +0200
-+++ arts.PATCHED/mcop/CMakeLists.txt 2011-11-14 22:04:29.000000000 +0100
-@@ -12,11 +12,11 @@
- configure_file( arts_export.h.in arts_export.h )
-
- if( NOT EXTENSION_DIR )
-- set( EXTENSION_DIR ${CMAKE_INSTALL_PREFIX}/lib )
-+ set( EXTENSION_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
- endif( NOT EXTENSION_DIR )
-
- if( NOT DTRADER_DIR )
-- set( DTRADER_DIR ${CMAKE_INSTALL_PREFIX}/lib/mcop )
-+ set( DTRADER_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/mcop )
- endif( NOT DTRADER_DIR )
-
- add_definitions(
-@@ -66,6 +66,6 @@
- tde_add_library( ${target} SHARED
- SOURCES ${${target}_SRCS}
- VERSION 1.0.0
-- LINK ltdlc-static
-+ LINK ltdlc-static ${ESOUND_LIBRARIES}
- DESTINATION ${LIB_INSTALL_DIR}
- )
-diff -Nuar arts.ORI/mcop_mt/CMakeLists.txt arts.PATCHED/mcop_mt/CMakeLists.txt
---- arts.ORI/mcop_mt/CMakeLists.txt 2010-10-12 03:53:05.000000000 +0200
-+++ arts.PATCHED/mcop_mt/CMakeLists.txt 2011-11-14 21:53:12.000000000 +0100
-@@ -11,6 +11,11 @@
-
- include_directories(
- ${CMAKE_BINARY_DIR}
-+ ${CMAKE_BINARY_DIR}/flow
-+ ${CMAKE_BINARY_DIR}/mcop
-+ ${CMAKE_SOURCE_DIR}/flow
-+ ${CMAKE_SOURCE_DIR}/mcop
-+ ${GLIB2_INCLUDE_DIRS}
- )
-
-
-@@ -19,6 +24,6 @@
- tde_add_library( mcop_mt SHARED
- SOURCES threads_posix.cc
- VERSION 1.0.0
-- LINK artsflow-shared
-+ LINK artsflow-shared pthread
- DESTINATION ${LIB_INSTALL_DIR}
- )
diff --git a/redhat/dependencies/arts/arts-3.5.13.1.spec b/redhat/dependencies/arts/arts-3.5.13.1.spec
deleted file mode 100644
index 4b5f276a4..000000000
--- a/redhat/dependencies/arts/arts-3.5.13.1.spec
+++ /dev/null
@@ -1,182 +0,0 @@
-# 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
-
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeincludedir %{tde_includedir}/tde
-
-%define _docdir %{tde_prefix}/share/doc
-
-Name: trinity-arts
-Version: 3.5.13.1
-Release: 1%{?dist}%{?_variant}
-License: GPL
-Summary: aRts (analog realtime synthesizer) - the KDE sound system
-Group: System Environment/Daemons
-
-Vendor: Trinity Project
-URL: http://www.trinitydesktop.org/
-Packager: Francois Andriot <francois.andriot@free.fr>
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: arts-3.5.13.1.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{version}
-BuildRequires: audiofile-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: glib2-devel
-BuildRequires: gsl-devel
-BuildRequires: libvorbis-devel
-BuildRequires: esound-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}jack-devel
-BuildRequires: %{_lib}ltdl-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: libtool-ltdl-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libjack-devel
-BuildRequires: libltdl-devel
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
-
-Requires: trinity-tqtinterface >= %{version}
-Requires: audiofile
-
-%if "%{?tde_prefix}" == "/usr"
-Obsoletes: arts
-%endif
-
-%description
-arts (analog real-time synthesizer) is the sound system of KDE 3.
-
-The principle of arts is to create/process sound using small modules which do
-certain tasks. These may be create a waveform (oscillators), play samples,
-filter data, add signals, perform effects like delay/flanger/chorus, or
-output the data to the soundcard.
-
-By connecting all those small modules together, you can perform complex
-tasks like simulating a mixer, generating an instrument or things like
-playing a wave file with some effects.
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING.LIB
-%dir %{tde_libdir}/mcop
-%dir %{tde_libdir}/mcop/Arts
-%{tde_libdir}/mcop/Arts/*
-%{tde_libdir}/mcop/*.mcopclass
-%{tde_libdir}/mcop/*.mcoptype
-%{tde_libdir}/lib*.so.*
-%{tde_bindir}/artscat
-%{tde_bindir}/artsd
-%{tde_bindir}/artsdsp
-%{tde_bindir}/artsplay
-%{tde_bindir}/artsrec
-%{tde_bindir}/artsshell
-%{tde_bindir}/artswrapper
-# The '.la' files are runtime, not devel !
-%{tde_libdir}/lib*.la
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Group: Development/Libraries
-Summary: %{name} - Development files
-Requires: %{name} = %{version}-%{release}
-%if "%{?tde_prefix}" == "/usr"
-Obsoletes: arts-devel
-%endif
-
-%description devel
-Development files for %{name}
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/mcopidl
-# Arts includes are under 'tde' - this is on purpose !
-%{tde_tdeincludedir}/arts/
-# Artsc includes are not under 'tde'.
-%{tde_includedir}/artsc/
-%{tde_bindir}/artsc-config
-%{tde_libdir}/lib*.so
-%{tde_libdir}/pkgconfig/*.pc
-%{tde_libdir}/*.a
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n arts-3.5.13.1
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
- -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
- -DBIN_INSTALL_DIR=%{tde_bindir} \
- -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir}/arts \
- -DLIB_INSTALL_DIR=%{tde_libdir} \
- -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
- -DWITH_ALSA=ON \
- -DWITH_AUDIOFILE=ON \
- -DWITH_VORBIS=ON \
- -DWITH_MAD=OFF \
- -DWITH_ESOUND=ON \
-%if 0%{?rhel} == 4
- -DWITH_JACK=OFF \
-%else
- -DWITH_JACK=ON \
-%endif
- -DCMAKE_SKIP_RPATH="OFF" \
- ..
-
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{?buildroot}
-%__make install -C build DESTDIR=%{?buildroot}
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
-* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/dependencies/arts/arts-3.5.13.2-debug.patch b/redhat/dependencies/arts/arts-3.5.13.2-debug.patch
deleted file mode 100644
index 1925292ab..000000000
--- a/redhat/dependencies/arts/arts-3.5.13.2-debug.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- trinity-arts-3.5.13.2~pre15+85a8c7ad/flow/audioionull.cc.ORI 2013-05-26 13:35:39.081803512 +0200
-+++ trinity-arts-3.5.13.2~pre15+85a8c7ad/flow/audioionull.cc 2013-05-26 13:36:02.342333674 +0200
-@@ -133,6 +133,9 @@
- if((_direction & directionWrite) && getParam(canWrite) >= _fragmentSize)
- todo |= AudioSubSystem::ioWrite;
-
-+ fprintf(stderr, "AudioIO: can write %d, fragment size %d, todo %d\n",
-+ getParam(canWrite), _fragmentSize, todo);
-+
- if(!todo)
- return;
-
diff --git a/redhat/dependencies/arts/arts-3.5.13.2-fix_esd_buffer.patch b/redhat/dependencies/arts/arts-3.5.13.2-fix_esd_buffer.patch
deleted file mode 100644
index c60be93f0..000000000
--- a/redhat/dependencies/arts/arts-3.5.13.2-fix_esd_buffer.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nuar trinity-arts-3.5.13.2.ORI/flow/audioioesd.cc trinity-arts-3.5.13.2.P/flow/audioioesd.cc
---- trinity-arts-3.5.13.2.ORI/flow/audioioesd.cc 2013-04-08 19:05:22.665624664 +0200
-+++ trinity-arts-3.5.13.2.P/flow/audioioesd.cc 2013-04-08 23:58:07.905872271 +0200
-@@ -204,14 +204,10 @@
- return write_fd;
-
- case canRead:
-- return ESD_BUF_SIZE;
-+ return param(fragmentSize);
-
- case canWrite:
-- return ESD_BUF_SIZE;
--
-- // ESD handles are actually socket descriptors, and I know not
-- // of any portable way to peek at the socket's send or receive
-- // buffers.
-+ return param(fragmentSize);
-
- default:
- return param(p);
diff --git a/redhat/dependencies/arts/arts-3.5.13.spec b/redhat/dependencies/arts/arts-3.5.13.spec
deleted file mode 100644
index af9fef33a..000000000
--- a/redhat/dependencies/arts/arts-3.5.13.spec
+++ /dev/null
@@ -1,201 +0,0 @@
-# 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
-
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeincludedir %{tde_includedir}/kde
-
-%define _docdir %{tde_prefix}/share/doc
-
-Name: trinity-arts
-Version: 3.5.13
-Release: 4%{?dist}%{?_variant}
-License: GPL
-Summary: aRts (analog realtime synthesizer) - the KDE sound system
-Group: System Environment/Daemons
-
-Vendor: Trinity Project
-URL: http://www.trinitydesktop.org/
-Packager: Francois Andriot <francois.andriot@free.fr>
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: arts-%{version}.tar.gz
-
-# TDE 3.5.13: Re-enable lost OSS support
-Patch0: arts-3.5.13-enable_oss.patch
-
-# TDE 3.5.13: Re-enable lost JACK support
-Patch1: arts-3.5.13-enable_jack.patch
-
-BuildRequires: tqtinterface-devel >= %{version}
-BuildRequires: audiofile-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: glib2-devel
-BuildRequires: gsl-devel
-BuildRequires: libvorbis-devel
-BuildRequires: esound-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}jack-devel
-BuildRequires: %{_lib}ltdl-devel
-%endif
-%if 0%{?rhel} >= 5
-BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: libtool-ltdl-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libjack-devel
-BuildRequires: libltdl-devel
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
-
-Requires: tqtinterface
-Requires: audiofile
-
-%if "%{?tde_prefix}" == "/usr"
-Obsoletes: arts
-%endif
-
-%description
-arts (analog real-time synthesizer) is the sound system of KDE 3.
-
-The principle of arts is to create/process sound using small modules which do
-certain tasks. These may be create a waveform (oscillators), play samples,
-filter data, add signals, perform effects like delay/flanger/chorus, or
-output the data to the soundcard.
-
-By connecting all those small modules together, you can perform complex
-tasks like simulating a mixer, generating an instrument or things like
-playing a wave file with some effects.
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING.LIB
-%dir %{tde_libdir}/mcop
-%dir %{tde_libdir}/mcop/Arts
-%{tde_libdir}/mcop/Arts/*
-%{tde_libdir}/mcop/*.mcopclass
-%{tde_libdir}/mcop/*.mcoptype
-%{tde_libdir}/lib*.so.*
-%{tde_bindir}/artscat
-%{tde_bindir}/artsd
-%{tde_bindir}/artsdsp
-%{tde_bindir}/artsplay
-%{tde_bindir}/artsrec
-%{tde_bindir}/artsshell
-%{tde_bindir}/artswrapper
-# The '.la' files are runtime, not devel !
-%{tde_libdir}/lib*.la
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Group: Development/Libraries
-Summary: %{name} - Development files
-Requires: %{name} = %{version}-%{release}
-%if "%{?tde_prefix}" == "/usr"
-Obsoletes: arts-devel
-%endif
-
-%description devel
-Development files for %{name}
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/mcopidl
-%{tde_tdeincludedir}/arts/
-%{tde_includedir}/artsc/
-%{tde_bindir}/artsc-config
-%{tde_libdir}/lib*.so
-%{tde_libdir}/pkgconfig/*.pc
-%{tde_libdir}/*.a
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?suse_version}
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n dependencies/arts
-%patch0 -p1
-%patch1 -p1
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
- -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
- -DBIN_INSTALL_DIR=%{tde_bindir} \
- -DINCLUDE_INSTALL_DIR=%{tde_includedir}/arts \
- -DLIB_INSTALL_DIR=%{tde_libdir} \
- -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
- -DWITH_ALSA=ON \
- -DWITH_AUDIOFILE=ON \
- -DWITH_VORBIS=ON \
- -DWITH_MAD=OFF \
- -DWITH_ESOUND=ON \
-%if 0%{?rhel} == 4
- -DWITH_JACK=OFF \
-%else
- -DWITH_JACK=ON \
-%endif
- -DCMAKE_SKIP_RPATH="OFF" \
- ..
-
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{?buildroot}
-%__make install -C build DESTDIR=%{?buildroot}
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
-* Fri Dec 16 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Enables JACK support
-
-* Mon Nov 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Enables OSS and ESD support
-
-* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Add missing BuildRequires
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
-- Import to GIT
-- Built with future TDE version (3.5.13 + cmake + QT3.3.8d)
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 03bc7e825..42c73bff1 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -15,11 +15,15 @@
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
-# TDE specific building variables
+# TDE variables
%define tde_version 14.0.0
-%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 libavahi %{_lib}avahi
+%else
+%define libavahi libavahi
+%endif
+
Name: trinity-avahi-tqt
Epoch: 2
@@ -43,8 +47,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: libtqt3-mt-devel >= 3.5.0
-BuildRequires: libtqt4-devel >= 1:4.2.0
+BuildRequires: libtqt4-devel >= 2:4.2.0
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -53,9 +56,6 @@ BuildRequires: libtool
# GETTEXT support
BuildRequires: gettext-devel
-# GLIB2 support
-BuildRequires: glib2-devel
-
# DBUS support
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
@@ -64,7 +64,7 @@ BuildRequires: dbus-1-devel
BuildRequires: dbus-devel
%endif
-# AVAHI support
+# AVAHI support
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}avahi-client-devel
%endif
@@ -72,7 +72,7 @@ BuildRequires: %{_lib}avahi-client-devel
BuildRequires: avahi-devel
%endif
-# EXPAT support
+# EXPAT support
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: expat-devel
%endif
@@ -80,12 +80,15 @@ BuildRequires: expat-devel
BuildRequires: libexpat-devel
%endif
-# UUID support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
-BuildRequires: libuuid-devel
+# NAS support
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_nas 1
+BuildRequires: nas-devel
%endif
-%if 0%{?rhel} == 5
-BuildRequires: e2fsprogs-devel
+
+# XT support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires: libXt-devel
%endif
%description
@@ -100,18 +103,15 @@ into a TQt main loop application.
##########
-%package -n libavahi-tqt
+%package -n %{libavahi}-tqt1
Summary: Avahi TQt integration library
Group: System/Libraries
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides: %{_lib}avahi-qt3
-%endif
+Provides: libavahi-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: trinity-avahi-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n libavahi-tqt
+%description -n %{libavahi}-tqt1
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
running on a local network with no specific configuration. For
@@ -121,32 +121,39 @@ print to, files to look at and people to talk to.
This library contains the interface to integrate the Avahi libraries
into a TQt main loop application.
-%post -n libavahi-tqt
+%post -n %{libavahi}-tqt1
/sbin/ldconfig || :
-%postun -n libavahi-tqt
+%postun -n %{libavahi}-tqt1
/sbin/ldconfig || :
-%files -n libavahi-tqt
+%files -n %{libavahi}-tqt1
%defattr(-,root,root,-)
%{_libdir}/libavahi-tqt.so.1
%{_libdir}/libavahi-tqt.so.1.0.0
##########
-%package -n libavahi-tqt-devel
+%package -n %{libavahi}-tqt-devel
Summary: Avahi TQt integration library (Development Files)
-Group: Development/Libraries
-Requires: libavahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Group: Development/Libraries/C and C++
+Provides: libavahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides: %{_lib}avahi-qt3-devel
-%endif
+Requires: %{libavahi}-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: libtqt4-devel >= 2:4.2.0
Obsoletes: trinity-avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n libavahi-tqt-devel
+# AVAHI support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Requires: %{_lib}avahi-client-devel
+%endif
+%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
+Requires: avahi-devel
+%endif
+
+%description -n %{libavahi}-tqt-devel
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
running on a local network with no specific configuration. For
@@ -156,13 +163,13 @@ print to, files to look at and people to talk to.
This library contains the interface to integrate the Avahi libraries
into a TQt main loop application.
-%post -n libavahi-tqt-devel
+%post -n %{libavahi}-tqt-devel
/sbin/ldconfig || :
-%postun -n libavahi-tqt-devel
+%postun -n %{libavahi}-tqt-devel
/sbin/ldconfig || :
-%files -n libavahi-tqt-devel
+%files -n %{libavahi}-tqt-devel
%defattr(-,root,root,-)
%{_includedir}/avahi-tqt/
%{_libdir}/libavahi-tqt.so
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec
deleted file mode 100644
index 81652edf4..000000000
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec
+++ /dev/null
@@ -1,156 +0,0 @@
-# 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
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-
-Name: trinity-avahi-tqt
-Version: 3.5.13.1
-Release: 1%{?dist}%{?_variant}
-License: GPL
-Summary: Avahi TQT Interface
-Group: System Environment/Libraries
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: avahi-tqt-3.5.13.1.tar.gz
-
-BuildRequires: gcc-c++
-BuildRequires: cmake >= 2.8
-BuildRequires: qt3-devel
-BuildRequires: tqtinterface-devel >= 3.5.13.1
-BuildRequires: gettext-devel
-BuildRequires: libtool
-%if 0%{?suse_version}
-BuildRequires: dbus-1-devel
-%else
-BuildRequires: dbus-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}avahi-client-devel
-# On Mageia 2, package is 'lib64expat1-devel', but on Mandriva, 'lib64expat-devel'
-BuildRequires: %{_lib}expat%{?mgaversion:1}-devel
-Provides: %{_lib}avahi-qt3
-%else
-BuildRequires: avahi-devel
-%if 0%{?suse_version}
-BuildRequires: libexpat-devel
-%else
-BuildRequires: expat-devel
-%endif
-%endif
-
-Requires: qt3
-Requires: trinity-tqtinterface >= 3.5.13
-
-Obsoletes: avahi-tqt < %{version}-%{release}
-Provides: avahi-tqt = %{version}-%{release}
-
-
-%description
-Avahi TQT Interface
-
-
-%package devel
-Requires: %{name}
-Summary: %{name} - Development files
-Group: Development/Libraries
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides: %{_lib}avahi-qt3-devel
-%endif
-
-Obsoletes: avahi-tqt-devel < %{version}-%{release}
-Provides: avahi-tqt-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n avahi-tqt-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "acinclude.m4" \
- -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "./ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "./ltmain.sh"
-
-# Removes stale libtool stuff
-%__rm -f common/libtool.m4 common/ltoptions.m4 common/lt~obsolete.m4 common/ltsugar.m4 common/ltversion.m4
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -I%{tde_includedir}/tqt"
-export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
-
-./autogen.sh
-
-%configure \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --docdir=%{tde_docdir} \
- --includedir=%{tde_includedir} \
- --libdir=%{tde_libdir} \
- --enable-compat-libdns_sd \
- --with-systemdsystemunitdir=/lib/systemd/system \
- MOC_QT3=%{tde_bindir}/moc-tqt
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-# Removes '.a' file
-%__rm -f %{?buildroot}%{tde_libdir}/libavahi-tqt.a
-
-%clean
-%__rm -rf %{?buildroot}
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%{tde_libdir}/libavahi-tqt.so.1
-%{tde_libdir}/libavahi-tqt.so.1.0.0
-
-%files devel
-%{tde_includedir}/avahi-tqt/
-%{tde_libdir}/libavahi-tqt.so
-%{tde_libdir}/libavahi-tqt.la
-%{tde_libdir}/pkgconfig/avahi-tqt.pc
-
-%changelog
-* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
deleted file mode 100644
index 41772b84d..000000000
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
+++ /dev/null
@@ -1,154 +0,0 @@
-# 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
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-
-Name: trinity-avahi-tqt
-Version: 3.5.13
-Release: 1%{?dist}%{?_variant}
-License: GPL
-Summary: Avahi TQT Interface
-Group: System Environment/Libraries
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: avahi-tqt-3.5.13.tar.gz
-
-BuildRequires: gcc-c++
-BuildRequires: cmake >= 2.8
-BuildRequires: qt3-devel
-BuildRequires: tqtinterface-devel >= 3.5.13
-BuildRequires: gettext-devel
-%if 0%{?suse_version}
-BuildRequires: dbus-1-devel
-%else
-BuildRequires: dbus-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}avahi-client-devel
-# On Mageia 2, package is 'lib64expat1-devel', but on Mandriva, 'lib64expat-devel'
-BuildRequires: %{_lib}expat%{?mgaversion:1}-devel
-Provides: %{_lib}avahi-qt3
-%else
-BuildRequires: avahi-devel
-%if 0%{?suse_version}
-BuildRequires: libexpat-devel
-%else
-BuildRequires: expat-devel
-%endif
-%endif
-
-Requires: qt3
-Requires: tqtinterface >= 3.5.13
-
-Obsoletes: avahi-tqt < %{version}-%{release}
-Provides: avahi-tqt = %{version}-%{release}
-
-%description
-Avahi TQT Interface
-
-
-%package devel
-Requires: %{name}
-Summary: %{name} - Development files
-Group: Development/Libraries
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides: %{_lib}avahi-qt3-devel
-%endif
-
-Obsoletes: avahi-tqt-devel < %{version}-%{release}
-Provides: avahi-tqt-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}
-
-
-%if 0%{?suse_version}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n dependencies/avahi-tqt
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "acinclude.m4" \
- -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "./ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "./ltmain.sh"
-
-# Removes stale libtool stuff
-%__rm -f common/libtool.m4 common/ltoptions.m4 common/lt~obsolete.m4 common/ltsugar.m4 common/ltversion.m4
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt?.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -I%{tde_includedir}/tqt"
-export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
-
-./autogen.sh
-
-%configure \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --docdir=%{tde_docdir} \
- --includedir=%{tde_includedir} \
- --libdir=%{tde_libdir} \
- --enable-compat-libdns_sd \
- --with-systemdsystemunitdir=/lib/systemd/system \
- MOC_QT3=%{tde_bindir}/moc-tqt
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-# Removes '.a' file
-%__rm -f %{?buildroot}%{tde_libdir}/libavahi-tqt.a
-
-%clean
-%__rm -rf %{?buildroot}
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%{tde_libdir}/libavahi-tqt.so.1
-%{tde_libdir}/libavahi-tqt.so.1.0.0
-
-%files devel
-%{tde_includedir}/avahi-tqt/
-%{tde_libdir}/libavahi-tqt.so
-%{tde_libdir}/libavahi-tqt.la
-%{tde_libdir}/pkgconfig/avahi-tqt.pc
-
-%changelog
-* Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for TDE 3.5.13
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 a8692ce38..cc19f5ed6 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
@@ -15,9 +15,15 @@
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
-# TDE specific building variables
+# TDE variables
%define tde_version 14.0.0
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libdbus %{_lib}dbus
+%else
+%define libdbus libdbus
+%endif
+
Name: trinity-dbus-1-tqt
Epoch: 2
@@ -36,13 +42,13 @@ License: GPLv2+
#Vendor: Trinity Project
#Packager: Francois Andriot <francois.andriot@free.fr>
-Prefix: %{tde_prefix}
+Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: libtqt3-mt-devel >= 3.5.0
-BuildRequires: libtqt4-devel >= 1:4.2.0
+BuildRequires: libtqt4-devel >= 2:4.2.0
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
@@ -66,14 +72,15 @@ See the dbus description for more information about D-BUS in general.
###########
-%package -n libdbus-1-tqt0
+%package -n %{libdbus}-1-tqt0
Summary: dbus bindings for the Trinity Qt [TQt] interface
Group: System/Libraries
+Provides: libdbus-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: trinity-dbus-1-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-dbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n libdbus-1-tqt0
+%description -n %{libdbus}-1-tqt0
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
terms of complexity.
@@ -82,28 +89,29 @@ This package provides bindings for the Trinity Qt TQt interface.
See the dbus description for more information about D-BUS in general.
-%post -n libdbus-1-tqt0
+%post -n %{libdbus}-1-tqt0
/sbin/ldconfig || :
-%postun -n libdbus-1-tqt0
+%postun -n %{libdbus}-1-tqt0
/sbin/ldconfig || :
-%files -n libdbus-1-tqt0
+%files -n %{libdbus}-1-tqt0
%defattr(-,root,root,-)
%{_libdir}/libdbus-1-tqt.so.0
%{_libdir}/libdbus-1-tqt.so.0.0.0
##########
-%package -n libdbus-1-tqt0-devel
+%package -n %{libdbus}-1-tqt-devel
Summary: dbus bindings for the Trinity Qt [TQt] interface (Development Files)
Group: Development/Libraries/C and C++
-Requires: libdbus-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: libdbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{libdbus}-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: trinity-dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n libdbus-1-tqt0-devel
+%description -n %{libdbus}-1-tqt-devel
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
terms of complexity.
@@ -112,13 +120,13 @@ This package provides bindings for the Trinity Qt TQt interface.
See the dbus description for more information about D-BUS in general.
-%post -n libdbus-1-tqt0-devel
+%post -n %{libdbus}-1-tqt-devel
/sbin/ldconfig || :
-%postun -n libdbus-1-tqt0-devel
+%postun -n %{libdbus}-1-tqt-devel
/sbin/ldconfig || :
-%files -n libdbus-1-tqt0-devel
+%files -n %{libdbus}-1-tqt-devel
%defattr(-,root,root,-)
%{_bindir}/dbusxml2qt3
%{_includedir}/*.h
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec
deleted file mode 100644
index cf0f70911..000000000
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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
-
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-Name: trinity-dbus-1-tqt
-Version: 3.5.13.1
-Release: 1%{?dist}%{?_variant}
-License: GPL
-Summary: Dbus TQT Interface
-Group: System Environment/Libraries
-
-Obsoletes: dbus-1-tqt < %{version}-%{release}
-Provides: dbus-1-tqt = %{version}-%{release}
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: dbus-1-tqt-3.5.13.1.tar.gz
-
-BuildRequires: gcc-c++
-%if 0%{?suse_version}
-BuildRequires: dbus-1-devel
-%else
-BuildRequires: dbus-devel
-%endif
-BuildRequires: trinity-tqtinterface-devel >= %{version}
-
-# TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
-BuildRequires: qt3-devel
-Requires: qt3
-
-
-%description
-Dbus TQT Interface
-
-
-%package devel
-Requires: %{name}
-Summary: %{name} - Development files
-Group: Development/Libraries
-
-Obsoletes: dbus-1-tqt-devel < %{version}-%{release}
-Provides: dbus-1-tqt-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n dbus-1-tqt-3.5.13.1
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt?.sh
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
- -DBIN_INSTALL_DIR=%{tde_bindir} \
- -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
- -DLIB_INSTALL_DIR=%{tde_libdir} \
- ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-%clean
-%__rm -rf %{?buildroot}
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%{tde_bindir}/dbusxml2qt3
-%{tde_libdir}/libdbus-1-tqt.so.0
-%{tde_libdir}/libdbus-1-tqt.so.0.0.0
-
-%files devel
-%{tde_includedir}/*.h
-%{tde_libdir}/libdbus-1-tqt.so
-%{tde_libdir}/libdbus-1-tqt.la
-%{tde_libdir}/pkgconfig/*.pc
-
-%changelog
-* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
deleted file mode 100644
index 5e3e98d18..000000000
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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
-
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-Name: trinity-dbus-1-tqt
-Version: 3.5.13
-Release: 1%{?dist}%{?_variant}
-License: GPL
-Summary: Dbus TQT Interface
-Group: System Environment/Libraries
-
-Obsoletes: dbus-1-tqt < %{version}-%{release}
-Provides: dbus-1-tqt = %{version}-%{release}
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: dbus-1-tqt-3.5.13.tar.gz
-
-BuildRequires: gcc-c++
-%if 0%{?suse_version}
-BuildRequires: dbus-1-devel
-%else
-BuildRequires: dbus-devel
-%endif
-BuildRequires: tqtinterface-devel >= 3.5.13
-
-# TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
-BuildRequires: qt3-devel
-Requires: qt3
-
-
-%description
-Dbus TQT Interface
-
-
-%package devel
-Requires: %{name}
-Summary: %{name} - Development files
-Group: Development/Libraries
-
-Obsoletes: dbus-1-tqt-devel < %{version}-%{release}
-Provides: dbus-1-tqt-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}
-
-%if 0%{?suse_version}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n dependencies/dbus-1-tqt
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt?.sh
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
- -DBIN_INSTALL_DIR=%{tde_bindir} \
- -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
- -DLIB_INSTALL_DIR=%{tde_libdir} \
- ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-%clean
-%__rm -rf %{?buildroot}
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%{tde_bindir}/dbusxml2qt3
-%{tde_libdir}/libdbus-1-tqt.so.0
-%{tde_libdir}/libdbus-1-tqt.so.0.0.0
-
-%files devel
-%{tde_includedir}/*.h
-%{tde_libdir}/libdbus-1-tqt.so
-%{tde_libdir}/libdbus-1-tqt.la
-%{tde_libdir}/pkgconfig/*.pc
-
-%changelog
-* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5, Fedora 15 and Fedora 16
-
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 a3f7d268f..1916afe60 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -15,9 +15,15 @@
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
-# TDE specific building variables
+# TDE variables
%define tde_version 14.0.0
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libdbus %{_lib}dbus
+%else
+%define libdbus libdbus
+%endif
+
Name: trinity-dbus-tqt
Epoch: 2
@@ -42,7 +48,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: libtqt3-mt-devel >= 3.5.0
-BuildRequires: libtqt4-devel >= 1:4.2.0
+BuildRequires: libtqt4-devel >= 2:4.2.0
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
@@ -67,14 +73,15 @@ See the dbus description for more information about D-BUS in general.
##########
-%package -n libdbus-tqt-1-0
-Summary: Simple inter-process messaging system (TQt-based shared library)
-Group: System/Libraries
+%package -n %{libdbus}-tqt-1-0
+Summary: Simple inter-process messaging system (TQt-based shared library)
+Group: System/Libraries
+Provides: libdbus-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: trinity-dbus-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-dbus-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n libdbus-tqt-1-0
+%description -n %{libdbus}-tqt-1-0
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
terms of complexity.
@@ -84,28 +91,29 @@ Qt interface to D-BUS.
See the dbus description for more information about D-BUS in general.
-%post -n libdbus-tqt-1-0
+%post -n %{libdbus}-tqt-1-0
/sbin/ldconfig || :
-%postun -n libdbus-tqt-1-0
+%postun -n %{libdbus}-tqt-1-0
/sbin/ldconfig || :
-%files -n libdbus-tqt-1-0
+%files -n %{libdbus}-tqt-1-0
%defattr(-,root,root,-)
%{_libdir}/libdbus-tqt-1.so.0
%{_libdir}/libdbus-tqt-1.so.0.0.0
##########
-%package -n libdbus-tqt-1-0-devel
+%package -n %{libdbus}-tqt-1-devel
Summary: Simple inter-process messaging system (TQt interface)
Group: Development/Libraries/C and C++
-Requires: libdbus-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: libdbus-tqt-1-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{libdbus}-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: trinity-dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n libdbus-tqt-1-0-devel
+%description -n %{libdbus}-tqt-1-devel
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
terms of complexity.
@@ -115,13 +123,13 @@ Qt interface to D-BUS.
See the dbus description for more information about D-BUS in general.
-%post -n libdbus-tqt-1-0-devel
+%post -n %{libdbus}-tqt-1-devel
/sbin/ldconfig || :
-%postun -n libdbus-tqt-1-0-devel
+%postun -n %{libdbus}-tqt-1-devel
/sbin/ldconfig || :
-%files -n libdbus-tqt-1-0-devel
+%files -n %{libdbus}-tqt-1-devel
%defattr(-,root,root,-)
%{_includedir}/dbus-1.0/*
%{_libdir}/libdbus-tqt-1.so
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec
deleted file mode 100644
index f9953eb5a..000000000
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec
+++ /dev/null
@@ -1,125 +0,0 @@
-# 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
-
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-Name: trinity-dbus-tqt
-Version: 3.5.13.1
-Release: 1%{?dist}%{?_variant}
-License: GPL
-Summary: Dbus TQT Interface
-Group: System Environment/Libraries
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: dbus-tqt-3.5.13.1.tar.gz
-
-# [dbus-tqt] Fix build on RHEL 4
-Patch1: dbus-tqt-3.5.13-fix_old_dbus_types.patch
-
-BuildRequires: gcc-c++
-%if 0%{?suse_version}
-BuildRequires: dbus-1-devel
-%else
-BuildRequires: dbus-devel
-%endif
-BuildRequires: trinity-tqtinterface-devel >= %{version}
-
-# TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
-BuildRequires: qt3-devel
-
-Requires: qt3
-
-Obsoletes: dbus-tqt < %{version}-%{release}
-Provides: dbus-tqt = %{version}-%{release}
-
-
-%description
-Dbus TQT Interface
-
-
-%package devel
-Requires: %{name}
-Summary: %{name} - Development files
-Group: Development/Libraries
-
-Obsoletes: dbus-tqt-devel < %{version}-%{release}
-Provides: dbus-tqt-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n dbus-tqt-3.5.13.1
-
-%if 0%{?rhel} == 4
-%patch1 -p1 -b .dbustypes
-%endif
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt?.sh
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-%if 0%{?rhel} == 4
-export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}"
-%endif
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
- -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
- -DLIB_INSTALL_DIR=%{tde_libdir} \
- ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-%clean
-%__rm -rf %{?buildroot}
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%{tde_libdir}/libdbus-tqt-1.so.0
-%{tde_libdir}/libdbus-tqt-1.so.0.0.0
-
-%files devel
-%{tde_includedir}/dbus-1.0/*
-%{tde_libdir}/libdbus-tqt-1.so
-%{tde_libdir}/libdbus-tqt-1.la
-%{tde_libdir}/pkgconfig/dbus-tqt.pc
-
-%changelog
-* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
deleted file mode 100644
index 2ee2c1a8a..000000000
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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
-
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-Name: trinity-dbus-tqt
-Version: 3.5.13
-Release: 3%{?dist}%{?_variant}
-License: GPL
-Summary: Dbus TQT Interface
-Group: System Environment/Libraries
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: dbus-tqt-3.5.13.tar.gz
-
-# [dbus-tqt] Fix build on RHEL 4
-Patch1: dbus-tqt-3.5.13-fix_old_dbus_types.patch
-
-BuildRequires: gcc-c++
-%if 0%{?suse_version}
-BuildRequires: dbus-1-devel
-%else
-BuildRequires: dbus-devel
-%endif
-BuildRequires: tqtinterface-devel >= 3.5.13
-
-# TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
-BuildRequires: qt3-devel
-
-Requires: qt3
-
-Obsoletes: dbus-tqt < %{version}-%{release}
-Provides: dbus-tqt = %{version}-%{release}
-
-
-%description
-Dbus TQT Interface
-
-
-%package devel
-Requires: %{name}
-Summary: %{name} - Development files
-Group: Development/Libraries
-
-Obsoletes: dbus-tqt-devel < %{version}-%{release}
-Provides: dbus-tqt-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}
-
-
-%if 0%{?suse_version}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n dependencies/dbus-tqt
-
-%if 0%{?rhel} == 4
-%patch1 -p1 -b .dbustypes
-%endif
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt?.sh
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-%if 0%{?rhel} == 4
-export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}"
-%endif
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
- -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
- -DLIB_INSTALL_DIR=%{tde_libdir} \
- ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-%clean
-%__rm -rf %{?buildroot}
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%{tde_libdir}/libdbus-tqt-1.so.0
-%{tde_libdir}/libdbus-tqt-1.so.0.0.0
-
-%files devel
-%{tde_includedir}/dbus-1.0/*
-%{tde_libdir}/libdbus-tqt-1.so
-%{tde_libdir}/libdbus-tqt-1.la
-%{tde_libdir}/pkgconfig/dbus-tqt.pc
-
-%changelog
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Updates BuildRequires
-
-* Tue Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Updates BuildRequires
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Sun Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13.0
-- Import to GIT
-- Built with future TDE version (3.5.13 + cmake + QT3.3.8d)
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 3d29ee9f0..29b3a4f5e 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -15,27 +15,22 @@
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
-# 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
# TDE variables
%define tde_version 14.0.0
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%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 libart %{_lib}art
+%else
+%define libart libart
+%endif
Name: trinity-libart-lgpl
Version: 2.3.22
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-Summary: Library of functions for 2D graphics - runtime files
-Group: System Environment/Libraries
+Summary: Library of functions for 2D graphics
+Group: System/Libraries
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
@@ -47,15 +42,14 @@ License: LGPLv2+
#Vendor: Trinity Project
#Packager: Francois Andriot <francois.andriot@free.fr>
-Prefix: %{tde_prefix}
+Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqt3-devel >= 3.5.0
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-
BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: libtool
%description
A library of functions for 2D graphics supporting a superset of the
@@ -64,89 +58,109 @@ and illustration programs. It is written in optimized C, and is fully
compatible with C++. With a small footprint of 10,000 lines of code, it is
especially suitable for embedded applications.
+##########
+
+%package -n %{libart}_lgpl_2-2
+Summary: Library of functions for 2D graphics - runtime files
+Group: System/Libraries
+Obsoletes: libart_lgpl < %{version}-%{release}
+Provides: libart_lgpl = %{version}-%{release}
+Obsoletes: %{_lib}art_lgpl2 < %{version}-%{release}
+Provides: %{_lib}art_lgpl2 = %{version}-%{release}
+Provides: libart_lgpl_2-2 = %{version}-%{release}
+
+%description -n %{libart}_lgpl_2-2
+A library of functions for 2D graphics supporting a superset of the
+PostScript imaging model, designed to be integrated with graphics, artwork,
+and illustration programs. It is written in optimized C, and is fully
+compatible with C++. With a small footprint of 10,000 lines of code, it is
+especially suitable for embedded applications.
-%post
+%post -n %{libart}_lgpl_2-2
/sbin/ldconfig || :
-%postun
+%postun -n %{libart}_lgpl_2-2
/sbin/ldconfig || :
-%files
+%files -n %{libart}_lgpl_2-2
%defattr(-,root,root,-)
-%{tde_libdir}/libart_lgpl_2.so.2
-%{tde_libdir}/libart_lgpl_2.so.2.3.21
+%{_libdir}/libart_lgpl_2.so.2
+%{_libdir}/libart_lgpl_2.so.2.3.21
##########
-%package devel
+%package -n %{libart}_lgpl-devel
Summary: Library of functions for 2D graphics - development files
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Provides: libart_lgpl-devel = %{version}-%{release}
+Requires: %{libart}_lgpl_2-2 = %{version}-%{release}
-%description devel
+%description -n %{libart}_lgpl-devel
A library of functions for 2D graphics supporting a superset of the
PostScript imaging model, designed to be integrated with graphics, artwork,
and illustration programs. It is written in optimized C, and is fully
compatible with C++. With a small footprint of 10,000 lines of code, it is
especially suitable for embedded applications.
-%post devel
+%post -n %{libart}_lgpl-devel
/sbin/ldconfig || :
-%postun devel
+%postun -n %{libart}_lgpl-devel
/sbin/ldconfig || :
-%files devel
+%files -n %{libart}_lgpl-devel
%defattr(-,root,root,-)
-%{tde_bindir}/libart2-config
-%{tde_libdir}/libart_lgpl_2.a
-%{tde_libdir}/libart_lgpl_2.la
-%{tde_libdir}/libart_lgpl_2.so
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_affine.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_alphagamma.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_bpath.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_config.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_filterlevel.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_gray_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_misc.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_pathcode.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_pixbuf.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_point.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rect.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rect_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rect_uta.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_render.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_render_gradient.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_render_mask.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_render_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_a_affine.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_affine.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_bitmap_affine.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_pixbuf_affine.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_rgba_affine.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgba.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_intersect.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_ops.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_point.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_render_aa.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_vpath.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_wind.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta_ops.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta_rect.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta_vpath.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_vpath.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_vpath_bpath.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_vpath_dash.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_vpath_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/libart-features.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/libart.h
-%{tde_libdir}/pkgconfig/libart-2.0.pc
+%{_bindir}/libart2-config
+%{_libdir}/libart_lgpl_2.a
+%{_libdir}/libart_lgpl_2.la
+%{_libdir}/libart_lgpl_2.so
+%dir %{_includedir}/libart-2.0
+%dir %{_includedir}/libart-2.0/libart_lgpl
+%{_includedir}/libart-2.0/libart_lgpl/art_affine.h
+%{_includedir}/libart-2.0/libart_lgpl/art_alphagamma.h
+%{_includedir}/libart-2.0/libart_lgpl/art_bpath.h
+%{_includedir}/libart-2.0/libart_lgpl/art_config.h
+%{_includedir}/libart-2.0/libart_lgpl/art_filterlevel.h
+%{_includedir}/libart-2.0/libart_lgpl/art_gray_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/art_misc.h
+%{_includedir}/libart-2.0/libart_lgpl/art_pathcode.h
+%{_includedir}/libart-2.0/libart_lgpl/art_pixbuf.h
+%{_includedir}/libart-2.0/libart_lgpl/art_point.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rect.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rect_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rect_uta.h
+%{_includedir}/libart-2.0/libart_lgpl/art_render.h
+%{_includedir}/libart-2.0/libart_lgpl/art_render_gradient.h
+%{_includedir}/libart-2.0/libart_lgpl/art_render_mask.h
+%{_includedir}/libart-2.0/libart_lgpl/art_render_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb_a_affine.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb_affine.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb_bitmap_affine.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb_pixbuf_affine.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb_rgba_affine.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgba.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_intersect.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_ops.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_point.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_render_aa.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_vpath.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_wind.h
+%{_includedir}/libart-2.0/libart_lgpl/art_uta.h
+%{_includedir}/libart-2.0/libart_lgpl/art_uta_ops.h
+%{_includedir}/libart-2.0/libart_lgpl/art_uta_rect.h
+%{_includedir}/libart-2.0/libart_lgpl/art_uta_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/art_uta_vpath.h
+%{_includedir}/libart-2.0/libart_lgpl/art_vpath.h
+%{_includedir}/libart-2.0/libart_lgpl/art_vpath_bpath.h
+%{_includedir}/libart-2.0/libart_lgpl/art_vpath_dash.h
+%{_includedir}/libart-2.0/libart_lgpl/art_vpath_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/libart-features.h
+%{_includedir}/libart-2.0/libart_lgpl/libart.h
+%{_libdir}/pkgconfig/libart-2.0.pc
##########
@@ -166,16 +180,14 @@ autoreconf -fiv
%build
unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
+ --prefix=%{_prefix} \
+ --exec-prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --libdir=%{_libdir} \
+ --datadir=%{_datadir} \
+ --includedir=%{_includedir} \
\
--disable-dependency-tracking
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index 5b6485d34..8e1ea70cb 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -38,7 +38,7 @@ BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
# TDE specific building variables
BuildRequires: python
-BuildRequires: trinity-tqt3-devel >= 3.5.0
+BuildRequires: libtqt4-devel >= 2:4.2.0
%description
SIP is a tool for generating bindings for C++ classes with some ideas
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 a85bae95c..8c24acab0 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
@@ -30,8 +30,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqt3-devel >= 3.5.0
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: libtqt4-devel >= 2:4.2.0
BuildRequires: trinity-tqca-devel >= 1.0
BuildRequires: openssl-devel >= 0.9.8
diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec
index 19010e5db..093461890 100644
--- a/redhat/dependencies/tqca/tqca-14.0.0.spec
+++ b/redhat/dependencies/tqca/tqca-14.0.0.spec
@@ -33,8 +33,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqt3-devel >= 3.5.0
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: libtqt4-devel >= 2:4.2.0
%description
@@ -81,7 +80,7 @@ This packages contains the development files for TQCA
##########
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
%debug_package
%endif
diff --git a/redhat/dependencies/tqt3/assistant-tqt3.desktop b/redhat/dependencies/tqt3/assistant-tqt3.desktop
deleted file mode 120000
index 7cf2e4114..000000000
--- a/redhat/dependencies/tqt3/assistant-tqt3.desktop
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop \ No newline at end of file
diff --git a/redhat/dependencies/tqt3/designer-tqt3.desktop b/redhat/dependencies/tqt3/designer-tqt3.desktop
deleted file mode 120000
index 5ca95a1c4..000000000
--- a/redhat/dependencies/tqt3/designer-tqt3.desktop
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/designer-tqt3.desktop \ No newline at end of file
diff --git a/redhat/dependencies/tqt3/linguist-tqt3.desktop b/redhat/dependencies/tqt3/linguist-tqt3.desktop
deleted file mode 120000
index 7ad540738..000000000
--- a/redhat/dependencies/tqt3/linguist-tqt3.desktop
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop \ No newline at end of file
diff --git a/redhat/dependencies/tqt3/tqassistant.desktop b/redhat/dependencies/tqt3/tqassistant.desktop
new file mode 100644
index 000000000..c178007d8
--- /dev/null
+++ b/redhat/dependencies/tqt3/tqassistant.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=tqassistant
+Name=TQt3 Assistant
+Name[de]=TQt3 Assistent
+GenericName=Document Browser
+Comment=TQt3 Helpcenter
+Comment[de]= TQt3 Hilfezentrum
+MimeType=application/x-assistant;
+Icon=tqassistant
+Terminal=false
+Type=Application
+Categories=Qt;Development;
diff --git a/redhat/dependencies/tqt3/tqdesigner.desktop b/redhat/dependencies/tqt3/tqdesigner.desktop
new file mode 100644
index 000000000..2152b777b
--- /dev/null
+++ b/redhat/dependencies/tqt3/tqdesigner.desktop
@@ -0,0 +1,78 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=tqdesigner
+Name=TQt3 Designer
+Name[bg]=TQt3 Дизайнер
+Name[br]=Ergrafer TQt3
+Name[ca]=Dissenyador TQt3
+Name[cs]=TQt3 designer
+Name[de]=TQt3-Designer
+Name[eo]=TQt3-Desegnilo
+Name[es]=Diseñador TQt3
+Name[et]=TQt3 disainer
+Name[eu]=TQt3 Diseinatzailea
+Name[gl]=Deseñador de TQt3
+Name[he]=TQt3 בצעמ
+Name[it]=Designer TQt3
+Name[ja]=TQt3デザイナー
+Name[ko]=TQt3 디자이너
+Name[lv]=TQt3 Dizainers
+Name[mk]=TQt3 дизајнер
+Name[no]=TQt3-designer
+Name[oc]=Dessinador TQt3
+Name[pl]=Projektant TQt3
+Name[sk]=TQt3 Dizajnér
+Name[sl]=Snovalnik TQt3
+Name[ta]=TQt3 À¨¼ôÀ¡Ç÷
+Name[uk]=Дизайнер TQt3
+Name[zh_CN.GB2312]=TQt3 设计者
+Name[zh_TW.Big5]=TQt3 設計器
+GenericName=Interface Designer
+Comment=TQt3 interface designer
+Comment[az]=TQt3 axtar üz dizayn proqramı
+Comment[bg]=TQt3 interface дизайнер
+Comment[br]=Ergrafer etrefas TQt3
+Comment[ca]=Dissenyador d'interfícies TQt3
+Comment[cs]=Editor UI pro TQt3
+Comment[da]=TQt3 grænseflade designer
+Comment[de]=Schnittstellen-Designer für TQt3
+Comment[el]=Σχεδιασμός περιβάλλοντων TQt3
+Comment[eo]=TQt3-Interfacdesegnilo
+Comment[es]=Diseñador de interfaces de TQt3
+Comment[et]=TQt3 dialoogide redaktor
+Comment[eu]=TQt3 interfaze diseinatzailea
+Comment[fi]=TQt3:n käyttöliittymäsuunnittelija
+Comment[fr]=Conception d'interfaces avec TQt3
+Comment[gl]=Editor de interfaces de TQt3
+Comment[he]=TQt3-ל םיקשממ בצעמ
+Comment[hu]=TQt3 felülettervező
+Comment[is]=Viðmótshönnunartól fyrir TQt3
+Comment[it]=Editor per le interfaccie TQt3
+Comment[ja]=TQt3インターフェースデザイナー
+Comment[ko]=TQt3 인터페이스 디자이너
+Comment[lt]=TQt3 sąsajos redaktorius
+Comment[lv]=TQt3 starsejas dizainers
+Comment[mk]=Дизајнер на TQt3 дијалози
+Comment[nl]=TQt3 interface-ontwerper
+Comment[no]=TQt3-grensesnittdesigner
+Comment[no_NY]=Redigering av TQt3-miljø
+Comment[oc]=Dessinador d'interfacies TQt3
+Comment[pl]=Projektant interfejsu TQt3
+Comment[pt]=Editor de interfaces do TQt3
+Comment[pt_BR]=Designer de interface TQt3
+Comment[ro]=Dezvoltator de interfeţe TQt3
+Comment[ru]=редактор интерфейсов приложений TQt3
+Comment[sk]=TQt3 dizajnér rozhrania
+Comment[sl]=Snovalnik vmesnikov za TQt3
+Comment[sr]=Dizajner TQt3 interfejsa
+Comment[sv]=Editor för gränssnitt till TQt3
+Comment[ta]=TQt3 À¨¼ôÀ¡Ç÷
+Comment[tr]=TQt3 arayüz tasarım programı
+Comment[uk]=Редактор інтерфейсу для TQt3
+Comment[zh_CN.GB2312]=TQt3 界面设计程序
+Comment[zh_TW.Big5]=TQt3 介面編輯器
+MimeType=application/x-designer;
+Icon=tqdesigner
+Terminal=false
+Type=Application
+Categories=Qt;Development;
diff --git a/redhat/dependencies/tqt3/tqlinguist.desktop b/redhat/dependencies/tqt3/tqlinguist.desktop
new file mode 100644
index 000000000..6cbbe713d
--- /dev/null
+++ b/redhat/dependencies/tqt3/tqlinguist.desktop
@@ -0,0 +1,26 @@
+[Desktop Entry]
+Exec=tqlinguist
+Name=TQt3 Linguist
+Name[de]=TQt3-Linguist
+Name[eo]=TQt3-Lingvisto
+Name[es]=Lingüista TQt3
+Name[ko]=TQt3 언어학자
+Name[lv]=TQt3 Lingvists
+GenericName=Translation Tool
+Comment=Tool for translating message catalogues of TQt3 based programs
+Comment[da]=Redskab til at oversætte TQt3 baserede programmer
+Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf TQt3 basieren
+Comment[eo]=Ilo por tradukado de mesaĝaroj de TQt3-bazitaj programoj
+Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en TQt3
+Comment[he]=TQt3 תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ
+Comment[hu]=Segédprogram a TQt3-alapú programok üzenetfájljainak lefordításához
+Comment[ko]=TQt3를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구
+Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz TQt3 bāzētās programmās
+Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3
+Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3
+Comment[sv]=Verktyg för att översätta meddelandekataloger från TQt3-baserade program
+MimeType=application/x-linguist;
+Terminal=false
+Icon=tqlinguist
+Type=Application
+Categories=Qt;Development
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 4d6db1907..43d1f1d3b 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -15,9 +15,15 @@
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
-# TDE specific variables
+# TDE variables
%define tde_version 14.0.0
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libtqt3 %{_lib}tqt3
+%else
+%define libtqt3 libtqt3
+%endif
+
Name: trinity-tqt3
Version: 3.5.0
@@ -39,27 +45,49 @@ Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{tde_version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1: assistant-tqt3.desktop
-Source2: designer-tqt3.desktop
-Source3: linguist-tqt3.desktop
-Source4: tqt3config.desktop
-Source5: build-examples.sh
+Source1: build-examples.sh
+
+Source11: tqassistant.desktop
+Source12: tqdesigner.desktop
+Source13: tqlinguist.desktop
+Source14: tqtconfig.desktop
+
-BuildRequires: desktop-file-utils
-BuildRequires: libmng-devel
BuildRequires: glibc-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: zlib-devel
-BuildRequires: giflib-devel
+BuildRequires: gcc-c++
+BuildRequires: make
+
+BuildRequires: desktop-file-utils
BuildRequires: perl
BuildRequires: sed
BuildRequires: findutils
BuildRequires: tar
+
+# ZLIB support
+BuildRequires: zlib-devel
+
+# JPEG support
+BuildRequires: libjpeg-devel
+
+# MNG support
+BuildRequires: libmng-devel
+
+# PNG support
+BuildRequires: libpng-devel
+
+# GIF support
+BuildRequires: giflib-devel
+
+# FREETYPE support
BuildRequires: freetype-devel
+
+# FONTCONFIG support
BuildRequires: fontconfig-devel
-BuildRequires: gcc-c++
-BuildRequires: make
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
# CUPS support
BuildRequires: cups-devel
@@ -170,11 +198,17 @@ BuildRequires: libxmu-devel
%endif
# XI support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: libXi-devel
+%if 0%{?rhel} == 4
+BuildRequires: xorg-x11-devel
%endif
-%if 0%{?mgaversion}
-BuildRequires: %{_lib}xi-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}xi-devel
+%endif
+%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
+BuildRequires: libXi-devel
+%endif
+%if 0%{?suse_version} == 1140
+BuildRequires: libXi6-devel
%endif
# Xorg support
@@ -226,15 +260,17 @@ BuildRequires: util-linux
# 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
+%endif
%description
##########
-%package -n libtqt3-mt
+%package -n %{libtqt3}-mt
Summary: TQt GUI Library (Threaded runtime version), Version 3
Group: System/GUI/Other
+Provides: libtqt3-mt = %{version}-%{release}
+Provides: trinity-tqt3 = %{version}-%{release}
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
@@ -242,30 +278,33 @@ Requires: coreutils
Requires: fontconfig >= 2.0
Requires: /etc/ld.so.conf.d
-%description -n libtqt3-mt
+%description -n %{libtqt3}-mt
This is the Trolltech TQt library, version 3. It's necessary for
applications that link against the libtqt-mt.so.3, e.g. all Trinity
applications.
-%post -n libtqt3-mt
+%post -n %{libtqt3}-mt
/sbin/ldconfig || :
-%postun -n libtqt3-mt
+%postun -n %{libtqt3}-mt
/sbin/ldconfig || :
-%files -n libtqt3-mt
+%files -n %{libtqt3}-mt
%defattr(-,root,root,-)
%doc FAQ LICENSE* README* changes*
+%dir %{_datadir}/icons/hicolor
+%dir %{_datadir}/icons/hicolor/32x32
+%dir %{_datadir}/icons/hicolor/32x32/apps
+%dir %{_datadir}/tqt3/
+%dir %{_datadir}/tqt3/doc/
+%dir %{_datadir}/tqt3/doc/html/
+%dir %{_datadir}/tqt3/tools/
%dir %{_libdir}/tqt3/
%dir %{_libdir}/tqt3/plugins/
%dir %{_libdir}/tqt3/plugins/designer/
%dir %{_libdir}/tqt3/plugins/imageformats/
%dir %{_libdir}/tqt3/plugins/inputmethods/
%dir %{_libdir}/tqt3/plugins/sqldrivers/
-%dir %{_datadir}/tqt3/
-%dir %{_datadir}/tqt3/doc/
-%dir %{_datadir}/tqt3/doc/html/
-%dir %{_datadir}/tqt3/tools/
%dir %{_sysconfdir}/tqt3
%{_libdir}/libtqt-mt.so.3
%{_libdir}/libtqt-mt.so.3.5
@@ -281,14 +320,16 @@ applications.
###########
-%package -n libtqt3-mt-devel
+%package -n %{libtqt3}-mt-devel
Summary: TQt development files (Threaded)
Group: Development/Libraries/X11
-Requires: libtqt3-mt = %{version}-%{release}
+Provides: trinity-tqt3-devel = %{version}-%{release}
+Provides: libtqt3-mt-devel = %{version}-%{release}
+Requires: %{libtqt3}-mt = %{version}-%{release}
Requires: glibc-devel
Requires: fontconfig-devel
-Requires: freetype2-devel
+Requires: freetype-devel
Requires: libjpeg-devel
Requires: libpng-devel
Requires: zlib-devel
@@ -308,11 +349,17 @@ Requires: e2fsprogs-devel
%endif
# XI support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-Requires: libXi-devel
+%if 0%{?rhel} == 4
+Requires: xorg-x11-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Requires: %{_lib}xi-devel
+%endif
+%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
+Requires: libXi-devel
%endif
-%if 0%{?mgaversion}
-Requires: %{_lib}xi-devel
+%if 0%{?suse_version} == 1140
+Requires: libXi6-devel
%endif
# Xrender support
@@ -388,7 +435,7 @@ Requires: libice-devel
%endif
-%description -n libtqt3-mt-devel
+%description -n %{libtqt3}-mt-devel
TQt is a C++ class library optimized for graphical user interface
development. This package contains the libtqt-mt.so symlink, necessary
for building threaded TQt applications as well as the libtqui.so symlink
@@ -402,13 +449,13 @@ anymore but which are still used by some programs. So if you encounter
problems with missing header files, please install this package first
before you send a bugreport.
-%post -n libtqt3-mt-devel
+%post -n %{libtqt3}-mt-devel
/sbin/ldconfig || :
-%postun -n libtqt3-mt-devel
+%postun -n %{libtqt3}-mt-devel
/sbin/ldconfig || :
-%files -n libtqt3-mt-devel
+%files -n %{libtqt3}-mt-devel
%defattr(-,root,root,-)
%{_libdir}/libtqt-mt.la
%{_libdir}/libtqt-mt.so
@@ -741,97 +788,103 @@ before you send a bugreport.
##########
-%package -n libtqt3-mt-mysql
+%package -n %{libtqt3}-mt-mysql
Summary: MySQL database driver for TQt3 (Threaded)
Group: System/GUI/Other
-Requires: libtqt3-mt = %{version}-%{release}
+Provides: libtqt3-mt-mysql = %{version}-%{release}
+Requires: %{libtqt3}-mt = %{version}-%{release}
-%description -n libtqt3-mt-mysql
+%description -n %{libtqt3}-mt-mysql
This package contains the threaded MySQL plugin for TQt3. Install it if
you intend to use or write TQt programs that are to access a MySQL DB.
-%files -n libtqt3-mt-mysql
+%files -n %{libtqt3}-mt-mysql
%defattr(-,root,root,-)
%{_libdir}/tqt3/plugins/sqldrivers/libqsqlmysql.so
##########
-%package -n libtqt3-mt-odbc
+%package -n %{libtqt3}-mt-odbc
Summary: ODBC database driver for TQt3 (Threaded)
Group: System/GUI/Other
-Requires: libtqt3-mt = %{version}-%{release}
+Provides: libtqt3-mt-odbc = %{version}-%{release}
+Requires: %{libtqt3}-mt = %{version}-%{release}
-%description -n libtqt3-mt-odbc
+%description -n %{libtqt3}-mt-odbc
This package contains the threaded ODBC plugin for TQt3. Install it if
you intend to use or write TQt programs that are to access an ODBC DB.
-%files -n libtqt3-mt-odbc
+%files -n %{libtqt3}-mt-odbc
%defattr(-,root,root,-)
%{_libdir}/tqt3/plugins/sqldrivers/libqsqlodbc.so
##########
-%package -n libtqt3-mt-psql
+%package -n %{libtqt3}-mt-psql
Summary: PostgreSQL database driver for TQt3 (Threaded)
Group: System/GUI/Other
-Requires: libtqt3-mt = %{version}-%{release}
+Provides: libtqt3-mt-psql = %{version}-%{release}
+Requires: %{libtqt3}-mt = %{version}-%{release}
-%description -n libtqt3-mt-psql
+%description -n %{libtqt3}-mt-psql
This package contains the threaded PostgreSQL plugin for TQt3.
Install it if you intend to use or write TQt programs that are
to access a PostgreSQL DB.
-%files -n libtqt3-mt-psql
+%files -n %{libtqt3}-mt-psql
%defattr(-,root,root,-)
%{_libdir}/tqt3/plugins/sqldrivers/libqsqlpsql.so
##########
%if 0%{?with_ibase}
-%package -n libtqt3-mt-ibase
+%package -n %{libtqt3}-mt-ibase
Summary: InterBase/FireBird database driver for TQt3 (Threaded)
Group: System/GUI/Other
-Requires: libtqt3-mt = %{version}-%{release}
+Provides: libtqt3-mt-ibase = %{version}-%{release}
+Requires: %{libtqt3}-mt = %{version}-%{release}
-%description -n libtqt3-mt-ibase
+%description -n %{libtqt3}-mt-ibase
This package contains the threaded InterBase/FireBird plugin
for TQt3. Install it if you intend to use or write TQt programs
that are to access an InterBase/FireBird DB.
-%files -n libtqt3-mt-ibase
+%files -n %{libtqt3}-mt-ibase
%defattr(-,root,root,-)
%{_libdir}/tqt3/plugins/sqldrivers/libqsqlibase.so
%endif
##########
-%package -n libtqt3-mt-sqlite
+%package -n %{libtqt3}-mt-sqlite
Summary: SQLite database driver for TQt3 (Threaded)
Group: System/GUI/Other
-Requires: libtqt3-mt = %{version}-%{release}
+Provides: libtqt3-mt-sqlite = %{version}-%{release}
+Requires: %{libtqt3}-mt = %{version}-%{release}
-%description -n libtqt3-mt-sqlite
+%description -n %{libtqt3}-mt-sqlite
This package contains the threaded SQLite plugin for TQt3. Install
it if you intend to use or write TQt programs that are to access an
SQLite DB.
-%files -n libtqt3-mt-sqlite
+%files -n %{libtqt3}-mt-sqlite
%defattr(-,root,root,-)
%{_libdir}/tqt3/plugins/sqldrivers/libqsqlite.so
##########
-%package -n libtqt3-mt-sqlite3
+%package -n %{libtqt3}-mt-sqlite3
Summary: SQLite3 database driver for TQt3 (Threaded)
Group: System/GUI/Other
-Requires: libtqt3-mt = %{version}-%{release}
+Provides: libtqt3-mt-sqlite3 = %{version}-%{release}
+Requires: %{libtqt3}-mt = %{version}-%{release}
-%description -n libtqt3-mt-sqlite3
+%description -n %{libtqt3}-mt-sqlite3
This package contains the threaded SQLite3 plugin for TQt3. Install
it if you intend to use or write TQt programs that are to access an
SQLite3 DB.
-%files -n libtqt3-mt-sqlite3
+%files -n %{libtqt3}-mt-sqlite3
%defattr(-,root,root,-)
%{_libdir}/tqt3/plugins/sqldrivers/libqsqlite3.so
@@ -840,7 +893,7 @@ SQLite3 DB.
%package -n tqt3-compat-headers
Summary: TQt 1.x and 2.x compatibility includes
Group: Development/Libraries/X11
-Requires: libtqt3-mt = %{version}-%{release}
+Requires: %{libtqt3}-mt = %{version}-%{release}
%description -n tqt3-compat-headers
This package contains header files that are intended for build
@@ -915,7 +968,7 @@ libtqt3-headers.
%package -n tqt3-dev-tools
Summary: TQt3 development tools
Group: Development/Libraries/X11
-Requires: libtqt3-mt = %{version}-%{release}
+Requires: %{libtqt3}-mt-devel = %{version}-%{release}
Requires: tqt3-dev-tools-devel = %{version}-%{release}
%description -n tqt3-dev-tools
@@ -933,8 +986,8 @@ For TQt3 development, you most likely want to install this package.
%{_bindir}/tquic
%{_bindir}/tqmoc
%{_bindir}/tqembed
+%{_mandir}/man1/lupdate-tqt3.1*
%{_mandir}/man1/lrelease-tqt3.1*
-%{_mandir}/man1/lupdate-tqt3.1.gz
%{_mandir}/man1/moc-tqt3.1*
%{_mandir}/man1/uic-tqt3.1*
@@ -958,7 +1011,8 @@ that are written using TQt3.
%package -n tqt3-designer
Summary: TQt3 Designer
Group: System/GUI/Other
-Requires: libtqt3-mt = %{version}-%{release}
+Requires: %{libtqt3}-mt = %{version}-%{release}
+Requires: tqt3-doc = %{version}-%{release}
%description -n tqt3-designer
The TQt Designer is a GUI design program that interactively lets you
@@ -986,7 +1040,6 @@ or automake.
%{_libdir}/tqt3/plugins/designer/libkdevdlgplugin.so
%{_libdir}/tqt3/plugins/designer/librcplugin.so
%{_libdir}/tqt3/plugins/designer/libwizards.so
-#{_datadir}/applications/designer-tqt3.desktop
%dir %{_datadir}/tqt3/tools/tqtconv2ui
%{_datadir}/tqt3/tools/tqtconv2ui/main.cpp
%{_datadir}/tqt3/tools/tqtconv2ui/tqtconv2ui.pro
@@ -994,15 +1047,15 @@ or automake.
%{_datadir}/tqt3/tools/tqtcreatecw/README
%{_datadir}/tqt3/tools/tqtcreatecw/main.cpp
%{_datadir}/tqt3/tools/tqtcreatecw/tqtcreatecw.pro
-
+%{_datadir}/applications/tqdesigner.desktop
+%{_datadir}/icons/hicolor/32x32/apps/tqdesigner.png
###########
%package -n tqt3-apps-devel
Summary: TQt3 Developer applications development files
Group: Development/Libraries/X11
-Requires: libtqt3-mt = %{version}-%{release}
-Requires: libtqt3-mt-devel = %{version}-%{release}
+Requires: %{libtqt3}-mt-devel = %{version}-%{release}
%description -n tqt3-apps-devel
This package is intended for developers who want to develop applications
@@ -1043,7 +1096,8 @@ developer includes with his application.
%package -n tqt3-linguist
Summary: The TQt3 Linguist
Group: System/GUI/Other
-Requires: libtqt3-mt = %{version}-%{release}
+Requires: %{libtqt3}-mt = %{version}-%{release}
+Requires: tqt3-doc = %{version}-%{release}
%description -n tqt3-linguist
This package contains the TQt3 Linguist which provides translators a
@@ -1058,16 +1112,18 @@ development files by the translator.
%{_datadir}/tqt3/phrasebooks/*
%{_datadir}/tqt3/doc/html/linguist*html
%{_datadir}/tqt3/doc/html/linguist*dcf
-#{_datadir}/applications/linguist-tqt3.desktop
%dir %{_docdir}/tqt3-linguist
%{_docdir}/tqt3-linguist/qt_untranslated.ts
+%{_datadir}/applications/tqlinguist.desktop
+%{_datadir}/icons/hicolor/32x32/apps/tqlinguist.png
##########
%package -n tqt3-assistant
Summary: The TQt3 assistant application
Group: System/GUI/Other
-Requires: libtqt3-mt = %{version}-%{release}
+Requires: %{libtqt3}-mt = %{version}-%{release}
+Requires: tqt3-doc = %{version}-%{release}
%description -n tqt3-assistant
This package contains the TQt3 Assistant, an easy to use frontend for
@@ -1084,16 +1140,19 @@ the package tqt3-apps-devel.
%files -n tqt3-assistant
%defattr(-,root,root,-)
%{_bindir}/tqassistant
-#{_datadir}/applications/assistant-tqt3.desktop
+%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png
%{_datadir}/tqt3/doc/html/assistant*html
%{_datadir}/tqt3/doc/html/assistant*dcf
+%{_datadir}/applications/tqassistant.desktop
+%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png
##########
%package -n tqt3-qtconfig
Summary: The TQt3 Configuration Application
Group: Development/Libraries/X11
-Requires: libtqt3-mt = %{version}-%{release}
+Requires: %{libtqt3}-mt = %{version}-%{release}
+Requires: tqt3-doc = %{version}-%{release}
%description -n tqt3-qtconfig
The TQt Configuration program allows endusers to configure the look
@@ -1107,14 +1166,15 @@ install this package.
%files -n tqt3-qtconfig
%defattr(-,root,root,-)
%{_bindir}/tqtconfig
-#{_datadir}/applications/tqt3config.desktop
+%{_datadir}/applications/tqtconfig.desktop
+%{_datadir}/icons/hicolor/32x32/apps/tqtconfig.png
###########
%package -n tqt3-dev-tools-embedded
Summary: Tools to develop embedded TQt applications
Group: System/GUI/Other
-Requires: libtqt3-mt = %{version}-%{release}
+Requires: %{libtqt3}-mt-devel = %{version}-%{release}
%description -n tqt3-dev-tools-embedded
This package contains applications only suitable for developing
@@ -1138,7 +1198,7 @@ by TQt Embedded applications.
%package -n tqt3-dev-tools-compat
Summary: Conversion utilities for TQt3 development
Group: System/GUI/Other
-Requires: libtqt3-mt = %{version}-%{release}
+Requires: %{libtqt3}-mt-devel = %{version}-%{release}
%description -n tqt3-dev-tools-compat
This package contains some older TQt tools (namely tqt20fix tqtrename140,
@@ -1163,7 +1223,7 @@ translation system to the TQt 3 system.
%package -n tqt3-i18n
Summary: Translation (i18n) files for TQt3 library
Group: System/GUI/Other
-Requires: libtqt3-mt = %{version}-%{release}
+Requires: %{libtqt3}-mt = %{version}-%{release}
%description -n tqt3-i18n
This package contains the internationalization files for the TQt library.
@@ -1280,10 +1340,6 @@ export PATH=${QTDIR}/bin:${PATH}
export MANPATH=${QTDIR}/doc/man:${MANPATH}
export LD_LIBRARY_PATH="${QTDIR}/lib"
-%if 0%{?rhel} == 5
-%__sed -i src/kernel/ntqstyle.h -e "s|#ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|"
-%endif
-
# Checks for supplementary include dir
INCDIRS=""
for d in \
@@ -1406,56 +1462,69 @@ export LD_LIBRARY_PATH=${QTDIR}/lib
%__make INSTALL_ROOT=%{?buildroot} install
%__make INSTALL_ROOT=%{?buildroot} plugins-install
-%__install -m755 bin/tqtrename140 %{?buildroot}%{_bindir}
-%__install -m755 bin/tqt20fix %{?buildroot}%{_bindir}
-%__install -m755 bin/tqtfindtr %{?buildroot}%{_bindir}
+%__install -m755 "bin/tqtrename140" "%{?buildroot}%{_bindir}"
+%__install -m755 "bin/tqt20fix" "%{?buildroot}%{_bindir}"
+%__install -m755 "bin/tqtfindtr" "%{?buildroot}%{_bindir}"
# install tqtconv2ui
-%__install -m755 bin/tqtconv2ui %{?buildroot}%{_bindir}/tqtconv2ui
+%__install -m755 "bin/tqtconv2ui" "%{?buildroot}%{_bindir}/tqtconv2ui"
# install tqvfb
-%__install -m755 -D tools/tqvfb/tqvfb %{?buildroot}%{_bindir}/tqvfb
-%__install -m644 -D tools/tqvfb/pda.skin %{?buildroot}%{_sysconfdir}/tqt3/tqvfb/pda.skin
-%__install -m644 -D tools/tqvfb/pda_down.png %{?buildroot}%{_datadir}/tqvfb/pda_down.png
-%__install -m644 -D tools/tqvfb/pda_up.png %{?buildroot}%{_datadir}/tqvfb/pda_up.png
+%__install -m755 -D "tools/tqvfb/tqvfb" "%{?buildroot}%{_bindir}/tqvfb"
+%__install -m644 -D "tools/tqvfb/pda.skin" "%{?buildroot}%{_sysconfdir}/tqt3/tqvfb/pda.skin"
+%__install -m644 -D "tools/tqvfb/pda_down.png" "%{?buildroot}%{_datadir}/tqvfb/pda_down.png"
+%__install -m644 -D "tools/tqvfb/pda_up.png" "%{?buildroot}%{_datadir}/tqvfb/pda_up.png"
## create tqt3-apps-dev-package
cp tools/designer/interfaces/*.h %{?buildroot}%{?_includedir}/tqt3/
cp tools/designer/editor/*.h %{?buildroot}%{?_includedir}/tqt3/
# language file for linguist
-%__install -D -m644 translations/qt_untranslated.ts %{?buildroot}%{?_docdir}/tqt3-linguist/qt_untranslated.ts
+%__install -D -m644 "translations/qt_untranslated.ts" "%{?buildroot}%{?_docdir}/tqt3-linguist/qt_untranslated.ts"
# fix that stupid friggin professional file
-perl -pi -e 's{\$$\$$QT_SOURCE_TREE}{$(QTDIR)}' src/qt_professional.pri
+perl -pi -e 's{\$$\$$QT_SOURCE_TREE}{$(QTDIR)}' "src/qt_professional.pri"
## i18n files for designer, linguist and assistant
for i in designer/designer assistant linguist/linguist; do
pushd "tools/${i}"
tqlrelease "${i##*/}.pro"
for j in ${i##*/}_*.qm; do
- install -m644 "${j}" %{?buildroot}%{_datadir}/tqt3/translations/
+ install -m644 "${j}" "%{?buildroot}%{_datadir}/tqt3/translations/"
done
popd
done
# desktop lnk files
-#install -m644 -D "%{SOURCE1}" "%{?buildroot}%{_datadir}/applications/assistant-tqt3.desktop"
-#install -m644 -D "%{SOURCE2}" "%{?buildroot}%{_datadir}/applications/designer-tqt3.desktop"
-#install -m644 -D "%{SOURCE3}" "%{?buildroot}%{_datadir}/applications/linguist-tqt3.desktop"
-#install -m644 -D "%{SOURCE4}" "%{?buildroot}%{_datadir}/applications/tqt3config.desktop"
+%__install -m644 -D "%{SOURCE11}" "%{?buildroot}%{_datadir}/applications/tqassistant.desktop"
+%__install -m644 -D "%{SOURCE12}" "%{?buildroot}%{_datadir}/applications/tqdesigner.desktop"
+%__install -m644 -D "%{SOURCE13}" "%{?buildroot}%{_datadir}/applications/tqlinguist.desktop"
+%__install -m644 -D "%{SOURCE14}" "%{?buildroot}%{_datadir}/applications/tqtconfig.desktop"
+
+%if 0%{?suse_version}
+%suse_update_desktop_file tqassistant Documentation
+%suse_update_desktop_file tqdesigner GUIDesigner
+%suse_update_desktop_file tqlinguist Translation
+%suse_update_desktop_file tqtconfig Utility
+%endif
+
+# Install applications icons
+%__install -m644 -D "tools/assistant/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png"
+%__install -m644 -D "tools/designer/designer/images/designer_appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqdesigner.png"
+%__install -m644 -D "tools/linguist/linguist/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqlinguist.png"
+%__install -m644 -D "tools/qtconfig/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqtconfig.png"
# build attic package and copy it to tqt3-compat-headers
pushd src
-tar cvvfz attic.tar.gz attic/
-install -D -m644 attic.tar.gz %{?buildroot}%{_docdir}/tqt3-compat-headers/attic.tar.gz
+tar cvvfz "attic.tar.gz" attic/
+install -D -m644 "attic.tar.gz" "%{?buildroot}%{_docdir}/tqt3-compat-headers/attic.tar.gz"
popd
# install the man pages
-install -D -m644 doc/man/man1/moc.1 %{?buildroot}%{_mandir}/man1/moc-tqt3.1
-install -D -m644 doc/man/man1/uic.1 %{?buildroot}%{_mandir}/man1/uic-tqt3.1
-install -D -m644 doc/man/man1/lrelease.1 %{?buildroot}%{_mandir}/man1/lrelease-tqt3.1
-install -D -m644 doc/man/man1/lupdate.1 %{?buildroot}%{_mandir}/man1/lupdate-tqt3.1
+install -D -m644 "doc/man/man1/moc.1" "%{?buildroot}%{_mandir}/man1/moc-tqt3.1"
+install -D -m644 "doc/man/man1/uic.1" "%{?buildroot}%{_mandir}/man1/uic-tqt3.1"
+install -D -m644 "doc/man/man1/lrelease.1" "%{?buildroot}%{_mandir}/man1/lrelease-tqt3.1"
+install -D -m644 "doc/man/man1/lupdate.1" "%{?buildroot}%{_mandir}/man1/lupdate-tqt3.1"
# Install source for the designer tools, such as tqtcreatecw.
cp -ra tools/designer/tools %{?buildroot}%{_datadir}/tqt3/tools
@@ -1482,9 +1551,10 @@ find tqt3-examples -name "tt3" -print | xargs rm -rf
find tqt3-examples -name ".moc" | xargs rm -rf
find tqt3-examples -name ".obj" | xargs rm -rf
find tqt3-examples -name "Makefile" | xargs rm -rf
-install -D -m 755 %{SOURCE5} %{?buildroot}%{_docdir}/tqt3-examples/build-examples
+install -D -m 755 %{SOURCE1} %{?buildroot}%{_docdir}/tqt3-examples/build-examples
tar cvvfz tqt3-examples.tar.gz tqt3-examples/
-install -D -m644 tqt3-examples.tar.gz %{?buildroot}%{_docdir}/tqt3-examples/tqt3-examples.tar.gz
+install -D -m644 "tqt3-examples.tar.gz" "%{?buildroot}%{_docdir}/tqt3-examples/tqt3-examples.tar.gz"
+
%clean
%__rm -rf %{buildroot}
diff --git a/redhat/dependencies/tqt3/tqt3config.desktop b/redhat/dependencies/tqt3/tqt3config.desktop
deleted file mode 120000
index 01b50805b..000000000
--- a/redhat/dependencies/tqt3/tqt3config.desktop
+++ /dev/null
@@ -1 +0,0 @@
-../../../ubuntu/trusty/dependencies/tqt3/debian/maintain/tqt3config.desktop \ No newline at end of file
diff --git a/redhat/dependencies/tqt3/tqtconfig.desktop b/redhat/dependencies/tqt3/tqtconfig.desktop
new file mode 100644
index 000000000..d20d2191d
--- /dev/null
+++ b/redhat/dependencies/tqt3/tqtconfig.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=tqtconfig
+Name=TQt3 Configuration
+Name[de]=TQt3 Konfiguration
+GenericName=Configuration Utility
+Comment=A graphical configuration tool for programs using TQt 3
+Comment[de]=Ein grafisches Konfigurationstool für TQt3-Programme
+MimeType=application/x-qtconfig;
+Terminal=false
+Icon=tqtconfig
+Type=Application
+Categories=Qt;Settings;
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 2d9911e0c..6f781b4ca 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -23,8 +23,14 @@
%define tde_libdir %{tde_prefix}/%{_lib}
%define cmake_modules_dir %{_datadir}/cmake/Modules
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libtqt4 %{_lib}tqt4
+%else
+%define libtqt4 libtqt4
+%endif
+
Name: trinity-tqtinterface
-Epoch: 1
+Epoch: 2
Version: 4.2.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: The Trinity Qt Interface Libraries
@@ -61,20 +67,6 @@ BuildRequires: pkgconfig
BuildRequires: pth-devel
%endif
-# X11 libraries
-%if 0%{?rhel} == 4
-BuildRequires: xorg-x11-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}xi-devel
-%endif
-%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires: libXi-devel
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires: libXi6-devel
-%endif
-
# MESA support
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: mesa-libGL-devel
@@ -98,12 +90,13 @@ although some code has been added for useful functions that are no longer part o
##########
-%package -n libtqt4
+%package -n %{libtqt4}
Group: System/GUI/Other
Summary: The Trinity Qt Interface Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires: libtqt3-mt >= 3.5.0
-Requires: libtqt3-mt >= 3.5.0
%if 0%{?suse_version} && 0%{?suse_version} < 1300
Requires: trinity-cmake-macros
%endif
@@ -111,29 +104,31 @@ Requires: trinity-cmake-macros
Obsoletes: trinity-tqtinterface < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-tqtinterface = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n libtqt4
+%description -n %{libtqt4}
The Trinity Qt Interface is a library that abstracts Qt from Trinity.
This allows the Trinity code to rapidly port from one version of Qt to another.
This is primarily accomplished by defining old functions in terms of new functions,
although some code has been added for useful functions that are no longer part of Qt.
-%files -n libtqt4
+%files -n %{libtqt4}
%defattr(-,root,root,-)
%{_libdir}/libtqt.so.4
%{_libdir}/libtqt.so.4.2.0
-%post -n libtqt4
+%post -n %{libtqt4}
/sbin/ldconfig || :
-%postun -n libtqt4
+%postun -n %{libtqt4}
/sbin/ldconfig || :
##########
-%package -n libtqt4-devel
-Group: Development/Libraries
+%package -n %{libtqt4}-devel
+Group: Development/Libraries/X11
Summary: The Trinity Qt Interface Libraries (Development Files)
-Requires: libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: libtqt4-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires: %{libtqt4} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libtqt3-mt-devel >= 3.5.0
Requires: tqt3-dev-tools >= 3.5.0
@@ -144,19 +139,19 @@ Requires: trinity-cmake-macros
Obsoletes: trinity-tqtinterface-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-tqtinterface-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n libtqt4-devel
+%description -n %{libtqt4}-devel
The Trinity Qt Interface is a library that abstracts Qt from Trinity.
This allows the Trinity code to rapidly port from one version of Qt to another.
This is primarily accomplished by defining old functions in terms of new functions,
although some code has been added for useful functions that are no longer part of Qt.
-%post -n libtqt4-devel
+%post -n %{libtqt4}-devel
/sbin/ldconfig || :
-%postun -n libtqt4-devel
+%postun -n %{libtqt4}-devel
/sbin/ldconfig || :
-%files -n libtqt4-devel
+%files -n %{libtqt4}-devel
%defattr(-,root,root,-)
%{_bindir}/convert_qt_tqt1
%{_bindir}/convert_qt_tqt2