diff options
Diffstat (limited to 'redhat/dependencies')
41 files changed, 230 insertions, 4293 deletions
diff --git a/redhat/dependencies/akode/akode-3.5.13.2.spec b/redhat/dependencies/akode/akode-3.5.13.2.spec deleted file mode 100644 index 3a3ef35df..000000000 --- a/redhat/dependencies/akode/akode-3.5.13.2.spec +++ /dev/null @@ -1,350 +0,0 @@ -# -# spec file for package akode (version 3.5.13-SRU) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# BUILD WARNING: -# Remove qt-devel and qt3-devel and any kde*-devel on your system ! -# Having KDE libraries may cause FTBFS here ! - -# TDE variables -%define tde_epoch 1 -%if "%{?tde_version}" == "" -%define tde_version 3.5.13.2 -%endif -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -Name: trinity-akode -Summary: Audio-decoding framework -Group: System Environment/Libraries -Epoch: %{tde_epoch} -Version: 2.0.2 -Release: 1%{?dist} -URL: http://www.kde-apps.org/content/show.php?content=30375 -#URL: http://carewolf.com/akode/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -Source0: akode-%{tde_version}.tar.gz - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gcc-c++ -BuildRequires: libtool - -# TQT support -BuildRequires: libtqt4-devel -BuildRequires: trinity-filesystem >= %{tde_version} - -# FLAC support -%define _with_flac --with-flac -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libflac-devel -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -BuildRequires: flac-devel -%endif - -# JACK support -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define _with_jack --with-jack -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libjack-devel -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -BuildRequires: jack-audio-connection-kit-devel -%endif -%endif - -# SAMPLERATE support -%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define _with_libsamplerate --with-libsamplerate -BuildRequires: libsamplerate-devel -%endif - -# PULSEAUDIO support -%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define _with_pulseaudio --with-pulseaudio -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libpulseaudio-devel -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: pulseaudio-libs-devel -%endif -%if 0%{?suse_version} -BuildRequires: pulseaudio-devel -%endif -%endif - -# MAD support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -%define _with_libmad --with-libmad -BuildRequires: libmad-devel -%endif - -BuildRequires: alsa-lib-devel -BuildRequires: libvorbis-devel -BuildRequires: speex-devel - - -%description -aKode is a simple audio-decoding frame-work that provides a uniform -interface to decode the most common audio-formats. It also has a direct -playback option for a number of audio-outputs. - -aKode currently has the following decoder plugins: -* mpc: Decodes musepack aka mpc audio. -* xiph: Decodes FLAC, Ogg/FLAC, Speex and Ogg Vorbis audio. - -aKode also has the following audio outputs: -* alsa: Outputs to ALSA (dmix is recommended). -* jack -* pulseaudio - -%files -%defattr(-,root,root,-) -%doc rpmdocs/* -%{tde_bindir}/akodeplay -%{tde_libdir}/libakode.so.* -%{tde_libdir}/libakode_alsa_sink.la -%{tde_libdir}/libakode_alsa_sink.so -%{tde_libdir}/libakode_mpc_decoder.la -%{tde_libdir}/libakode_mpc_decoder.so -%{tde_libdir}/libakode_oss_sink.la -%{tde_libdir}/libakode_oss_sink.so -%{tde_libdir}/libakode_xiph_decoder.la -%{tde_libdir}/libakode_xiph_decoder.so - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -########## - -%package devel -Summary: Headers for developing programs that will use %{name} -Group: Development/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%{?_with_jack:Requires: %{name}-jack = %{?epoch:%{epoch}:}%{version}-%{release}} -%{?_with_pulseaudio:Requires: %{name}-pulseaudio = %{?epoch:%{epoch}:}%{version}-%{release}} -%{?_with_libsamplerate:Requires: %{name}-libsamplerate = %{?epoch:%{epoch}:}%{version}-%{release}} -%{?_with_libmad:Requires: %{name}-libmad = %{?epoch:%{epoch}:}%{version}-%{release}} -Requires: pkgconfig - -%description devel -This package contains the development files for Akode. -It is needed if you intend to build an application linked against Akode. - -%files devel -%defattr(-,root,root,-) -%{tde_bindir}/akode-config -%{tde_includedir}/* -%{tde_libdir}/libakode.la -%{tde_libdir}/libakode.so -%{tde_libdir}/pkgconfig/*.pc - -%post devel -/sbin/ldconfig - -%postun devel -/sbin/ldconfig - -########## - -%if "%{?_with_jack}" != "" - -%package jack -Summary: Jack audio output backend for %{name} -Group: Development/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description jack -This package contains the Jack audio output backend for Akode. - -%files jack -%defattr(-,root,root,-) -%{tde_libdir}/libakode_jack_sink.la -%{tde_libdir}/libakode_jack_sink.so - -%post jack -/sbin/ldconfig - -%postun jack -/sbin/ldconfig - -%endif - -########## - -%if "%{?_with_pulseaudio}" != "" - -%package pulseaudio -Summary: Pulseaudio output backend for %{name} -Group: Development/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description pulseaudio -This package contains the pulseaudio backend for Akode. -Recommended for network transparent audio. - -%files pulseaudio -%defattr(-,root,root,-) -%{tde_libdir}/libakode_polyp_sink.la -%{tde_libdir}/libakode_polyp_sink.so - -%post pulseaudio -/sbin/ldconfig - -%postun pulseaudio -/sbin/ldconfig - -%endif - -########## - -# Packaged separately to keep main/core %{akode} package LGPL-clean. -%if "%{?_with_libsamplerate:1}" == "1" - -%package libsamplerate -Summary: Resampler based on libsamplerate for %{name} -Group: Development/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description libsamplerate -This package contains the samplerate decoder for Akode. - -%files libsamplerate -%defattr(-,root,root,-) -%{tde_libdir}/libakode_src_resampler.la -%{tde_libdir}/libakode_src_resampler.so - -%post libsamplerate -/sbin/ldconfig - -%postun libsamplerate -/sbin/ldconfig - -%endif - -########## - -%if "%{?_with_libmad}" != "" - -%package libmad -Summary: Decoder based on libmad for %{name} -Group: Development/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description libmad -This package contains the mad decoder for Akode. - -%files libmad -%defattr(-,root,root,-) -%{tde_libdir}/libakode_mpeg_decoder.la -%{tde_libdir}/libakode_mpeg_decoder.so - -%post libmad -/sbin/ldconfig - -%postun libmad -/sbin/ldconfig - -%endif - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n akode-2.0.2 - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common - - -%build -unset QTDIR QTINC QTLIB -export CXXFLAGS="${RPM_OPT_FLAGS} -DHAVE_STDINT_H" - -%configure \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_includedir} \ - --datadir=%{tde_datadir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - --without-libltdl \ - --with-alsa \ - --with-oss \ - %{?_with_flac} %{!?_with_flac:--without-flac} \ - %{?_with_jack} %{!?_with_jack:--without-jack} \ - %{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \ - %{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \ - --with-speex \ - --with-vorbis \ - --without-ffmpeg \ - %{?_with_libmad} %{!?_with_libmad:--without-libmad} - -%__make %{?_smp_mflags} || %__make - - -%install -%__rm -rf %{buildroot} -%__make install DESTDIR=%{?buildroot} - -# unpackaged files -%__rm -f %{buildroot}%{tde_libdir}/*.a - -# rpmdocs -for file in AUTHORS COPYING NEWS README TODO ; do - test -s "$file" && install -p -m644 -D "$file" "rpmdocs/$file" -done - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/dependencies/akode/akode-14.0.0.spec b/redhat/dependencies/akode/akode.spec index f4b24e33a..1cf07061d 100644 --- a/redhat/dependencies/akode/akode-14.0.0.spec +++ b/redhat/dependencies/akode/akode.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin diff --git a/redhat/dependencies/arts/arts-3.5.13.2.spec b/redhat/dependencies/arts/arts-3.5.13.2.spec deleted file mode 100644 index 02e031f9e..000000000 --- a/redhat/dependencies/arts/arts-3.5.13.2.spec +++ /dev/null @@ -1,312 +0,0 @@ -# -# spec file for package arts (version 3.5.13-SRU) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# BUILD WARNING: -# Remove qt-devel and qt3-devel and any kde*-devel on your system ! -# Having KDE libraries may cause FTBFS here ! - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 -%define tde_pkg arts -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_sbindir %{tde_prefix}/sbin -%define tde_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - - -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 1.5.10 -Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} -Summary: ARTS (analog realtime synthesizer) - the TDE sound system -Group: System Environment/Daemons -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Project -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -%{?tde_patch:Patch1: %{tde_pkg}-%{tde_version}.patch} - -BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 -BuildRequires: trinity-filesystem >= %{tde_version} -Requires: trinity-filesystem >= %{tde_version} - -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig - -BuildRequires: audiofile-devel -BuildRequires: alsa-lib-devel -BuildRequires: glib2-devel -BuildRequires: gsl-devel -BuildRequires: libvorbis-devel - -# ESOUND support -%define with_esound 1 -BuildRequires: esound-devel - -# JACK support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?with_jack} -%define with_jack 1 -%if 0%{?rhel} >= 5 || 0%{?fedora} -%define jack_devel jack-audio-connection-kit-devel -%endif -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} -%define jack_devel libjack-devel -%endif -BuildRequires: %{jack_devel} -%endif - -# LIBTOOL -%if 0%{?rhel} >= 5 || 0%{?fedora} -BuildRequires: libtool-ltdl-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libltdl-devel -%endif -%if 0%{?suse_version} -%if 0%{?suse_version} >= 1220 -BuildRequires: libltdl-devel -%else -BuildRequires: libtool -%endif -%endif - -# UUID support -BuildRequires: libuuid-devel - -# MAD support -%ifarch %{ix86} x86_64 -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -%define with_libmad 1 -%define mad_devel libmad-devel -BuildRequires: %{mad_devel} -%endif -%endif - -# Pulseaudio config file -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version} -%define with_pulseaudio 1 -%endif - -Requires: libtqt4 >= %{tde_epoch}:4.2.0 -Requires: audiofile - -%if "%{?tde_prefix}" == "/usr" -Obsoletes: arts -%endif - -%description -arts (analog real-time synthesizer) is the sound system of TDE. - -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 -%dir %{tde_libdir}/mcop/Arts/Environment -%{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 needed for runtime, not devel ! -%{tde_libdir}/lib*.la - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - -########## - -%package devel -Group: Development/Libraries -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 -%{?with_libmad:Requires: %{mad_devel}} -%{?with_jack:Requires: %{jack_devel}} - -%description devel -arts (analog real-time synthesizer) is the sound system of TDE. - -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 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%{?with_pulseaudio} - -%package config-pulseaudio -Group: System Environment/Daemons -Summary: ARTS - Default configuration file for Pulseaudio -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description config-pulseaudio -This package contains a default ARTS configuration file, that is -intended for systems running the Pulseaudio server. - -%files config-pulseaudio -%defattr(-,root,root,-) -%{tde_datadir}/config/kcmartsrc - -%endif - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%{?tde_patch:%patch1 -p1} - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_NO_BUILTIN_CHRPATH=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -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 \ - %{?with_libmad:-DWITH_MAD=ON} %{!?with_libmad:-DWITH_MAD=OFF} \ - %{?with_esound:-DWITH_ESOUND=ON} \ - %{?with_jack:-DWITH_JACK=ON} \ - .. - -%__make %{?_smp_mflags} || %__make - - -%install -%__rm -rf %{?buildroot} -%__make install -C build DESTDIR=%{?buildroot} - -%__install -d -m 755 %{?buildroot}%{tde_datadir}/config -%__install -d -m 755 %{?buildroot}%{tde_datadir}/doc - -# Installs the Pulseaudio configuration file -%if 0%{?with_pulseaudio} -cat <<EOF >"%{?buildroot}%{tde_datadir}/config/kcmartsrc" -[Arts] -Arguments=\s-F 10 -S 4096 -a esd -n -s 1 -m artsmessage -c drkonqi -l 3 -f -NetworkTransparent=true -SuspendTime=1 -EOF -chmod 644 "%{?buildroot}%{tde_datadir}/config/kcmartsrc" -%endif - -# Add supplementary folders -%__install -d -m 755 "%{?buildroot}%{tde_libdir}/mcop/Arts/Environment" - - -%clean -%__rm -rf %{?buildroot} - - -%changelog diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts.spec index 765d14efa..60f559bd9 100644 --- a/redhat/dependencies/arts/arts-14.0.0.spec +++ b/redhat/dependencies/arts/arts.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg arts %define tde_prefix /opt/trinity @@ -83,7 +83,7 @@ BuildRequires: esound-devel %endif # JACK support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +%if 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %define with_jack 1 %if 0%{?rhel} >= 5 || 0%{?fedora} %define jack_devel jack-audio-connection-kit-devel @@ -149,7 +149,6 @@ playing a wave file with some effects. %doc COPYING.LIB %dir %{tde_libdir}/mcop %dir %{tde_libdir}/mcop/Arts -%dir %{tde_libdir}/mcop/Arts/Environment %{tde_libdir}/mcop/Arts/* %{tde_libdir}/mcop/*.mcopclass %{tde_libdir}/mcop/*.mcoptype @@ -220,7 +219,7 @@ intended for systems running the Pulseaudio server. %files config-pulseaudio %defattr(-,root,root,-) -%{tde_confdir}/kcmartsrc +%config %{tde_confdir}/kcmartsrc %endif diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec deleted file mode 100644 index c9e7121e6..000000000 --- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec +++ /dev/null @@ -1,245 +0,0 @@ -# -# spec file for package avahi-tqt (version 3.5.13-SRU) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 - -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%define libavahi %{_lib}avahi -%else -%define libavahi libavahi -%endif - - -Name: trinity-avahi-tqt -Epoch: %{tde_epoch} -Version: 0.6.30 -Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} -Summary: Avahi TQt integration library -Group: System/Libraries -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: LGPL-2.0+ -%else -License: LGPLv2+ -%endif - -#Vendor: Trinity Project -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: /usr -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 - -BuildRequires: gcc-c++ -BuildRequires: pkgconfig -BuildRequires: libtool - -# GLIB2 support -BuildRequires: glib2-devel - -# GETTEXT support -BuildRequires: gettext-devel - -# Xi support -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libxi-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 - -# DBUS support -%if 0%{?suse_version} -BuildRequires: dbus-1-devel -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: dbus-devel -%endif - -# PCAP support -BuildRequires: libcap-devel - -# AVAHI support -%if 0%{?mgaversion} || 0%{?mdkversion} -%define avahi_devel libavahi-client-devel -%endif -%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora} -%define avahi_devel avahi-devel -%endif -%{?avahi_devel:BuildRequires: %{avahi_devel}} - -# EXPAT support -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: expat-devel -%endif -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libexpat-devel -%endif - -# NAS support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_nas 1 -BuildRequires: nas-devel -%endif - -# XT support -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -BuildRequires: libXt-devel -%endif - -%description -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 -example you can plug into a network and instantly find printers to -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. - -########## - -%package -n %{libavahi}-tqt1 -Summary: Avahi TQt integration library -Group: System/Libraries -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}-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 -example you can plug into a network and instantly find printers to -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}-tqt1 -/sbin/ldconfig || : - -%postun -n %{libavahi}-tqt1 -/sbin/ldconfig || : - -%files -n %{libavahi}-tqt1 -%defattr(-,root,root,-) -%{_libdir}/libavahi-tqt.so.1 -%{_libdir}/libavahi-tqt.so.1.0.0 - -########## - -%package -n %{libavahi}-tqt-devel -Summary: Avahi TQt integration library (Development Files) -Group: Development/Libraries/C and C++ -Provides: libavahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -Requires: %{libavahi}-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libtqt4-devel >= %{tde_epoch}:4.2.0 -%{?avahi_devel:Requires: %{avahi_devel}} - -Obsoletes: trinity-avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -%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 -example you can plug into a network and instantly find printers to -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 -/sbin/ldconfig || : - -%postun -n %{libavahi}-tqt-devel -/sbin/ldconfig || : - -%files -n %{libavahi}-tqt-devel -%defattr(-,root,root,-) -%{_includedir}/avahi-tqt/ -%{_libdir}/libavahi-tqt.so -%{_libdir}/libavahi-tqt.la -%{_libdir}/pkgconfig/avahi-tqt.pc - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -export NOCONFIGURE=1 -./autogen.sh - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --exec-prefix=%{_prefix} \ - --includedir=%{_includedir} \ - --libdir=%{_libdir} \ - \ - --disable-static \ - --disable-dependency-tracking \ - \ - --enable-compat-libdns_sd \ - --with-systemdsystemunitdir=/lib/systemd/system \ -%if 0%{?suse_version} - --with-distro=suse \ -%endif -%if 0%{?fedora} || 0%{?rhel} - --with-distro=fedora \ -%endif -%if 0%{?mdkversion} || 0%{?mgaversion} - --with-distro=mandriva \ -%endif - -%__make %{?_smp_mflags} || %__make - - -%install -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} - - -%clean -%__rm -rf %{?buildroot} - - -%changelog diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt.spec index 1989ceb7b..a1cb6e7bd 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec deleted file mode 100644 index 8e4771767..000000000 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec +++ /dev/null @@ -1,183 +0,0 @@ -# -# spec file for package dbus-1-tqt (version 3.5.13-SRU) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 - -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%define libdbus %{_lib}dbus -%else -%define libdbus libdbus -%endif - - -Name: trinity-dbus-1-tqt -Epoch: %{tde_epoch} -Version: 0.9 -Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} -Summary: Dbus bindings for the Trinity Qt [TQt] interface -Group: System/Libraries -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Project -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: /usr -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: qt3-devel >= 3.3.8d -BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 - -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig - -# DBUS support -%if 0%{?suse_version} -BuildRequires: dbus-1-devel -%else -BuildRequires: dbus-devel -%endif - -%description -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. - -This package provides bindings for the Trinity Qt TQt interface. - -See the dbus description for more information about D-BUS in general. - -########### - -%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 -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. - -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 -/sbin/ldconfig || : - -%postun -n %{libdbus}-1-tqt0 -/sbin/ldconfig || : - -%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-tqt-devel -Summary: Dbus bindings for the Trinity Qt [TQt] interface (Development Files) -Group: Development/Libraries/C and C++ -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-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. - -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-tqt-devel -/sbin/ldconfig || : - -%postun -n %{libdbus}-1-tqt-devel -/sbin/ldconfig || : - -%files -n %{libdbus}-1-tqt-devel -%defattr(-,root,root,-) -%{_bindir}/dbusxml2qt3 -%{_includedir}/*.h -%{_libdir}/libdbus-1-tqt.so -%{_libdir}/libdbus-1-tqt.la -%{_libdir}/pkgconfig/*.pc - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DBIN_INSTALL_DIR=%{_bindir} \ - -DINCLUDE_INSTALL_DIR=%{_includedir} \ - -DLIB_INSTALL_DIR=%{_libdir} \ - .. - -%__make %{?_smp_mflags} || %__make - - -%install -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} -C build - - -%clean -%__rm -rf %{?buildroot} - - -%changelog diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec index 7f8d9f3cb..1fdc0d328 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13-fix_old_dbus_types.patch b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13-fix_old_dbus_types.patch deleted file mode 100644 index e9e873d63..000000000 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13-fix_old_dbus_types.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- dbus-tqt/message.cpp.dbustypes 2011-08-24 20:23:14.000000000 +0200 -+++ dbus-tqt/message.cpp 2012-09-06 19:54:47.037175413 +0200 -@@ -187,28 +210,28 @@ - case DBUS_TYPE_INT32: - { - dbus_int32_t v; -- dbus_message_iter_get_basic (i, &v); -+ dbus_message_iter_get_int32 (i); - ret = TQVariant( v ); - } - break; - case DBUS_TYPE_UINT32: - { - dbus_uint32_t v; -- dbus_message_iter_get_basic (i, &v); -+ dbus_message_iter_get_uint32 (i); - ret = TQVariant( v ); - } - break; - case DBUS_TYPE_DOUBLE: - { - double v; -- dbus_message_iter_get_basic (i, &v); -+ dbus_message_iter_get_double (i); - ret = TQVariant( v ); - } - break; - case DBUS_TYPE_STRING: - { - const char *v; -- dbus_message_iter_get_basic (i, &v); -+ dbus_message_iter_get_string (i); - ret = TQVariant( v ); - } - break; -@@ -241,7 +264,7 @@ - while (dbus_message_iter_get_arg_type (&sub) != DBUS_TYPE_INVALID) - { - const char *v; -- dbus_message_iter_get_basic (&sub, &v); -+ dbus_message_iter_get_string (&sub); - tempList.append( TQString( v ) ); - dbus_message_iter_next (&sub); - } diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec deleted file mode 100644 index 81ec5d368..000000000 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec +++ /dev/null @@ -1,194 +0,0 @@ -# -# spec file for package dbus-tqt (version 3.5.13-SRU) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 - -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%define libdbus %{_lib}dbus -%else -%define libdbus libdbus -%endif - - -Name: trinity-dbus-tqt -Epoch: %{tde_epoch} -Version: 0.63 -Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} -Summary: Simple inter-process messaging system -Group: System/Libraries -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Project -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: /usr -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -# [dbus-tqt] Fix build on RHEL 4 -Patch1: dbus-tqt-3.5.13-fix_old_dbus_types.patch - -BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 - -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig - -# DBUS support -%if 0%{?suse_version} -BuildRequires: dbus-1-devel -%else -BuildRequires: dbus-devel -%endif - -%description -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. - -This package provides the TQt-based shared library for applications using the -Qt interface to D-BUS. - -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 -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 -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. - -This package provides the TQt-based shared library for applications using the -Qt interface to D-BUS. - -See the dbus description for more information about D-BUS in general. - -%post -n %{libdbus}-tqt-1-0 -/sbin/ldconfig || : - -%postun -n %{libdbus}-tqt-1-0 -/sbin/ldconfig || : - -%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-devel -Summary: Simple inter-process messaging system (TQt interface) -Group: Development/Libraries/C and C++ -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-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. - -This package provides the TQt-based shared library for applications using the -Qt interface to D-BUS. - -See the dbus description for more information about D-BUS in general. - -%post -n %{libdbus}-tqt-1-devel -/sbin/ldconfig || : - -%postun -n %{libdbus}-tqt-1-devel -/sbin/ldconfig || : - -%files -n %{libdbus}-tqt-1-devel -%defattr(-,root,root,-) -%{_includedir}/dbus-1.0/* -%{_libdir}/libdbus-tqt-1.so -%{_libdir}/libdbus-tqt-1.la -%{_libdir}/pkgconfig/dbus-tqt.pc - -########## - -%if 0%{?pclinuxos} -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%if 0%{?rhel} == 4 -%patch1 -p1 -b .dbustypes -%endif - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh - -%if 0%{?rhel} == 4 -export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}" -%endif - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DINCLUDE_INSTALL_DIR=%{_includedir} \ - -DLIB_INSTALL_DIR=%{_libdir} \ - .. - -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} -C build - - -%clean -%__rm -rf %{?buildroot} - - -%changelog diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt.spec index 75ec11785..efc2c3e4d 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl.spec index cd8a9ebc2..2f072719f 100644 --- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec +++ b/redhat/dependencies/libart-lgpl/libart-lgpl.spec @@ -19,7 +19,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} @@ -51,6 +51,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -165,6 +166,7 @@ especially suitable for embedded applications. %{_includedir}/libart-2.0/libart_lgpl/libart-features.h %{_includedir}/libart-2.0/libart_lgpl/libart.h %{_libdir}/pkgconfig/libart-2.0.pc +%{_mandir}/man1/libart2-config.* ########## @@ -177,30 +179,42 @@ especially suitable for embedded applications. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh" -autoreconf -fiv - %build unset QTDIR QTINC QTLIB - -%configure \ - --prefix=%{_prefix} \ - --exec-prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --libdir=%{_libdir} \ - --datadir=%{_datadir} \ - --includedir=%{_includedir} \ +export PATH="%{tde_bindir}:${PATH}" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{_datadir}" \ \ - --disable-dependency-tracking - -%__make %{?_smp_mflags} + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + \ + .. + +%__make %{?_smp_mflags} || %__make %install %__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT -C build %clean diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch b/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch deleted file mode 100644 index 0cf9f056b..000000000 --- a/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch +++ /dev/null @@ -1,193 +0,0 @@ -diff --git a/src/add-caldav-object.c b/src/add-caldav-object.c -index 68a4377..35aef48 100644 ---- a/src/add-caldav-object.c -+++ b/src/add-caldav-object.c -@@ -103,7 +103,6 @@ gboolean caldav_add(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -diff --git a/src/delete-caldav-object.c b/src/delete-caldav-object.c -index 9a85168..ea5733f 100644 ---- a/src/delete-caldav-object.c -+++ b/src/delete-caldav-object.c -@@ -150,7 +150,6 @@ gboolean caldav_delete(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - g_free(search); - curl_slist_free_all(http_header); -@@ -249,7 +248,6 @@ gboolean caldav_delete(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { - caldav_unlock_object( -@@ -380,7 +378,6 @@ gboolean caldav_tasks_delete(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - g_free(search); - curl_slist_free_all(http_header); -@@ -479,7 +476,6 @@ gboolean caldav_tasks_delete(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { - caldav_unlock_object( -diff --git a/src/get-caldav-report.c b/src/get-caldav-report.c -index d916259..0021cb8 100644 ---- a/src/get-caldav-report.c -+++ b/src/get-caldav-report.c -@@ -169,7 +169,6 @@ gboolean caldav_getall(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -@@ -266,7 +265,6 @@ gboolean caldav_getrange(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -@@ -349,7 +347,6 @@ gboolean caldav_tasks_getall(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -@@ -446,7 +443,6 @@ gboolean caldav_tasks_getrange(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -diff --git a/src/get-display-name.c b/src/get-display-name.c -index 8fc0ff8..c205efd 100644 ---- a/src/get-display-name.c -+++ b/src/get-display-name.c -@@ -99,7 +99,6 @@ gboolean caldav_getname(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -diff --git a/src/get-freebusy-report.c b/src/get-freebusy-report.c -index f75ab92..40a5a3c 100644 ---- a/src/get-freebusy-report.c -+++ b/src/get-freebusy-report.c -@@ -104,7 +104,6 @@ gboolean caldav_freebusy(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -diff --git a/src/lock-caldav-object.c b/src/lock-caldav-object.c -index 30f2d20..6845551 100644 ---- a/src/lock-caldav-object.c -+++ b/src/lock-caldav-object.c -@@ -107,7 +107,6 @@ gchar* caldav_lock_object( - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "LOCK"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - curl_slist_free_all(http_header); - if (res != 0) { -@@ -211,7 +210,6 @@ gboolean caldav_unlock_object(gchar* lock_token, gchar* URI, - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "UNLOCK"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - curl_slist_free_all(http_header); - if (res != 0) { -diff --git a/src/modify-caldav-object.c b/src/modify-caldav-object.c -index fb3a4d0..f3563d8 100644 ---- a/src/modify-caldav-object.c -+++ b/src/modify-caldav-object.c -@@ -151,7 +151,6 @@ gboolean caldav_modify(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - curl_slist_free_all(http_header); - http_header = NULL; -@@ -249,7 +248,6 @@ gboolean caldav_modify(caldav_settings* settings, caldav_error* error) { - strlen(settings->file)); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { -@@ -391,7 +389,6 @@ gboolean caldav_tasks_modify(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - curl_slist_free_all(http_header); - http_header = NULL; -@@ -489,7 +486,6 @@ gboolean caldav_tasks_modify(caldav_settings* settings, caldav_error* error) { - strlen(settings->file)); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { -diff --git a/src/options-caldav-server.c b/src/options-caldav-server.c -index 1d97d04..0045afe 100644 ---- a/src/options-caldav-server.c -+++ b/src/options-caldav-server.c -@@ -74,7 +74,6 @@ gboolean caldav_getoptions(CURL* curl, caldav_settings* settings, response* resu - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "OPTIONS"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res == 0) { - gchar* head; -@@ -102,15 +101,12 @@ gboolean caldav_getoptions(CURL* curl, caldav_settings* settings, response* resu - } - else if ( - (res == CURLE_SSL_CONNECT_ERROR || -- CURLE_PEER_FAILED_VERIFICATION || - CURLE_SSL_ENGINE_NOTFOUND || - CURLE_SSL_ENGINE_SETFAILED || - CURLE_SSL_CERTPROBLEM || - CURLE_SSL_CIPHER || - CURLE_SSL_CACERT || -- CURLE_SSL_CACERT_BADFILE || -- CURLE_SSL_CRL_BADFILE || -- CURLE_SSL_ISSUER_ERROR) && settings->usehttps) { -+ CURLE_SSL_CRL_BADFILE ) && settings->usehttps) { - error->code = -2; - error->str = g_strdup(error_buf); - } diff --git a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec deleted file mode 100644 index 419ff8ff9..000000000 --- a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec +++ /dev/null @@ -1,195 +0,0 @@ -# -# spec file for package libcaldav (version 3.5.13-SRU) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 -%define tde_pkg libcaldav -%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 libcaldav %{_lib}caldav -%else -%define libcaldav libcaldav -%endif - - -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 0.6.5 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} -Summary: A client library that adds support for the CalDAV protocol (rfc4791) -Group: System/Libraries -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Desktop -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: /usr -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: libcaldav_0.6.5-2debian2.tar.gz - -BuildRequires: make -BuildRequires: libtool -BuildRequires: fdupes - -# GTK2 support -%if 0%{?rhel} == 4 -BuildRequires: evolution28-gtk2-devel -%else -BuildRequires: glib2-devel -BuildRequires: gtk2-devel -%endif - -# CURL support -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} -%define libcurl_devel libcurl-devel -%else -# Specific CURL version for TDE on RHEL 5 (and older) -%define libcurl_devel trinity-libcurl-devel -%endif -%{?libcurl_devel:BuildRequires: %{libcurl_devel}} - -%description -libcaldev is a client library that adds support for the CalDAV protocol (rfc4791). -The object is to have a library which fully implements the protocol so that it is -easy to integrate CalDAV support into any PIM application. - -########## - -%package -n %{libcaldav}0 -Summary: A client library that adds support for the CalDAV protocol (rfc4791) -Group: System/Libraries - -Obsoletes: trinity-libcaldav < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-libcaldav = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: libcaldav = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libcaldav}0 -libcaldev is a client library that adds support for the CalDAV protocol (rfc4791). -The object is to have a library which fully implements the protocol so that it is -easy to integrate CalDAV support into any PIM application. - -%files -n %{libcaldav}0 -%defattr(-,root,root,-) -%{_libdir}/libcaldav.so.0 -%{_libdir}/libcaldav.so.0.0.6 -%{_docdir}/libcaldav-%{version}/ - -%post -n %{libcaldav}0 -/sbin/ldconfig - -%postun -n %{libcaldav}0 -/sbin/ldconfig - -########## - -%package -n %{libcaldav}-devel -Summary: A client library that adds support for the CalDAV protocol (Development Files) -Group: Development/Libraries/Other -Requires: %{libcaldav}0 = %{?epoch:%{epoch}:}%{version}-%{release} -%{?libcurl_devel:Requires: %{libcurl_devel}} -Requires: glib2-devel - -Obsoletes: trinity-libcaldav-devel < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-libcaldav-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: libcaldav-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libcaldav}-devel -libcaldev is a client library that adds support for the CalDAV protocol (rfc4791). -The object is to have a library which fully implements the protocol so that it is -easy to integrate CalDAV support into any PIM application. - -This package includes the development files. - -%files -n %{libcaldav}-devel -%defattr(-,root,root,-) -%{_includedir}/libcaldav/ -%{_libdir}/libcaldav.la -%{_libdir}/libcaldav.so -%{_libdir}/pkgconfig/libcaldav.pc - -%post -n %{libcaldav}-devel -/sbin/ldconfig - -%postun -n %{libcaldav}-devel -/sbin/ldconfig - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n libcaldav-%{version} -autoreconf --force --install --symlink - - -%build -# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5 -export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# RHEL4 stuff -if [ -d /usr/evolution28 ]; then - export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" -fi - -%configure \ - --docdir=%{_docdir}/libcaldav \ - --includedir=%{_includedir} \ - --libdir=%{_libdir} \ - \ - --disable-dependency-tracking - -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Unwanted files -%__rm -f %{buildroot}%{_libdir}/*.a - -# Fix doc dir -mv -f %{?buildroot}%{_docdir}/libcaldav/ %{?buildroot}%{_docdir}/libcaldav-%{version}/ - -# Fix include dir -mv -f %{?buildroot}%{_includedir}/libcaldav-0.6.2/ %{?buildroot}%{_includedir}/libcaldav/ - -# Fix duplicate files -%fdupes %{?buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav.spec index a4bf7ebb2..88c6f7abf 100644 --- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec +++ b/redhat/dependencies/libcaldav/libcaldav.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg libcaldav %define tde_prefix /opt/trinity @@ -54,8 +54,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: libcaldav-14.0.1-rhel5.patch - +BuildRequires: cmake >= 2.8 BuildRequires: make BuildRequires: libtool BuildRequires: fdupes @@ -100,7 +99,7 @@ easy to integrate CalDAV support into any PIM application. %defattr(-,root,root,-) %{_libdir}/libcaldav.so.0 %{_libdir}/libcaldav.so.0.0.6 -%{_docdir}/libcaldav-%{version}/ +%{_docdir}/libcaldav/ %post -n %{libcaldav}0 /sbin/ldconfig @@ -151,45 +150,53 @@ This package includes the development files. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%if 0%{?rhel} == 5 -%patch1 -p1 -b .ftbfs -%endif -autoreconf -fiv %build -# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5 -export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" -# RHEL4 stuff -if [ -d /usr/evolution28 ]; then - export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -%configure \ - --docdir=%{_docdir}/libcaldav \ - --includedir=%{_includedir} \ - --libdir=%{_libdir} \ +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{_datadir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ \ - --disable-dependency-tracking + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Unwanted files -%__rm -f %{buildroot}%{_libdir}/*.a - -# Fix doc dir -mv -f %{?buildroot}%{_docdir}/libcaldav/ %{?buildroot}%{_docdir}/libcaldav-%{version}/ +%__make install DESTDIR=%{buildroot} -C build # Fix duplicate files %fdupes %{?buildroot} +# Fix doc directory +%if "%{_docdir}" != "%{_datadir}/doc" +%__mkdir_p "%{?buildroot}/%{_docdir}" +%__mv -f "%{?buildroot}/%{_datadir}/doc/libcaldav" "%{?buildroot}/%{_docdir}/libcaldav" +%endif + %clean %__rm -rf %{buildroot} diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch b/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch deleted file mode 100644 index a6bf4e6e0..000000000 --- a/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch +++ /dev/null @@ -1,164 +0,0 @@ -diff --git a/src/add-carddav-object.c b/src/add-carddav-object.c -index 5574991..a1586d8 100644 ---- a/src/add-carddav-object.c -+++ b/src/add-carddav-object.c -@@ -104,7 +104,6 @@ gboolean carddav_add(carddav_settings* settings, carddav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -diff --git a/src/delete-carddav-object.c b/src/delete-carddav-object.c -index 96b9033..6984a82 100644 ---- a/src/delete-carddav-object.c -+++ b/src/delete-carddav-object.c -@@ -132,7 +132,6 @@ gboolean carddav_delete(carddav_settings* settings, carddav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - g_free(search); - curl_slist_free_all(http_header); -@@ -231,7 +230,6 @@ gboolean carddav_delete(carddav_settings* settings, carddav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { - carddav_unlock_object( -@@ -417,7 +415,6 @@ gboolean carddav_delete_by_uri(carddav_settings* settings, carddav_error* error) - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { - carddav_unlock_object( -diff --git a/src/get-carddav-report.c b/src/get-carddav-report.c -index b44fd2c..7655b29 100644 ---- a/src/get-carddav-report.c -+++ b/src/get-carddav-report.c -@@ -117,7 +117,6 @@ static gchar* carddav_dirlist(carddav_settings* settings, carddav_error* error) - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -@@ -243,7 +242,6 @@ gboolean carddav_getall(carddav_settings* settings, carddav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -@@ -345,7 +343,6 @@ gboolean carddav_getall_by_uri(carddav_settings* settings, carddav_error* error) - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -@@ -378,4 +375,4 @@ gboolean carddav_getall_by_uri(carddav_settings* settings, carddav_error* error) - curl_easy_cleanup(curl); - g_free(dav_file_listing); - return result; --} -\ No newline at end of file -+} -diff --git a/src/get-display-name.c b/src/get-display-name.c -index 9e782e0..16c3e4b 100644 ---- a/src/get-display-name.c -+++ b/src/get-display-name.c -@@ -100,7 +100,6 @@ gboolean carddav_getname(carddav_settings* settings, carddav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -diff --git a/src/lock-carddav-object.c b/src/lock-carddav-object.c -index 163264c..2292cad 100644 ---- a/src/lock-carddav-object.c -+++ b/src/lock-carddav-object.c -@@ -109,7 +109,6 @@ gchar* carddav_lock_object( - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "LOCK"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - curl_slist_free_all(http_header); - if (res != 0) { -@@ -214,7 +213,6 @@ gboolean carddav_unlock_object(gchar* lock_token, gchar* URI, - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "UNLOCK"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - curl_slist_free_all(http_header); - if (res != 0) { -diff --git a/src/modify-carddav-object.c b/src/modify-carddav-object.c -index 1822068..a8b6de2 100644 ---- a/src/modify-carddav-object.c -+++ b/src/modify-carddav-object.c -@@ -133,7 +133,6 @@ gboolean carddav_modify(carddav_settings* settings, carddav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - curl_slist_free_all(http_header); - http_header = NULL; -@@ -231,7 +230,6 @@ gboolean carddav_modify(carddav_settings* settings, carddav_error* error) { - strlen(settings->file)); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { -@@ -430,7 +428,6 @@ gboolean carddav_modify_by_uri(carddav_settings* settings, carddav_error* error) - strlen(settings->file)); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { -diff --git a/src/options-carddav-server.c b/src/options-carddav-server.c -index b774401..b44aae2 100644 ---- a/src/options-carddav-server.c -+++ b/src/options-carddav-server.c -@@ -75,7 +75,6 @@ gboolean carddav_getoptions(CURL* curl, carddav_settings* settings, response* re - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "OPTIONS"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - if (settings->debug) { - curl_easy_setopt(curl, CURLOPT_VERBOSE, 1); - } -@@ -106,15 +105,12 @@ gboolean carddav_getoptions(CURL* curl, carddav_settings* settings, response* re - } - else if ( - (res == CURLE_SSL_CONNECT_ERROR || -- CURLE_PEER_FAILED_VERIFICATION || - CURLE_SSL_ENGINE_NOTFOUND || - CURLE_SSL_ENGINE_SETFAILED || - CURLE_SSL_CERTPROBLEM || - CURLE_SSL_CIPHER || - CURLE_SSL_CACERT || -- CURLE_SSL_CACERT_BADFILE || -- CURLE_SSL_CRL_BADFILE || -- CURLE_SSL_ISSUER_ERROR) && settings->usehttps) { -+ CURLE_SSL_CRL_BADFILE ) && settings->usehttps) { - error->code = -2; - error->str = g_strdup(error_buf); - } diff --git a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec deleted file mode 100644 index 152f1cf90..000000000 --- a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec +++ /dev/null @@ -1,195 +0,0 @@ -# -# spec file for package libcarddav (version 3.5.13-SRU) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 -%define tde_pkg libcarddav -%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 libcarddav %{_lib}carddav -%else -%define libcarddav libcarddav -%endif - - -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 0.6.2 -Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist} -Summary: A portable CardDAV client implementation -Group: System/Libraries -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Deskio -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: /usr -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: libcarddav_0.6.2-2debian2.tar.gz - -BuildRequires: make -BuildRequires: libtool - -# CURL support -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} -%define libcurl_devel libcurl-devel -%else -# Specific CURL version for TDE on RHEL 5 (and older) -%define libcurl_devel trinity-libcurl-devel -%endif -%{?libcurl_devel:BuildRequires: %{libcurl_devel}} - -# GTK2 support -%if 0%{?rhel} == 4 -BuildRequires: evolution28-gtk2-devel -%else -BuildRequires: glib2-devel -BuildRequires: gtk2-devel -%endif - -%description -Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. -It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. -Build dependencies are minimal, requiring only libcurl. - -########## - -%package -n %{libcarddav}0 -Summary: A portable CardDAV client implementation -Group: System/Libraries - -Obsoletes: trinity-libcarddav < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-libcarddav = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: libcarddav = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libcarddav}0 -Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. -It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. -Build dependencies are minimal, requiring only libcurl. - -%files -n %{libcarddav}0 -%defattr(-,root,root,-) -%{_libdir}/libcarddav.so.0 -%{_libdir}/libcarddav.so.0.0.6 - -%post -n %{libcarddav}0 -/sbin/ldconfig - -%postun -n %{libcarddav}0 -/sbin/ldconfig - - -########## - -%package -n %{libcarddav}-devel -Summary: A portable CardDAV client implementation (Development Files) -Group: Development/Libraries/Other -Requires: %{libcarddav}0 = %{?epoch:%{epoch}:}%{version}-%{release} -%{?libcurl_devel:Requires: %{libcurl_devel}} -Requires: glib2-devel - -Obsoletes: trinity-libcarddav-devel < %{version}-%{release} -Provides: trinity-libcarddav-devel = %{version}-%{release} -Provides: libcarddav-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libcarddav}-devel -Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. -It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. -Build dependencies are minimal, requiring only libcurl. - -This package contains the development files. - -%files -n %{libcarddav}-devel -%defattr(-,root,root,-) -%{_includedir}/libcarddav/ -%{_libdir}/libcarddav.la -%{_libdir}/libcarddav.so -%{_libdir}/pkgconfig/libcarddav.pc - -%post -n %{libcarddav}-devel -/sbin/ldconfig - -%postun -n %{libcarddav}-devel -/sbin/ldconfig - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n libcarddav-%{version} -%__sed -i "src/get-carddav-report.c" -e "89s/return TRUE/return NULL/" -autoreconf --force --install --symlink - - -%build -unset QTDIR QTINC QTLIB - -# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5 -export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# RHEL4 stuff -if [ -d /usr/evolution28 ]; then - export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" -fi - -%configure \ - --includedir=%{_includedir} \ - --libdir=%{_libdir} \ - \ - --disable-dependency-tracking - -# FIXME: bad libtool ?? -%if 0%{?rhel} == 4 || 0%{?rhel} == 5 -%__make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool -%else -%__make %{?_smp_mflags} -%endif - - -%install -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} LIBTOOL=/usr/bin/libtool - -# Unwanted files -%__rm -f %{buildroot}%{_libdir}/libcarddav.a - -# Fix include location -%__mv -f "%{?buildroot}%{_includedir}/libcarddav-0.6.1" "%{?buildroot}%{_includedir}/libcarddav" - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav.spec index 27e23795e..aa6a9735c 100644 --- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg libcarddav %define tde_prefix /opt/trinity @@ -54,8 +54,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: libcarddav-14.0.1-rhel5.patch - +BuildRequires: cmake >= 2.8 +BuildRequires: gcc-c++ BuildRequires: make BuildRequires: libtool @@ -100,6 +100,7 @@ Build dependencies are minimal, requiring only libcurl. %defattr(-,root,root,-) %{_libdir}/libcarddav.so.0 %{_libdir}/libcarddav.so.0.0.6 +%{_docdir}/libcarddav/ %post -n %{libcarddav}0 /sbin/ldconfig @@ -151,43 +152,49 @@ This package contains the development files. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%if 0%{?rhel} == 5 -%patch1 -p1 -b .ftbfs -%endif - -# Fix empty ChangeLog cause invalid macro in 'configure.ac' -echo "%{name} (%{version})" >ChangeLog - -autoreconf -fiv %build unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" -# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5 -export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# RHEL4 stuff -if [ -d /usr/evolution28 ]; then - export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -%configure \ - --includedir=%{_includedir} \ - --libdir=%{_libdir} \ +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking + -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{_datadir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build -# Unwanted files -%__rm -f %{buildroot}%{_libdir}/libcarddav.a +# Fix doc directory +%if "%{_docdir}" != "%{_datadir}/doc" +%__mkdir_p "%{?buildroot}/%{_docdir}" +%__mv -f "%{?buildroot}/%{_datadir}/doc/libcarddav" "%{?buildroot}/%{_docdir}/libcarddav" +%endif %clean diff --git a/redhat/dependencies/libr/libr.spec b/redhat/dependencies/libr/libr.spec deleted file mode 100644 index ba6ed625a..000000000 --- a/redhat/dependencies/libr/libr.spec +++ /dev/null @@ -1,180 +0,0 @@ -# -# spec file for package libr (version R14) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# TDE variables -%if "%{?tde_version}" == "" -%define tde_version 14.1.0 -%endif - -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%define libr %{_lib}r -%else -%define libr libr -%endif - - -Name: trinity-libr -Version: 0.6.0 -Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -Summary: ELF binary resource library -Group: System/Libraries -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Project -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: /usr -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 - -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig - -BuildRequires: binutils-devel - -# GLADE2 -%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos} -BuildRequires: %{_lib}glade2.0_0-devel -%else -BuildRequires: libglade2-devel -%endif - - -%description -Store and retrieve resources from ELF binaries. - -########## - -%package -n %{libr} -Summary: Simple inter-process messaging system (TQt-based shared library) -Group: System/Libraries - -%description -n %{libr} -Store and retrieve resources from ELF binaries. - -%post -n %{libr} -/sbin/ldconfig || : - -%postun -n %{libr} -/sbin/ldconfig || : - -%files -n %{libr} -%defattr(-,root,root,-) -%{_libdir}/libr.so.0 -%{_libdir}/libr.so.0.0.0 - - -########## - -%package -n %{libr}-devel -Summary: Simple inter-process messaging system (TQt interface) -Group: Development/Libraries/C and C++ -Requires: %{libr} == %{version}-%{release} -Provides: libr-devel == %{version}-%{release} - -%description -n %{libr}-devel -Store and retrieve resources from ELF binaries. - -%post -n %{libr}-devel -/sbin/ldconfig || : - -%postun -n %{libr}-devel -/sbin/ldconfig || : - -%files -n %{libr}-devel -%defattr(-,root,root,-) -%{_includedir}/libr/ -%{_libdir}/libr.a -%{_libdir}/libr.la -%{_libdir}/libr.so -%{_libdir}/pkgconfig/libr.pc -%{_mandir}/man3/IconSVG.3* -%{_mandir}/man3/OneCanvasIconInfo.3* -%{_mandir}/man3/libr_clear.3* -%{_mandir}/man3/libr_close.3* -%{_mandir}/man3/libr_errmsg.3* -%{_mandir}/man3/libr_errno.3* -%{_mandir}/man3/libr_icon_close.3* -%{_mandir}/man3/libr_icon_geticon_byname.3* -%{_mandir}/man3/libr_icon_geticon_bysize.3* -%{_mandir}/man3/libr_icon_getuuid.3* -%{_mandir}/man3/libr_icon_setuuid.3* -%{_mandir}/man3/libr_list.3* -%{_mandir}/man3/libr_malloc.3* -%{_mandir}/man3/libr_open.3* -%{_mandir}/man3/libr_read.3* -%{_mandir}/man3/libr_resources.3* -%{_mandir}/man3/libr_size.3* -%{_mandir}/man3/libr_status.3* -%{_mandir}/man3/libr_write.3* - - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DWITH_GCC_VISIBILITY=OFF \ - \ - -DINCLUDE_INSTALL_DIR=%{_includedir} \ - -DLIB_INSTALL_DIR=%{_libdir} \ - .. - -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} -C build - - -%clean -%__rm -rf %{?buildroot} - - -%changelog diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt.spec index 3b8b54d68..9c6472049 100644 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec +++ b/redhat/dependencies/python-tqt/python-tqt.spec @@ -19,12 +19,10 @@ # Remove qt-devel and qt3-devel and any kde*-devel on your system ! # Having KDE libraries may cause FTBFS here ! -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg python-tqt %define tde_prefix /opt/trinity @@ -71,8 +69,18 @@ BuildRequires: sip4-tqt-devel >= %{?epoch:%{epoch}:}4.10.5 BuildRequires: libtqscintilla-devel >= %{?epoch:%{epoch}:}1.7.1 BuildRequires: gcc-c++ -BuildRequires: python -BuildRequires: python-devel + +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel # MESA support %if 0%{?rhel} || 0%{?fedora} @@ -237,6 +245,7 @@ cp -rf ../pyuic3 ../pylupdate3 echo yes | %__python ../configure.py \ -c -n %{_includedir}/tqscintilla \ + -g %{_includedir}/tqt3 \ -q %{_datadir}/tqt3 \ -y tqt-mt \ -o %{_libdir} -u -j 10 \ diff --git a/redhat/dependencies/qt3/assistant3.desktop b/redhat/dependencies/qt3/assistant3.desktop deleted file mode 100644 index 49e718c5d..000000000 --- a/redhat/dependencies/qt3/assistant3.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt3 Assistant -Comment=Add translations to Qt3 applications -Exec=assistant -Icon=assistant3 -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/redhat/dependencies/qt3/designer3.desktop b/redhat/dependencies/qt3/designer3.desktop deleted file mode 100644 index 23f1f549a..000000000 --- a/redhat/dependencies/qt3/designer3.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Qt3 Designer -GenericName=Interface Designer -Comment=Design GUIs for Qt3 applications -Exec=designer -Icon=designer3 -MimeType=application/x-designer; -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/redhat/dependencies/qt3/linguist3.desktop b/redhat/dependencies/qt3/linguist3.desktop deleted file mode 100644 index c6fce02c8..000000000 --- a/redhat/dependencies/qt3/linguist3.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Qt3 Linguist -Comment=Add translations to Qt3 applications -Exec=linguist -Icon=linguist3 -MimeType=application/x-linguist; -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/redhat/dependencies/qt3/qt.csh b/redhat/dependencies/qt3/qt.csh deleted file mode 100755 index 93fd941ed..000000000 --- a/redhat/dependencies/qt3/qt.csh +++ /dev/null @@ -1,33 +0,0 @@ -# Qt initialization script (csh) - -# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, -# 32 bit over 64 bit in ppc64. When a conflict is found between two packages corresponding -# with different arches, the installed file is the one from the preferred arch. This is -# very common for executables in /usr/bin, for example. If the file /usr/bin/foo is found -# in an x86_64 package and in an i386 package, the executable from x86_64 will be installe - -if ( $?QTDIR ) then - exit -endif - -switch (`uname -m`) - case x86_64: - case ia64: - case s390x: - set QTPREFIXES = "/usr/lib64/qt-3.3 /usr/lib/qt-3.3" - breaksw - case *: - set QTPREFIXES = "/usr/lib/qt-3.3 /usr/lib64/qt-3.3" -endsw - -foreach QTPREFIX ( $QTPREFIXES ) - test -d "$QTPREFIX" && setenv QTDIR $QTPREFIX && break -end -unset QTPREFIX QTPREFIXES - -if ( "${path}" !~ *$QTDIR/bin* ) then - set path = ( $QTDIR/bin $path ) -endif - -setenv QTINC $QTDIR/include -setenv QTLIB $QTDIR/lib diff --git a/redhat/dependencies/qt3/qt.sh b/redhat/dependencies/qt3/qt.sh deleted file mode 100755 index f9ca654c1..000000000 --- a/redhat/dependencies/qt3/qt.sh +++ /dev/null @@ -1,32 +0,0 @@ -# Qt initialization script (sh) - -# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, -# 32 bit over 64 bit in ppc64. When a conflict is found between two packages corresponding -# with different arches, the installed file is the one from the preferred arch. This is -# very common for executables in /usr/bin, for example. If the file /usr/bin/foo is found -# in an x86_64 package and in an i386 package, the executable from x86_64 will be installe - -if [ -z "${QTDIR}" ]; then - -case `uname -m` in - x86_64 | ia64 | s390x ) - QT_PREFIXES="/usr/lib64/qt-3.3 /usr/lib/qt-3.3" ;; - * ) - QT_PREFIXES="/usr/lib/qt-3.3 /usr/lib64/qt-3.3" ;; -esac - -for QTDIR in ${QT_PREFIXES} ; do - test -d "${QTDIR}" && break -done -unset QT_PREFIXES - -if ! echo ${PATH} | /bin/grep -q $QTDIR/bin ; then - PATH=$QTDIR/bin:${PATH} -fi - -QTINC="$QTDIR/include" -QTLIB="$QTDIR/lib" - -export QTDIR QTINC QTLIB PATH - -fi diff --git a/redhat/dependencies/qt3/qt3-3.5.13.2.patch b/redhat/dependencies/qt3/qt3-3.5.13.2.patch deleted file mode 100644 index 6c9a6f8f0..000000000 --- a/redhat/dependencies/qt3/qt3-3.5.13.2.patch +++ /dev/null @@ -1,516 +0,0 @@ -commit 1ee1ffbae69dc78721af139f0794628571fd35ef -Author: Slávek Banko <slavek.banko@axis.cz> -Date: 1386900429 +0100 - - Fix FTBFS with libfreetype6 >= 2.5.x - This resolves Bug 1765 - -diff --git a/config.tests/x11/xfreetype.test b/config.tests/x11/xfreetype.test -index 5cabc32..d4cb4ba 100755 ---- a/config.tests/x11/xfreetype.test -+++ b/config.tests/x11/xfreetype.test -@@ -116,12 +116,15 @@ fi - # check for freetype2 headers - FREETYPE2_INCDIR= - if [ "$XFT" = "yes" ]; then -- INC="freetype2/freetype/freetype.h" - XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` - LDIRS=`sed -n -e '/^QMAKE_INCDIR[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` - INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include /include" - F= - for INCDIR in $INCDIRS; do -+ INC="freetype2/freetype/freetype.h" # libfreetype <= 2.4.9-1.1 -+ if ! [ -f $INCDIR/$INC ]; then -+ INC="freetype2/freetype.h" # libfreetype >= 2.5.1-1 -+ fi - if [ -f $INCDIR/$INC ]; then - # detect major version of freetype2 - FREETYPE_MAJOR=`grep "#define FREETYPE_MAJOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'` ---- qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp.bero 2002-08-21 15:16:19.000000000 +0200 -+++ qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp 2002-08-21 15:16:41.000000000 +0200 -@@ -501,10 +501,10 @@ - (*f).latin1(), - (const char*) QFile::encodeName( old->library() ) ); - } else { -- qWarning("%s: Feature %s already defined in %s!", -+/* qWarning("%s: Feature %s already defined in %s!", - (const char*) QFile::encodeName( old->library() ), - (*f).latin1(), -- (const char*) QFile::encodeName( plugin->library() ) ); -+ (const char*) QFile::encodeName( plugin->library() ) ); */ - } - } - } ---- qt-x11-free-3.1.0/Makefile.orig 2002-11-14 15:44:17.000000000 +0100 -+++ qt-x11-free-3.1.0/Makefile 2002-11-14 15:49:33.000000000 +0100 -@@ -11,7 +11,7 @@ - install: FORCE - @$(MAKE) qt.install - --all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples -+all: symlinks src-qmake src-moc sub-src sub-tools - @echo - @echo "The Qt library is now built in ./lib" - @echo "The Qt examples are built in the directories in ./examples" ---- qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp.cjk 2005-01-21 18:16:11.000000000 +0100 -+++ qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp 2005-01-26 15:09:20.911239907 +0100 -@@ -4748,10 +4748,11 @@ - - // GB18030 fonts on Turbolinux - static const psfont SongGBK2K [] = { -- { "MSung-Light-GBK2K-H", 0, 100. }, -- { "MSung-Italic-GBK2K-H", 0, 100. }, -- { "MSung-Bold-GBK2K-H", 0, 100. }, -- { "MSung-BoldItalic-GBK2K-H", 0, 100. }, -+ { "MSungGBK-Light-GBK2K-H", 0, 100. }, -+ { "MSungGBK-Light-GBK2K-H", 0, 100. }, -+ { "MSungGBK-Light-GBK2K-H", 0, 100. }, -+ { "MSungGBK-Light-GBK2K-H", 0, 100. }, -+ - }; - static const psfont KaiGBK2K [] = { - { "MKai-Medium-GBK2K-H", 0, 100. }, -diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp ---- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2006-12-04 18:47:11.000000000 +0530 -+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-12-05 12:05:10.000000000 +0530 -@@ -1412,7 +1412,10 @@ static bool indic_shape_syllable(QOpenTy - toPos += 2; - if (script == QFont::Devanagari || script == QFont::Gujarati || script == QFont::Bengali) { - if (matra_position == Post || matra_position == Split) { -- toPos = matra+1; -+ if (matra_position == Post ) -+ toPos = matra; -+ else -+ toPos = matra+1; - matra -= 2; - } - } else if (script == QFont::Kannada) { ---- qt3/src/kernel/qscriptengine_x11.cpp.fontrendering-gu-228452 2012-09-29 11:30:23.821539127 +0200 -+++ qt3/src/kernel/qscriptengine_x11.cpp 2012-09-29 11:31:59.679413873 +0200 -@@ -261,7 +261,7 @@ - Other, Other, Other, Other, - Other, Other, Other, Other, - -- Other, Other, Other, Other, -+ Other, Other, VowelMark, VowelMark, - Other, Other, Other, Other, - Other, Other, Other, Other, - Other, Other, Other, Other, ---- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-13 13:21:37.000000000 +0800 -+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-13 13:57:36.000000000 +0800 -@@ -868,7 +868,7 @@ - None, None, None, None, - None, None, None, Post, - -- Post, None, Below, None, -+ None, None, None, None, - None, Post, None, None, - None, None, None, None, - None, None, Post, Post, -@@ -1271,6 +1271,16 @@ - int base = 0; - int reph = -1; - -+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam -+ bool is_special_conjuction_malayalam = false; -+ -+ if ((len == 3) && -+ ((reordered[2] == 0x0d30) || (reordered[2] == 0x0d31)) && -+ (reordered[1] == 0x0d4d) && -+ ((reordered[0] >= 0x0d15) && (reordered[0] <= 0x0d39))) { -+ is_special_conjuction_malayalam = true; -+ } -+ - #ifdef INDIC_DEBUG - IDEBUG("original:"); - for (i = 0; i < len; i++) { -@@ -1547,6 +1557,15 @@ - reph = i; - } - -+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam -+ if (is_special_conjuction_malayalam) { -+ unsigned short temp; -+ -+ temp = reordered[0]; -+ reordered[0] = reordered[2]; -+ reordered[2] = temp; -+ } -+ - if (item->font->stringToCMap((const QChar *)reordered.data(), len, item->glyphs, item->advances, - &item->num_glyphs, item->flags & QTextEngine::RightToLeft) != QFontEngine::NoError) - return FALSE; -@@ -1658,6 +1677,15 @@ - - // halant always applies - -+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam -+ if (is_special_conjuction_malayalam) { -+ unsigned int temp; -+ -+ temp = properties[0]; -+ properties[0] = ~PreSubstProperty; -+ properties[2] = temp; -+ } -+ - #ifdef INDIC_DEBUG - { - IDEBUG("OT properties:"); ---- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.orig 2006-11-29 17:17:26.000000000 +0100 -+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-11-29 17:22:34.000000000 +0100 -@@ -864,7 +864,7 @@ - None, None, None, Post, - - None, None, None, None, -- None, Post, None, None, -+ None, None, None, None, - None, None, None, None, - None, None, Post, Post, - -diff -pruN qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp ---- qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp 2006-03-08 00:00:00.000000000 +0530 -+++ qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp 2006-12-04 18:49:09.000000000 +0530 -@@ -709,7 +709,7 @@ int QFontMetrics::charWidth( const QStri - if ( script >= QFont::Arabic && script <= QFont::Khmer ) { - // complex script shaping. Have to do some hard work - int from = QMAX( 0, pos - 8 ); -- int to = QMIN( (int)str.length(), pos + 8 ); -+ int to = str.length(); - QConstString cstr( str.unicode()+from, to-from); - QTextEngine layout( cstr.string(), d ); - layout.itemize( QTextEngine::WidthOnly ); ---- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-18 17:55:23.000000000 +0800 -+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-19 16:42:31.641160984 +0800 -@@ -786,7 +786,7 @@ - Below, None, Below, Below, - Below, Below, Below, Below, - -- Below, None, Below, Below, -+ Below, Below, Below, Below, - None, Below, Below, Below, - Below, Below, None, None, - None, None, Post, Above, ---- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200 -+++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200 -@@ -1240,7 +1240,7 @@ - int script = item->script; - Q_ASSERT(script >= QFont::Devanagari && script <= QFont::Sinhala); - const unsigned short script_base = 0x0900 + 0x80*(script-QFont::Devanagari); -- const unsigned short ra = script_base + 0x30; -+ unsigned short ra = script_base + 0x30; //it was const unsigned short ra before modification - const unsigned short halant = script_base + 0x4d; - const unsigned short nukta = script_base + 0x3c; - -@@ -1278,6 +1278,11 @@ - } - #endif - -+ unsigned short *chkAssamese=reordered.data(); -+ if((script == QFont::Bengali) && (*chkAssamese==0x09F0)) //if it is assamese ra -+ { -+ ra = script_base + 0x70; -+ } - if (len != 1) { - unsigned short *uc = reordered.data(); - bool beginsWithRa = FALSE; ---- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200 -+++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200 -@@ -601,7 +601,7 @@ - None, None, None, None, - None, None, None, None, - -- None, None, None, None, -+ Below, None, None, None, - None, None, None, None, - None, None, None, None, - None, None, None, None, ---- qt-x11-free-3.3.2/tools/designer/uic/main.cpp.sopwith 2004-06-16 17:14:17.000000000 -0400 -+++ qt-x11-free-3.3.2/tools/designer/uic/main.cpp 2004-06-16 17:21:43.000000000 -0400 -@@ -149,6 +149,9 @@ - } else { - trmacro = &opt[1]; - } -+ } else if ( opt == "nostdlib") { -+ QStringList x; -+ QApplication::setLibraryPaths(x); - } else if ( opt == "L" ) { - if ( !(n < argc-1) ) { - error = "Missing plugin path."; ---- qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp.orig 2004-05-10 13:54:03.592289052 +0200 -+++ qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp 2004-05-10 13:56:10.165560473 +0200 -@@ -288,8 +288,9 @@ - { - #if defined(QT_CHECK_STATE) - if ( qApp->type() == QApplication::Tty ) { -- qWarning( "QPixmap: Cannot create a QPixmap when no GUI " -- "is being used" ); -+// qWarning( "QPixmap: Cannot create a QPixmap when no GUI " -+// "is being used" ); -+ ; - } - #endif - ---- qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp.orig 2004-11-09 18:57:15.012843629 +0100 -+++ qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp 2004-11-09 19:02:31.351637807 +0100 -@@ -1412,7 +1412,7 @@ - False, XA_ATOM, &type, &format, &nitems, &after, &data); - - if (type == XA_ATOM && format == 32) { -- ts.writeBlock((const char *) data, nitems * 4); -+ ts.writeBlock((const char *) data, nitems * sizeof(long)); - offset += nitems; - } else - after = 0; ---- qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp.fonts 2004-08-05 16:42:06.000000000 +0200 -+++ qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp 2004-09-28 16:11:54.955374161 +0200 -@@ -975,7 +981,7 @@ - }; - const XftDefaultFont defaults[] = { - { "Serif", "serif", FALSE }, -- { "Sans Serif", "sans-serif", FALSE }, -+ { "Sans", "sans-serif", FALSE }, - { "Monospace", "monospace", TRUE }, - { 0, 0, FALSE } - }; ---- ./src/widgets/qtextedit.cpp.resetinputcontext 2012-08-04 14:53:34.000000000 +0200 -+++ ./src/widgets/qtextedit.cpp 2012-09-29 11:36:19.410163805 +0200 -@@ -1904,9 +1904,6 @@ - - void QTextEdit::removeSelectedText( int selNum ) - { -- if(selNum != 0) -- resetInputContext(); -- - QTextCursor c1 = doc->selectionStartCursor( selNum ); - c1.restoreState(); - QTextCursor c2 = doc->selectionEndCursor( selNum ); -@@ -3169,7 +3166,6 @@ - return; - } - #endif -- resetInputContext(); - QTextParagraph *p = doc->paragAt( para ); - if ( !p ) - return; -@@ -3196,7 +3192,6 @@ - return; - } - #endif -- resetInputContext(); - for ( int i = 0; i < (int)doc->numSelections(); ++i ) - doc->removeSelection( i ); - -@@ -3238,7 +3233,6 @@ - if ( d->optimMode ) - return; - #endif -- resetInputContext(); - QTextParagraph *p = doc->paragAt( para ); - if ( !p ) - return; -@@ -3283,7 +3277,6 @@ - if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled ) - return; - -- resetInputContext(); - for ( int i = 0; i < (int)doc->numSelections(); ++i ) - doc->removeSelection( i ); - -@@ -3334,7 +3327,6 @@ - if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled ) - return; - -- resetInputContext(); - for ( int i = 0; i < (int)doc->numSelections(); ++i ) - doc->removeSelection( i ); - -@@ -3448,7 +3440,6 @@ - { - if ( isReadOnly() ) - return; -- resetInputContext(); - normalCopy(); - removeSelectedText(); - updateMicroFocusHint(); -@@ -3936,7 +3927,6 @@ - return; - } - #endif -- resetInputContext(); - if ( !isModified() && isReadOnly() && - this->context() == context && this->text() == text ) - return; -@@ -4110,7 +4100,6 @@ - if ( !p ) - return; - -- resetInputContext(); - if ( index > p->length() - 1 ) - index = p->length() - 1; - -@@ -4167,7 +4156,6 @@ - return; - } - #endif -- resetInputContext(); - if ( doc->hasSelection( selNum ) ) { - doc->removeSelection( selNum ); - repaintChanged(); -@@ -5074,7 +5062,6 @@ - } - if ( dc == doc ) - return; -- resetInputContext(); - doc = dc; - delete cursor; - cursor = new QTextCursor( doc ); ---- qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf.orig 2006-06-21 15:37:53.000000000 +0200 -+++ qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf 2006-06-21 15:38:02.000000000 +0200 -@@ -84,7 +84,7 @@ - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = --QMAKE_STRIPFLAGS_LIB += --strip-unneeded -+QMAKE_STRIP = -+QMAKE_STRIPFLAGS_LIB += - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p ---- qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf.orig 2006-06-21 15:37:09.000000000 +0200 -+++ qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf 2006-06-21 15:37:19.000000000 +0200 -@@ -84,7 +84,7 @@ - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = strip --QMAKE_STRIPFLAGS_LIB += --strip-unneeded -+QMAKE_STRIP = -+QMAKE_STRIPFLAGS_LIB += - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p ---- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.orig 2006-06-21 15:36:23.000000000 +0200 -+++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf 2006-06-21 15:36:56.000000000 +0200 -@@ -87,7 +87,7 @@ - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = strip --QMAKE_STRIPFLAGS_LIB += --strip-unneeded -+QMAKE_STRIP = -+QMAKE_STRIPFLAGS_LIB += - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p ---- qt-x11-free-3.3.7/src/tools/qsettings.cpp.tn 2006-11-09 20:53:25.000000000 +0100 -+++ qt-x11-free-3.3.7/src/tools/qsettings.cpp 2006-11-09 20:59:53.000000000 +0100 -@@ -994,7 +994,10 @@ - #endif - - QFile file( filename + ".tmp" ); -- if (! file.open(IO_WriteOnly)) { -+ mode_t old_umask = umask(0022); -+ bool f = file.open(IO_WriteOnly); -+ umask(old_umask); -+ if (! f) { - - #ifdef QT_CHECK_STATE - qWarning("QSettings::sync: failed to open '%s' for writing", ---- qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml.orig 2010-06-30 01:00:36.000000000 +0200 -+++ qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml 2010-06-30 01:00:56.000000000 +0200 -@@ -817,7 +817,7 @@ - <PATHFORMAT>MacOS</PATHFORMAT> - </FILEREF> - </GROUP> -- <GROUP><Name>QtGenerated</NAME> -+ <GROUP><NAME>QtGenerated</NAME> - $$CODEWARRIOR_QPREPROCESS_GROUP - $$CODEWARRIOR_QPREPROCESSOUT_GROUP - </GROUP> -diff -up qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/main.cpp ---- qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig 2008-01-24 13:25:29.000000000 +0100 -+++ qt-x11-free-3.3.8b/tools/designer/uic/main.cpp 2008-01-24 13:28:17.000000000 +0100 -@@ -320,7 +320,7 @@ int main( int argc, char * argv[] ) - out << "/****************************************************************************" << endl; - out << "** Form "<< (impl? "implementation" : "interface") << " generated from reading ui file '" << fileName << "'" << endl; - out << "**" << endl; -- out << "** Created: " << QDateTime::currentDateTime().toString() << endl; -+ out << "** Created by User Interface Compiler" << endl; - out << "**" << endl; - out << "** WARNING! All changes made in this file will be lost!" << endl; - out << "****************************************************************************/" << endl << endl; -diff -up qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp ---- qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig 2008-01-24 13:28:30.000000000 +0100 -+++ qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp 2008-01-24 13:29:10.000000000 +0100 -@@ -137,7 +137,7 @@ void Uic::embed( QTextStream& out, const - for ( it = images.begin(); it != images.end(); ++it ) - out << "** " << *it << "\n"; - out << "**\n"; -- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; -+ out << "** Created by The User Interface Compiler" << "\n"; - out << "**\n"; - out << "** WARNING! All changes made in this file will be lost!\n"; - out << "****************************************************************************/\n"; ---- a/qmake/project.cpp.orig 2015-04-10 17:15:10.731091347 +0200 -+++ b/qmake/project.cpp 2013-12-30 17:58:15.471703644 +0100 -@@ -685,7 +685,7 @@ - // fprintf(stderr,"Current QT version number: " + ver + "\n"); - if (ver != "" && ver != test_version) { - ver = test_version; -- fprintf(stderr,"Changed QT version number to " + test_version + "!\n"); -+ fprintf(stderr,"Changed QT version number to %s!\n", test_version.ascii()); - } - } - } ---- qt3/src/tools/qgdict.cpp 2015-04-10 17:15:11.057092017 +0200 -+++ qt3/src/tools/qgdict.cpp 2013-12-30 17:58:15.516704273 +0100 -@@ -846,11 +846,11 @@ - QString line; - line.fill( '-', 60 ); - double real, ideal; -- qDebug( line.ascii() ); -+ qDebug( "%s", line.ascii() ); - qDebug( "DICTIONARY STATISTICS:" ); - if ( count() == 0 ) { - qDebug( "Empty!" ); -- qDebug( line.ascii() ); -+ qDebug( "%s", line.ascii() ); - return; - } - real = 0.0; -@@ -871,7 +871,7 @@ - while ( b-- ) - *pbuf++ = '*'; - *pbuf = '\0'; -- qDebug( buf ); -+ qDebug( "%s", buf ); - i++; - } - qDebug( "Array size = %d", size() ); -@@ -879,7 +879,7 @@ - qDebug( "Real dist = %g", real ); - qDebug( "Rand dist = %g", ideal ); - qDebug( "Real/Rand = %g", real/ideal ); -- qDebug( line.ascii() ); -+ qDebug( "%s", line.ascii() ); - #endif // QT_DEBUG - } - ---- a/src/tools/qgcache.cpp 2015-04-10 17:15:11.053092009 +0200 -+++ b/src/tools/qgcache.cpp 2013-12-30 17:58:15.515704259 +0100 -@@ -641,7 +641,7 @@ - #if defined(QT_DEBUG) - QString line; - line.fill( '*', 80 ); -- qDebug( line.ascii() ); -+ qDebug( "%s", line.ascii() ); - qDebug( "CACHE STATISTICS:" ); - qDebug( "cache contains %d item%s, with a total cost of %d", - count(), count() != 1 ? "s" : "", tCost ); -@@ -662,7 +662,7 @@ - lruList->dumps != 1 ? "have" : "has", lruList->dumpCosts ); - qDebug( "Statistics from internal dictionary class:" ); - dict->statistics(); -- qDebug( line.ascii() ); -+ qDebug( "%s", line.ascii() ); - #endif - } - diff --git a/redhat/dependencies/qt3/qt3-3.5.13.2.spec b/redhat/dependencies/qt3/qt3-3.5.13.2.spec deleted file mode 100644 index b997dd9ec..000000000 --- a/redhat/dependencies/qt3/qt3-3.5.13.2.spec +++ /dev/null @@ -1,561 +0,0 @@ -# Always install under standard prefix -%define _prefix /usr - -# The following QT4 packages should NOT be installed to -# allow QT3 compilation (please uninstall them prior to compile) -# qt -# qt-sqlite -# qt-mysql -# qt-x11 -# qt-devel -# ...maybe others !!!! - -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Name: qt -%else -Name: qt3 -%endif - -Epoch: 1 -Version: 3.3.8.d%{?preversion:_%{preversion}} -Release: 10%{?dist} -Summary: The shared library for the Qt 3 GUI toolkit - -License: QPL or GPLv2 or GPLv3 -Group: System Environment/Libraries -URL: http://www.trinitydesktop.org/ - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Provides: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} - -Source0: trinity-qt3-3.5.13.2%{?preversion:~%{preversion}}.tar.gz -Source2: qt.sh -Source3: qt.csh -Source4: designer3.desktop -Source5: assistant3.desktop -Source6: linguist3.desktop -Source7: qtconfig3.desktop - -# Monolithic patch for QT3 for TDE 3.5.13.2 -Patch1: qt3-3.5.13.2.patch - -%define qt_dirname qt-3.3 -%define qtdir %{_libdir}/%{qt_dirname} -%define qt_docdir %{_docdir}/qt-devel-%{version} - -%define smp 1 -%define immodule 1 -%define debug 0 - -# MySQL plugins -%define plugin_mysql -plugin-sql-mysql -%define mysql_include_dir %{_includedir}/mysql -%define mysql_lib_dir %{_libdir}/mysql - -# Postgres plugins -%define plugin_psql -plugin-sql-psql - -# ODBC plugins -%define plugin_odbc -plugin-sql-odbc - -# sqlite plugins -%define plugin_sqlite -plugin-sql-sqlite - -%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng -%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugin_sqlite} %{plugins_style} - -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Requires: coreutils -Requires: fontconfig >= 2.0 -Requires: /etc/ld.so.conf.d - -BuildRequires: desktop-file-utils -BuildRequires: libmng-devel -BuildRequires: glibc-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: zlib-devel -BuildRequires: perl -BuildRequires: sed -BuildRequires: findutils -BuildRequires: cups-devel -BuildRequires: tar -BuildRequires: freetype-devel -BuildRequires: fontconfig-devel -BuildRequires: desktop-file-utils -BuildRequires: mysql-devel -BuildRequires: postgresql-devel -BuildRequires: unixODBC-devel -BuildRequires: sqlite-devel -BuildRequires: gcc-c++ -BuildRequires: make - -%if 0%{?rhel} == 4 -BuildRequires: libungif-devel -BuildRequires: xorg-x11-devel -%else -BuildRequires: giflib-devel -BuildRequires: libXrender-devel -BuildRequires: libXrandr-devel -BuildRequires: libXcursor-devel -BuildRequires: libXinerama-devel -BuildRequires: libXft-devel -BuildRequires: libXext-devel -BuildRequires: libX11-devel -BuildRequires: libSM-devel -BuildRequires: libICE-devel -BuildRequires: libXt-devel -BuildRequires: libXmu-devel -BuildRequires: libXi-devel -BuildRequires: xorg-x11-proto-devel -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel -%endif - -%description -Qt is a GUI software toolkit which simplifies the task of writing and -maintaining GUI (Graphical User Interface) applications -for the X Window System. - -Qt is written in C++ and is fully object-oriented. - -This package contains the shared library needed to run Qt 3 -applications, as well as the README files for Qt 3. - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc FAQ LICENSE* README* changes* -%dir %{qtdir} -%dir %{qtdir}/bin -%dir %{qtdir}/lib -%dir %{qtdir}/plugins -%dir %{qtdir}/plugins/sqldrivers -%dir %{qtdir}/plugins/styles -%{qtdir}/translations -%{qtdir}/plugins/designer/ -%if %{immodule} -%{qtdir}/plugins/inputmethods -%endif -%config /etc/profile.d/* -/etc/ld.so.conf.d/* -%{qtdir}/lib/libqui.so.* -%{qtdir}/lib/libqt*.so.* - -########## - -%package config -Summary: Graphical configuration tool for programs using Qt 3 -Group: User Interface/Desktops -Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt3-config = %{?epoch:%{epoch}:}%{version}-%{release} - -%description config -Qt is a GUI software toolkit which simplifies the task of writing and -maintaining GUI (Graphical User Interface) applications -for the X Window System. - -Qt is written in C++ and is fully object-oriented. - -This package contains a graphical configuration tool for programs using Qt 3. - -%files config -%defattr(-,root,root,-) -%{qtdir}/bin/qtconfig -%{_datadir}/applications/*qtconfig*.desktop -%{_datadir}/pixmaps/qtconfig3.png - -########## - -%package devel -Summary: Development files for the Qt 3 GUI toolkit -Group: Development/Libraries -Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt3-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: freetype-devel -Requires: fontconfig-devel -Requires: libpng-devel -Requires: libjpeg-devel -Requires: libmng-devel -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%else -Requires: libXrender-devel -Requires: libXrandr-devel -Requires: libXcursor-devel -Requires: libXinerama-devel -Requires: libXft-devel -Requires: libXext-devel -Requires: libX11-devel -Requires: libSM-devel -Requires: libICE-devel -Requires: libXt-devel -Requires: xorg-x11-proto-devel -Requires: mesa-libGL-devel -Requires: mesa-libGLU-devel -%endif - -%description devel -The %{name}-devel package contains the files necessary to develop -applications using the Qt GUI toolkit: the header files, the Qt meta -object compiler. - -Install %{name}-devel if you want to develop GUI applications using the Qt 3 -toolkit. - -%files devel -%defattr(-,root,root,-) -%{qt_docdir}/ -%{qtdir}/bin/moc -%{qtdir}/bin/uic -%{qtdir}/bin/findtr -%{qtdir}/bin/qt20fix -%{qtdir}/bin/qtrename140 -%{qtdir}/bin/assistant -%{qtdir}/bin/qm2ts -%{qtdir}/bin/qmake -%{qtdir}/bin/qembed -%{qtdir}/bin/linguist -%{qtdir}/bin/lupdate -%{qtdir}/bin/lrelease -%{qtdir}/include -%{qtdir}/mkspecs -%{qtdir}/lib/libqt*.so -%{qtdir}/lib/libqui.so -%{qtdir}/lib/libeditor.a -%{qtdir}/lib/libdesigner*.a -%{qtdir}/lib/libqassistantclient.a -%{qtdir}/lib/*.prl -%{qtdir}/phrasebooks -%{_libdir}/pkgconfig/* -%{_datadir}/applications/*linguist*.desktop -%{_datadir}/applications/*assistant*.desktop -%{_datadir}/pixmaps/linguist3.png -%{_datadir}/pixmaps/assistant3.png - -# QT 3.3.8.D (TDE): 4 binaries have appeared -%{qtdir}/bin/createcw -%{qtdir}/bin/makeqpf -%{qtdir}/bin/mergetr -%{qtdir}/bin/msg2qm - -########## - -%package devel-docs -Summary: Documentation for the Qt 3 GUI toolkit -Group: Development/Libraries -Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-devel-docs < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-devel-docs = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%description devel-docs -The %{name}-devel-docs package contains the man pages, the HTML documentation and -example programs for Qt 3. - -%files devel-docs -%defattr(-,root,root,-) -%doc examples -%doc tutorial -%{_mandir}/*/* - -########## - -%package ODBC -Summary: ODBC drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt3-ODBC = %{?epoch:%{epoch}:}%{version}-%{release} - -%description ODBC -ODBC driver for Qt 3's SQL classes (QSQL) - -%files ODBC -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlodbc.so - -########## - -%package MySQL -Summary: MySQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt3-MySQL = %{?epoch:%{epoch}:}%{version}-%{release} - -%description MySQL -MySQL driver for Qt 3's SQL classes (QSQL) - -%files MySQL -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlmysql.so - -########## - -%package PostgreSQL -Summary: PostgreSQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt3-PostgreSQL = %{?epoch:%{epoch}:}%{version}-%{release} - -%description PostgreSQL -PostgreSQL driver for Qt 3's SQL classes (QSQL) - -%files PostgreSQL -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlpsql.so - -########## - -%package sqlite -Summary: sqlite drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt3-sqlite = %{?epoch:%{epoch}:}%{version}-%{release} - -%description sqlite -sqlite driver for Qt 3's SQL classes (QSQL) - -%files sqlite -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlite.so - -########## - -%package designer -Summary: Interface designer (IDE) for the Qt 3 toolkit -Group: Development/Tools -Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt3-designer = %{?epoch:%{epoch}:}%{version}-%{release} - -%description designer -The %{name}-designer package contains an User Interface designer tool -for the Qt 3 toolkit. - -%files designer -%defattr(-,root,root,-) -%{qtdir}/templates -%{qtdir}/bin/designer -%{_datadir}/applications/*designer*.desktop -%{_datadir}/pixmaps/designer3.png - -########## - -%prep -%setup -q -n trinity-qt3-3.5.13.2%{?preversion:~%{preversion}} - -%patch1 -p1 - - -# convert to UTF-8 -iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_ -mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt - -%build -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" -export QTDEST=%{qtdir} - -# Huho ... it looks like we are not detecting some libraries correctly under RHEL4 ... -%if 0%{?rhel} == 4 -%__sed -i plugins/src/inputmethods/xim/xim.pro \ - -e "/INCLUDEPATH/ s|$| /usr/include/freetype2|" -%endif - -%if %{smp} - export SMP_MFLAGS="%{?_smp_mflags}" -%endif - -%if %{immodule} - sh ./make-symlinks.sh -%endif - -# set correct X11 prefix -if [ -d /usr/X11R6 ]; then - perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=/usr/X11R6/%{_lib}," mkspecs/*/qmake.conf - perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=/usr/X11R6/include," mkspecs/*/qmake.conf -else - perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf - perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf -fi -perl -pi -e "s,QMAKE_INCDIR_OPENGL.*,QMAKE_INCDIR_OPENGL\t=," mkspecs/*/qmake.conf -perl -pi -e "s,QMAKE_LIBDIR_OPENGL.*,QMAKE_LIBDIR_OPENGL\t=," mkspecs/*/qmake.conf - -# don't use rpath -perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf - -perl -pi -e "s|-O2|$INCLUDES %{optflags} -fno-strict-aliasing|g" mkspecs/*/qmake.conf - -# set correct lib path -if [ "%{_lib}" == "lib64" ] ; then - perl -pi -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test - perl -pi -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test -fi - -# Fix QTLIB is under 'lib' instead of 'lib64' under RHEL/Fedora -sed -i "mkspecs/linux-g++-64/qmake.conf" -e "s|\$(QTDIR)/lib64|\$(QTDIR)/lib|" - -# build shared, threaded (default) libraries -echo yes | ./configure \ - -prefix $QTDEST \ - -docdir %{qt_docdir} \ -%if %{_lib} == lib64 - -platform linux-g++-64 \ -%else - -platform linux-g++ \ -%endif -%if %{debug} - -debug \ -%else - -release \ -%endif - -shared \ - -largefile \ - -qt-gif \ - -system-zlib \ - -system-libpng \ - -system-libmng \ - -system-libjpeg \ - -no-exceptions \ - -enable-styles \ - -enable-tools \ - -enable-kernel \ - -enable-widgets \ - -enable-dialogs \ - -enable-iconview \ - -enable-workspace \ - -enable-network \ - -enable-canvas \ - -enable-table \ - -enable-xml \ - -enable-opengl \ - -enable-sql \ - -qt-style-motif \ - %{plugins} \ - -stl \ - -thread \ - -cups \ - -sm \ -%if 0%{?rhel} == 4 - -no-xinerama \ - -no-xrandr \ -%else - -xinerama \ - -xrandr \ -%endif - -xrender \ - -xkb \ - -ipv6 \ - -dlopen-opengl \ - -xft \ - -tablet -v - -make $SMP_MFLAGS src-qmake - -# build sqlite plugin -pushd plugins/src/sqldrivers/sqlite -qmake -o Makefile sqlite.pro -popd - -# build psql plugin -pushd plugins/src/sqldrivers/psql -qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro -popd - -# build mysql plugin -pushd plugins/src/sqldrivers/mysql -qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro -popd - -# build odbc plugin -pushd plugins/src/sqldrivers/odbc -qmake -o Makefile "LIBS+=-lodbc" odbc.pro -popd - -make $SMP_MFLAGS src-moc -make $SMP_MFLAGS sub-src -make $SMP_MFLAGS sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins" - -%install -rm -rf %{buildroot} - -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" -export QTDEST=%{qtdir} - -make install INSTALL_ROOT=%{buildroot} - -for i in findtr qt20fix qtrename140 lrelease lupdate ; do - install bin/$i %{buildroot}%{qtdir}/bin/ -done - -mkdir -p %{buildroot}%{_libdir}/pkgconfig/ -mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/ - -# install man pages -mkdir -p %{buildroot}%{_mandir} -cp -fR doc/man/* %{buildroot}%{_mandir}/ - -# clean up -make -C tutorial clean -make -C examples clean - -# Make sure the examples can be built outside the source tree. -# Our binaries fulfill all requirements, so... -perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"` - -# don't include Makefiles of qt examples/tutorials -find examples -name "Makefile" | xargs rm -f -find examples -name "*.obj" | xargs rm -rf -find examples -name "*.moc" | xargs rm -rf -find tutorial -name "Makefile" | xargs rm -f - -for a in */*/Makefile ; do - sed 's|^SYSCONF_MOC.*|SYSCONF_MOC = %{qtdir}/bin/moc|' < $a > ${a}.2 - mv -v ${a}.2 $a -done - -install -D -m 644 "%{SOURCE2}" %{buildroot}/etc/profile.d/qt3.sh -install -D -m 644 "%{SOURCE3}" %{buildroot}/etc/profile.d/qt3.csh - -# Add desktop files -mkdir -p "%{buildroot}%{_datadir}/applications" -desktop-file-install \ - --dir "%{buildroot}%{_datadir}/applications" \ - --vendor="qt" \ - %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} - -# Patch qmake to use qt-mt unconditionally -perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf - -# remove broken links -rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++* -rm -f %{buildroot}%{qtdir}/lib/*.la - -mkdir -p %{buildroot}/etc/ld.so.conf.d -echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf - -# install icons -install -D -m 644 "tools/assistant/images/qt.png" "%{buildroot}%{_datadir}/pixmaps/qtconfig3.png" -install -D -m 644 "tools/assistant/images/designer.png" "%{buildroot}%{_datadir}/pixmaps/designer3.png" -install -D -m 644 "tools/assistant/images/assistant.png" "%{buildroot}%{_datadir}/pixmaps/assistant3.png" -install -D -m 644 "tools/assistant/images/linguist.png" "%{buildroot}%{_datadir}/pixmaps/linguist3.png" - -# own style directory -mkdir -p "%{buildroot}%{qtdir}/plugins/styles" - - -%clean -rm -rf %{buildroot} - - -%changelog diff --git a/redhat/dependencies/qt3/qtconfig3.desktop b/redhat/dependencies/qt3/qtconfig3.desktop deleted file mode 100644 index 11df0abab..000000000 --- a/redhat/dependencies/qt3/qtconfig3.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt3 Config -Comment=Configure Qt3 behavior, styles, fonts -Exec=qtconfig -Icon=qtconfig3 -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Settings; diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec index 6432e8099..3f5a23803 100644 --- a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec +++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec @@ -28,7 +28,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg sip4-tqt %define tde_prefix /opt/trinity @@ -42,8 +42,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} @@ -71,8 +69,18 @@ BuildRequires: libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0 BuildRequires: trinity-filesystem >= %{tde_version} BuildRequires: gcc-c++ -BuildRequires: python -BuildRequires: python-devel + +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel %description SIP is a tool for generating bindings for C++ classes with some ideas @@ -85,7 +93,7 @@ specificity towards C++ and Python. Summary: Python/C++ bindings generator (Runtime Library) Group: Development/Tools/Building Requires: trinity-filesystem >= %{tde_version} -Requires: python +Requires: %{python} %description -n sip4-tqt SIP is a tool for generating bindings for C++ classes with some ideas @@ -94,11 +102,7 @@ specificity towards C++ and Python. %files -n sip4-tqt %defattr(-,root,root,-) -%dir %{python_sitearch}/sip4_tqt -%{python_sitearch}/sip4_tqt/sip.so -%{python_sitearch}/sip4_tqt/sipconfig.py* -%{python_sitearch}/sip4_tqt/sipdistutils.py* -%{python_sitearch}/sip4_tqt/__init__.py* +%{python_sitearch}/sip4_tqt/ ########## @@ -106,7 +110,7 @@ specificity towards C++ and Python. Summary: Python/C++ bindings generator (Development Files) Group: Development/Libraries/Python Requires: sip4-tqt = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: python-devel +Requires: %{python}-devel %description -n sip4-tqt-devel SIP is a tool for generating bindings for C++ classes with some ideas diff --git a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec deleted file mode 100644 index 8892b1ec2..000000000 --- a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec +++ /dev/null @@ -1,122 +0,0 @@ -# -# spec file for package tqca-tls (version 3.5.13-SRU) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 -%define tde_pkg tqca-tls -%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 libtqt3 %{_lib}qt3 -%else -%define libtqt3 libqt3 -%endif - - -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 1.0 -Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} -Summary: TLS plugin for the TQt Cryptographic Architecture -Group: Applications/Internet -URL: http://delta.affinix.com/qca/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Desktop -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: tqca-tls-3.5.13.2.tar.gz - -BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 -BuildRequires: libtqca-devel >= %{tde_epoch}:1.0 - -BuildRequires: gcc-c++ -BuildRequires: openssl-devel >= 0.9.8 - - -%description -This is a plugin to provide SSL/TLS capability to programs that use the TQt -Cryptographic Architecture (TQCA). TQCA is a library providing an easy API -for several cryptographic algorithms to TQt programs. This package only -contains the TLS plugin. - -########## - -%package -n %{libtqt3}-mt-tqca-tls -Summary: TLS plugin for the TQt Cryptographic Architecture -Group: Applications/Internet - -%description -n %{libtqt3}-mt-tqca-tls -This is a plugin to provide SSL/TLS capability to programs that use the TQt -Cryptographic Architecture (TQCA). TQCA is a library providing an easy API -for several cryptographic algorithms to TQt programs. This package only -contains the TLS plugin. - -%files -n %{libtqt3}-mt-tqca-tls -%defattr(0644,root,root,0755) -%doc README COPYING -%if 0%{?mgaversion} || 0%{?mdkversion} -%{_libdir}/qt3/plugins/crypto/libqca-tls.so -%endif -%if 0%{?suse_version} -%{_usr}/lib/qt3/plugins/crypto/libqca-tls.so -%endif -%if 0%{?rhel} || 0%{?fedora} -%{_libdir}/qt-3.3/plugins/crypto/libqca-tls.so -%endif - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n tqca-tls-3.5.13.2 - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh - -./configure -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{?buildroot} -%__make install INSTALL_ROOT=%{?buildroot} - - -%clean -%__rm -rf %{?buildroot} - - -%changelog diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec index 0323731dc..3f5d9d109 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tqca-tls %define tde_prefix /opt/trinity @@ -100,15 +100,29 @@ contains the TLS plugin. %build unset QTDIR QTINC QTLIB -./configure \ - --qtdir=%{_prefix} +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi -%__make %{?_smp_mflags} +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DWITH_ALL_OPTIONS="ON" \ + \ + .. + +%__make %{?_smp_mflags} || %__make %install %__rm -rf %{?buildroot} -%__make install INSTALL_ROOT=%{?buildroot} +%__make install DESTDIR="%{?buildroot}" -C build %clean diff --git a/redhat/dependencies/tqca/tqca-3.5.13.2.spec b/redhat/dependencies/tqca/tqca-3.5.13.2.spec deleted file mode 100644 index 629131436..000000000 --- a/redhat/dependencies/tqca/tqca-3.5.13.2.spec +++ /dev/null @@ -1,164 +0,0 @@ -# -# spec file for package tqca (version 3.5.13-SRU) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 -%define tde_pkg tqca -%define tde_prefix /opt/trinity -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} - -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%define libtqca %{_lib}tqca -%else -%define libtqca libtqca -%endif - - -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 1.0 -Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} -Summary: TQt Cryptographic Architecture -Group: Development/Libraries/C and C++ -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Desktop -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: tqca-3.5.13.2.tar.gz -Source1: trinity-tqca-rpmlintrc - -BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 -BuildRequires: gcc-c++ - -%description -Taking a hint from the similarly-named Java Cryptography Architecture, -TQCA aims to provide a straightforward and cross-platform crypto API, -using TQt datatypes and conventions. TQCA separates the API from the -implementation, using plugins known as Providers. The advantage of this -model is to allow applications to avoid linking to or explicitly depending -on any particular cryptographic library. This allows one to easily change -or upgrade crypto implementations without even needing to recompile the -application! - -########## - -%package -n %{libtqca}1 -Summary: TQt Cryptographic Architecture -Group: Development/Libraries/C and C++ - -Obsoletes: trinity-libtqca < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-libtqca = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: libtqca = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: libtqca1 = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libtqca}1 -Taking a hint from the similarly-named Java Cryptography Architecture, -TQCA aims to provide a straightforward and cross-platform crypto API, -using TQt datatypes and conventions. TQCA separates the API from the -implementation, using plugins known as Providers. The advantage of this -model is to allow applications to avoid linking to or explicitly depending -on any particular cryptographic library. This allows one to easily change -or upgrade crypto implementations without even needing to recompile the -application! - -%post -n %{libtqca}1 -/sbin/ldconfig - -%postun -n %{libtqca}1 -/sbin/ldconfig - -%files -n %{libtqca}1 -%defattr(-,root,root,-) -%doc COPYING README TODO -%{_libdir}/libqca.so.1 -%{_libdir}/libqca.so.1.0 -%{_libdir}/libqca.so.1.0.0 - -########## - -%package -n %{libtqca}-devel -Summary: TQt Cryptographic Architecture development files -Group: Development/Libraries/C and C++ -Requires: %{libtqca}1 = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: trinity-libtqca-devel < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-libtqca-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: libtqca-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libtqca}-devel -This packages contains the development files for TQCA - -%post -n %{libtqca}-devel -/sbin/ldconfig - -%postun -n %{libtqca}-devel -/sbin/ldconfig - -%files -n %{libtqca}-devel -%defattr(-,root,root,-) -%{_includedir}/qca.h -%{_libdir}/libqca.so - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n tqca-3.5.13.2 - -# Fix 'lib64' library directory -perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh - -./configure \ - --prefix=%{_prefix} \ - --qtdir=${QTDIR} \ - --debug - -%__make %{?_smp_mflags} - - -%install -%__rm -rf $RPM_BUILD_ROOT -%__make install INSTALL_ROOT=$RPM_BUILD_ROOT - - -%clean -%__rm -rf $RPM_BUILD_ROOT - - -%changelog diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca.spec index a6e59e772..efb32c3c6 100644 --- a/redhat/dependencies/tqca/tqca-14.0.0.spec +++ b/redhat/dependencies/tqca/tqca.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tqca %define tde_prefix /opt/trinity @@ -56,6 +56,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: trinity-tqca-rpmlintrc BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 +BuildRequires: cmake BuildRequires: gcc-c++ %description @@ -98,9 +99,8 @@ application! %files -n %{libtqca}1 %defattr(-,root,root,-) %doc COPYING README TODO -%{_libdir}/libqca.so.1 -%{_libdir}/libqca.so.1.0 -%{_libdir}/libqca.so.1.0.0 +%{_libdir}/libtqca.so.1 +%{_libdir}/libtqca.so.1.0.0 ########## @@ -124,8 +124,11 @@ This packages contains the development files for TQCA %files -n %{libtqca}-devel %defattr(-,root,root,-) -%{_includedir}/qca.h -%{_libdir}/libqca.so +%{_includedir}/tqt3/tqca.h +%{_includedir}/tqt3/tqcaprovider.h +%{_libdir}/libtqca.la +%{_libdir}/libtqca.so +%{_libdir}/pkgconfig/tqca.pc ########## @@ -145,23 +148,31 @@ perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra %build unset QTDIR QTINC QTLIB -./configure \ - --prefix=%{_prefix} \ - --qtdir=/usr \ - --debug +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DINCLUDE_INSTALL_DIR=%{_includedir} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + \ + -DWITH_ALL_OPTIONS="ON" \ + .. -# Workaround strange tqmake behaviour in RHEL5 -%if 0%{?rhel} == 5 -%__sed -i "Makefile" -e "s|..\/..\/..\/..|%{_prefix}|g" -%endif - -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install %__rm -rf $RPM_BUILD_ROOT -%__make install INSTALL_ROOT="${RPM_BUILD_ROOT}/" +%__make install DESTDIR=%{?buildroot} -C build %clean diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla.spec index 272b099d5..46f6cb1e5 100644 --- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec +++ b/redhat/dependencies/tqscintilla/tqscintilla.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tqscintilla %define tde_prefix /opt/trinity @@ -151,18 +151,14 @@ This package contains the documentation for tqscintilla. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# Fix perms -chmod -x doc/Scintilla/* -chmod -x example/* - # Fix path in project files %__sed -i "qt/qscintilla.pro" \ -e "s|^INCLUDEPATH = .*|INCLUDEPATH = . ../include ../src /usr/include/tqt /usr/include/tqt3|" \ -e "s|^header.path = .*|header.path = %{_includedir}/tqt3|" \ -e "s|^trans.path = .*|trans.path = %{_datadir}/tqt3/translations|" -# -e "s|\$(QTDIR)|%{_libdir}/tqt3|" \ %__sed -i "designer/designer.pro" \ + -e "s|\$(TQTDIR)|%{_libdir}/tqt3|" \ -e "s|# DESTDIR|DESTDIR|" export QTDIR=%{_libdir}/tqt3 diff --git a/redhat/dependencies/tqt3/tqassistant.desktop b/redhat/dependencies/tqt3/tqassistant.desktop deleted file mode 100644 index c178007d8..000000000 --- a/redhat/dependencies/tqt3/tqassistant.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[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 deleted file mode 100644 index 2152b777b..000000000 --- a/redhat/dependencies/tqt3/tqdesigner.desktop +++ /dev/null @@ -1,78 +0,0 @@ -[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 deleted file mode 100644 index 6cbbe713d..000000000 --- a/redhat/dependencies/tqt3/tqlinguist.desktop +++ /dev/null @@ -1,26 +0,0 @@ -[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.spec b/redhat/dependencies/tqt3/tqt3.spec index 4dae6cea7..daa0c8f29 100644 --- a/redhat/dependencies/tqt3/tqt3.spec +++ b/redhat/dependencies/tqt3/tqt3.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} @@ -49,12 +49,6 @@ BuildRoot: %{_tmppath}/%{name}-%{tde_version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: build-examples.sh -Source11: tqassistant.desktop -Source12: tqdesigner.desktop -Source13: tqlinguist.desktop -Source14: tqtconfig.desktop - - BuildRequires: glibc-devel BuildRequires: gcc-c++ BuildRequires: make @@ -273,8 +267,17 @@ BuildRequires: sqlite3-devel %endif # POSTGRESQL support +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 +BuildRequires: postgresql10 +BuildRequires: postgresql10-devel +%else BuildRequires: postgresql +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +BuildRequires: postgresql-server-devel +%else BuildRequires: postgresql-devel +%endif +%endif # Firebird support %if 0%{?mdkversion} || 0%{?mgaversion} @@ -291,12 +294,12 @@ BuildRequires: %{_lib}fbclient-devel %define with_nis 1 # RPC support -%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 -%if 0%{?fedora} +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 28 BuildRequires: libnsl2-devel -%else -BuildRequires: libnsl-devel +BuildRequires: libtirpc-devel %endif +%if 0%{?suse_version} >= 1500 +BuildRequires: libnsl-devel BuildRequires: libtirpc-devel %endif @@ -342,9 +345,6 @@ applications. %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/ @@ -912,7 +912,6 @@ libtqt3-headers. %{_includedir}/tqt3/ntqrangect.h %{_includedir}/tqt3/ntqscrbar.h %{_includedir}/tqt3/ntqsocknot.h -%{_includedir}/tqt3/ntqstack.h %{_includedir}/tqt3/ntqtabdlg.h %{_includedir}/tqt3/ntqtstream.h %{_includedir}/tqt3/ntqwidcoll.h @@ -943,10 +942,7 @@ 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/moc-tqt3.1* -%{_mandir}/man1/uic-tqt3.1* +%{_mandir}/man1/*.1* ########## @@ -1005,7 +1001,7 @@ or automake. %{_datadir}/tqt3/tools/tqtcreatecw/main.cpp %{_datadir}/tqt3/tools/tqtcreatecw/tqtcreatecw.pro %{_datadir}/applications/tqdesigner.desktop -%{_datadir}/icons/hicolor/32x32/apps/tqdesigner.png +%{_datadir}/pixmaps/tqdesigner.png ########### @@ -1072,7 +1068,7 @@ development files by the translator. %dir %{_docdir}/tqt3-linguist %{_docdir}/tqt3-linguist/qt_untranslated.ts %{_datadir}/applications/tqlinguist.desktop -%{_datadir}/icons/hicolor/32x32/apps/tqlinguist.png +%{_datadir}/pixmaps/tqlinguist.png ########## @@ -1097,11 +1093,10 @@ the package tqt3-apps-devel. %files -n tqt3-assistant %defattr(-,root,root,-) %{_bindir}/tqassistant -%{_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 +%{_datadir}/pixmaps/tqassistant.png ########## @@ -1124,7 +1119,7 @@ install this package. %defattr(-,root,root,-) %{_bindir}/tqtconfig %{_datadir}/applications/tqtconfig.desktop -%{_datadir}/icons/hicolor/32x32/apps/tqtconfig.png +%{_datadir}/pixmaps/tqtconfig.png ########### @@ -1264,18 +1259,14 @@ things that are possible with TQt3. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# Fix strange FTBFS on RHEL5 -%if 0%{?rhel} == 5 -%__sed -i "src/kernel/ntqstyle.h" -e "s|#ifdef ENABLE_T*QSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|" -%endif - %if 0%{?suse_version} echo "suse_version = %{?suse_version}" echo "sle_version = %{?sle_version}" %endif -# Add missing sqlite3 header -%__ln_s ../src/sql/drivers/sqlite3/qsql_sqlite3.h include/qsql_sqlite3.h +%if 0%{?rhel} == 5 +%__sed -i "src/sql/drivers/mysql/qsql_mysql.cpp" -e "s|bool reconnect = 0;|my_bool reconnect = 0;|g" +%endif # fix variables in 'qmake.conf' %__sed -i mkspecs/*/qmake.conf \ @@ -1344,6 +1335,7 @@ echo yes | ./configure \ -docdir "%{_datadir}/tqt3/doc" \ -plugindir "%{_libdir}/tqt3/plugins" \ -translationdir "%{_datadir}/tqt3/translations" \ + -sysshare "%{_datadir}" \ \ -thread \ -shared \ @@ -1400,7 +1392,9 @@ echo yes | ./configure \ -v # proceed -%__make %{?_smp_mflags} sub-src sub-plugins sub-tools +%__make %{?_smp_mflags} sub-src || %__make sub-src +%__make %{?_smp_mflags} sub-plugins || %__make sub-plugins +%__make %{?_smp_mflags} sub-tools # build tqtconv2ui %__make -C tools/designer/tools/tqtconv2ui @@ -1457,12 +1451,6 @@ for i in designer/designer assistant linguist/linguist; do popd done -# desktop lnk files -%__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 @@ -1471,10 +1459,10 @@ done %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" +#__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 @@ -1483,10 +1471,12 @@ install -D -m644 "attic.tar.gz" "%{?buildroot}%{_docdir}/tqt3-compat-headers/att 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 "%{?buildroot}%{_mandir}/man1" +%__install -m644 "doc/man/man1/"*"embed.1" "%{?buildroot}%{_mandir}/man1/" +%__install -m644 "doc/man/man1/"*"lrelease.1" "%{?buildroot}%{_mandir}/man1/" +%__install -m644 "doc/man/man1/"*"lupdate.1" "%{?buildroot}%{_mandir}/man1/" +%__install -m644 "doc/man/man1/"*"moc.1" "%{?buildroot}%{_mandir}/man1/" +%__install -m644 "doc/man/man1/"*"uic.1" "%{?buildroot}%{_mandir}/man1/" # Install source for the designer tools, such as tqtcreatecw. cp -ra tools/designer/tools %{?buildroot}%{_datadir}/tqt3/tools diff --git a/redhat/dependencies/tqt3/tqtconfig.desktop b/redhat/dependencies/tqt3/tqtconfig.desktop deleted file mode 100644 index d20d2191d..000000000 --- a/redhat/dependencies/tqt3/tqtconfig.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[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-3.5.13.2.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec deleted file mode 100644 index 127e0b908..000000000 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec +++ /dev/null @@ -1,270 +0,0 @@ -# -# spec file for package tqtinterface (version 3.5.13-SRU) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# BUILD WARNING: -# Remove qt-devel and qt3-devel and any kde*-devel on your system ! -# Having KDE libraries may cause FTBFS here ! - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 -%define tde_pkg tqtinterface -%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-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 4.2.0 -Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist} -Summary: The Trinity Qt Interface Libraries -Group: System/GUI/Other -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Project -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: /usr -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: qt3 >= 3.3.8d -BuildRequires: qt3-devel >= 3.3.8d - -%if 0%{?suse_version} && 0%{?suse_version} < 1300 -BuildRequires: trinity-cmake-macros -%endif - -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig - -# UUID support -BuildRequires: libuuid-devel - -# PTHREAD support -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -BuildRequires: pth-devel -%endif - -# MESA support -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel -%endif -%if 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: mesaglu-devel -%endif -%if 0%{?suse_version} -BuildRequires: Mesa-libGL-devel -BuildRequires: Mesa-libGLU-devel -%endif - -# X11 libraries -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libxi-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 - -%description -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. - - -########## - -%package -n %{libtqt4} -Group: System/GUI/Other -Summary: The Trinity Qt Interface Libraries -Provides: libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release} - -Requires: qt3 >= 3.3.8d - -%if 0%{?suse_version} && 0%{?suse_version} < 1300 -Requires: trinity-cmake-macros -%endif - -Obsoletes: trinity-tqtinterface < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-tqtinterface = %{?epoch:%{epoch}:}%{version}-%{release} - -%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} -%defattr(-,root,root,-) -%{_libdir}/libtqassistantclient.so.4 -%{_libdir}/libtqassistantclient.so.4.2.0 -%{_libdir}/libtqt.so.4 -%{_libdir}/libtqt.so.4.2.0 - -%post -n %{libtqt4} -/sbin/ldconfig || : - -%postun -n %{libtqt4} -/sbin/ldconfig || : - -########## - -%package -n %{libtqt4}-devel -Group: Development/Libraries/X11 -Summary: The Trinity Qt Interface Libraries (Development Files) -Provides: libtqt4-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -Requires: %{libtqt4} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: qt3-devel >= 3.3.8d -Requires: libuuid-devel - -%if 0%{?suse_version} && 0%{?suse_version} < 1300 -Requires: trinity-cmake-macros -%endif - -Obsoletes: trinity-tqtinterface-devel < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-tqtinterface-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -%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 -/sbin/ldconfig || : - -%postun -n %{libtqt4}-devel -/sbin/ldconfig || : - -%files -n %{libtqt4}-devel -%defattr(-,root,root,-) -%{_bindir}/convert_qt_tqt1 -%{_bindir}/convert_qt_tqt2 -%{_bindir}/convert_qt_tqt3 -%{_bindir}/dcopidl-tqt -%{_bindir}/dcopidl2cpp-tqt -%{_bindir}/dcopidlng-tqt -%{_bindir}/mcopidl-tqt -%{_bindir}/moc-tqt -%{_bindir}/tmoc -%{_bindir}/tqt-replace -%{_bindir}/tqt-replace-stream -%{_bindir}/uic-tqt -%{_includedir}/tqt/ -%{_libdir}/libtqassistantclient.la -%{_libdir}/libtqassistantclient.so -%{_libdir}/libtqt.la -%{_libdir}/libtqt.so -%{_libdir}/pkgconfig/tqt.pc -%{cmake_modules_dir}/*.cmake - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -# Note: specifying 'QT_LIBRARY_DIR' allow using QT3 libraries under -# another directory than QT3_PREFIX. (E.g. Mageia 2, Mandriva ...) -# Otherwise, it defaults to ${QTDIR}/lib ! -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DQT_PREFIX_DIR=${QTDIR} \ - -DQT_VERSION=3 \ - -DQT_LIBRARY_DIR="${QTLIB:-${QTDIR}/%{_lib}}" \ - \ - -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ - -DPKGCONFIG_INSTALL_DIR="%{_libdir}/pkgconfig" \ - -DINCLUDE_INSTALL_DIR=%{_includedir}/tqt \ - -DLIB_INSTALL_DIR=%{_libdir} \ - -DBIN_INSTALL_DIR=%{_bindir} \ - \ - -DCMAKE_LIBRARY_PATH="%{_libdir}" \ - -DCMAKE_INCLUDE_PATH="%{_includedir}" \ - \ - -DWITH_QT3="ON" \ - -DBUILD_ALL="ON" \ - -DUSE_QT3="ON" \ - .. - -%__make %{?_smp_mflags} || %__make - - -%install -%__rm -rf "%{?buildroot}" -%__make install DESTDIR="%{?buildroot}" -C build - -# RHEL 5: add newline at end of include files to avoid warnings -%if 0%{?rhel} && 0%{?rhel} <= 5 -for i in %{?buildroot}%{_includedir}/tqt/*.h; do - echo "" >>${i} -done -%endif - -# Install 'cmake' modules for development use -%__mkdir_p "%{?buildroot}%{cmake_modules_dir}" -for i in cmake/modules/*.cmake; do - %__install -m 644 "$i" "%{?buildroot}%{cmake_modules_dir}" -done - - -%clean -%__rm -rf "%{?buildroot}" - - -%changelog diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec index 09c1cab1d..5d873b86a 100644 --- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface.spec @@ -18,11 +18,12 @@ # BUILD WARNING: # Remove qt-devel and qt3-devel and any kde*-devel on your system ! # Having KDE libraries may cause FTBFS here ! +%global # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tqtinterface %define cmake_modules_dir %{_datadir}/cmake/Modules @@ -77,12 +78,19 @@ BuildRequires: pkgconfig # PTHREAD support -%if 0%{?rhel} >= 5 || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mgaversion} >= 7 +BuildRequires: %{_lib}npth-devel +%else BuildRequires: pth-devel %endif +%endif %if 0%{?fedora} && 0%{?fedora} <= 26 BuildRequires: pth-devel %endif +%if 0%{?rhel} >= 5 && 0%{?rhel} <= 7 +BuildRequires: pth-devel +%endif %if 0%{?suse_version} && 0%{?suse_version} < 1500 BuildRequires: libpth-devel %endif |