diff options
Diffstat (limited to 'redhat/dependencies')
19 files changed, 56 insertions, 30 deletions
diff --git a/redhat/dependencies/akode/akode.spec b/redhat/dependencies/akode/akode.spec index 008e7db44..947c5030d 100644 --- a/redhat/dependencies/akode/akode.spec +++ b/redhat/dependencies/akode/akode.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -89,7 +89,10 @@ BuildRequires: flac-devel %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}jack-devel %endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%if 0%{?rhel} >= 10 +BuildRequires: pipewire-jack-audio-connection-kit-devel +%endif +%if ( 0%{?rhel} && 0%{?rhel} <= 9 ) || 0%{?fedora} || 0%{?suse_version} BuildRequires: jack-audio-connection-kit-devel %endif %endif diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec index f34fd0f70..a37281728 100644 --- a/redhat/dependencies/arts/arts.spec +++ b/redhat/dependencies/arts/arts.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg arts %define tde_prefix /opt/trinity @@ -71,10 +71,18 @@ BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: pkgconfig -BuildRequires: audiofile-devel BuildRequires: glib2-devel BuildRequires: gsl-devel +# AUDIOFILE support +%if 0%{?rhel} >= 10 +%else +%define with_audiofile 1 +%endif +%if 0%{?with_audiofile} +BuildRequires: audiofile-devel +%endif + # VORBIS support %if 0%{?mdkver} || 0%{?mgaversion} %if 0%{?pclinuxos} @@ -107,6 +115,9 @@ BuildRequires: esound-devel %if 0%{?rhel} >= 5 || 0%{?fedora} %define jack_devel jack-audio-connection-kit-devel %endif +%if 0%{?rhel} >= 10 +%define jack_devel pipewire-jack-audio-connection-kit-devel +%endif %if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} %define jack_devel libjack-devel %endif @@ -199,7 +210,9 @@ Obsoletes: arts-devel < %{?epoch:%{epoch}:}%{version}-%{release} %endif Requires: %{alsa_devel} +%if 0%{?with_audiofile} Requires: audiofile-devel +%endif %{?libvorbis_devel:Requires: %{libvorbis_devel}} %{?with_esound:Requires: esound-devel} %{?with_libmad:Requires: %{mad_devel}} @@ -289,7 +302,7 @@ fi -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ \ -DWITH_ALSA=ON \ - -DWITH_AUDIOFILE=ON \ + %{?with_audiofile:-DWITH_AUDIOFILE=ON} %{!?with_audiofile:-DWITH_AUDIOFILE=OFF} \ -DWITH_VORBIS=ON \ %{?with_libmad:-DWITH_MAD=ON} %{!?with_libmad:-DWITH_MAD=OFF} \ %{?with_esound:-DWITH_ESOUND=ON} %{!?with_esound:-DWITH_ESOUND=OFF} \ diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt.spec b/redhat/dependencies/avahi-tqt/avahi-tqt.spec index 17ee70516..f062fc28a 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt.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.1.4 +%define tde_version 14.1.5 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec index 55e9a46f1..57c5d4b2e 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.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.1.4 +%define tde_version 14.1.5 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt.spec b/redhat/dependencies/dbus-tqt/dbus-tqt.spec index 8aa6a3954..18f370cd2 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt.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.1.4 +%define tde_version 14.1.5 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl.spec b/redhat/dependencies/libart-lgpl/libart-lgpl.spec index 880ed2fb7..b17172a72 100644 --- a/redhat/dependencies/libart-lgpl/libart-lgpl.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.1.4 +%define tde_version 14.1.5 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec index 05d80239a..7347242de 100644 --- a/redhat/dependencies/libcaldav/libcaldav.spec +++ b/redhat/dependencies/libcaldav/libcaldav.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg libcaldav %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index bb66ea887..7f7360bd7 100644 --- a/redhat/dependencies/libcarddav/libcarddav.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg libcarddav %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/polkit-tqt/polkit-tqt.spec b/redhat/dependencies/polkit-tqt/polkit-tqt.spec index 1a1ce5875..111bdd5a5 100644 --- a/redhat/dependencies/polkit-tqt/polkit-tqt.spec +++ b/redhat/dependencies/polkit-tqt/polkit-tqt.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg polkit-tqt diff --git a/redhat/dependencies/pytqt/pytqt.spec b/redhat/dependencies/pytqt/pytqt.spec index 6a9b07588..9c16a15b2 100644 --- a/redhat/dependencies/pytqt/pytqt.spec +++ b/redhat/dependencies/pytqt/pytqt.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg pytqt %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec index cc4141eb7..2768474cd 100644 --- a/redhat/dependencies/sip4-tqt/sip4-tqt.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.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg sip4-tqt %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/tde-cmake/tde-cmake.spec b/redhat/dependencies/tde-cmake/tde-cmake.spec index bdcff5902..bbc7d30f0 100644 --- a/redhat/dependencies/tde-cmake/tde-cmake.spec +++ b/redhat/dependencies/tde-cmake/tde-cmake.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tde-cmake diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec index ce8e70f29..5e9e04a1e 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls.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.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tqca-tls %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/tqca/tqca.spec b/redhat/dependencies/tqca/tqca.spec index 13501feaa..6a255b386 100644 --- a/redhat/dependencies/tqca/tqca.spec +++ b/redhat/dependencies/tqca/tqca.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tqca %define tde_prefix /opt/trinity diff --git a/redhat/dependencies/tqscintilla/tqscintilla.spec b/redhat/dependencies/tqscintilla/tqscintilla.spec index e7367e9eb..1fd3beefd 100644 --- a/redhat/dependencies/tqscintilla/tqscintilla.spec +++ b/redhat/dependencies/tqscintilla/tqscintilla.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tqscintilla diff --git a/redhat/dependencies/tqt3/build-examples.sh b/redhat/dependencies/tqt/build-examples.sh index f62d83b85..f62d83b85 100644 --- a/redhat/dependencies/tqt3/build-examples.sh +++ b/redhat/dependencies/tqt/build-examples.sh diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt/tqt.spec index eb9e23cc4..a1fa8950e 100644 --- a/redhat/dependencies/tqt3/tqt3.spec +++ b/redhat/dependencies/tqt/tqt.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} @@ -27,7 +27,7 @@ %endif -Name: trinity-tqt3 +Name: trinity-tqt Version: 3.5.0 Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TQt GUI Library, Version 3 @@ -48,7 +48,7 @@ BuildRoot: %{_tmppath}/%{name}-%{tde_version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: build-examples.sh -Source2: trinity-tqt3-rpmlintrc +Source2: trinity-tqt-rpmlintrc BuildRequires: glibc-devel %if "%{?c_compiler}" != "clang" @@ -83,11 +83,7 @@ BuildRequires: zlib-devel # PNG support %if 0%{?mdkver} || 0%{?mgaversion} -%if 0%{?pclinuxos} -%define libpng %{_lib}png1.6 -%else %define libpng %{_lib}png -%endif %else %define libpng libpng %endif @@ -280,7 +276,11 @@ BuildRequires: Mesa-libGLU-devel %endif # MYSQL support +%if 0%{?rhel} >= 10 +BuildRequires: mariadb-devel +%else BuildRequires: mysql-devel +%endif # unixODBC support BuildRequires: unixODBC-devel @@ -312,22 +312,32 @@ BuildRequires: %{_lib}fbclient-devel %endif # NIS support +%if 0%{?suse_version} >= 1600 +%else %define with_nis 1 +%endif # RPC support %if 0%{?rhel} >= 8 || 0%{?fedora} >= 28 -BuildRequires: libnsl2-devel BuildRequires: libtirpc-devel %endif %if 0%{?suse_version} >= 1500 -BuildRequires: libnsl-devel BuildRequires: libtirpc-devel %endif %if 0%{?mdkver} || 0%{?mgaversion} -BuildRequires: %{_lib}nsl-devel BuildRequires: %{_lib}tirpc-devel %endif +# NSL support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 28 +BuildRequires: libnsl2-devel +%endif +%if 0%{?suse_version} >= 1500 && 0%{?suse_version} < 1600 +BuildRequires: libnsl-devel +%endif +%if 0%{?mdkver} || 0%{?mgaversion} +BuildRequires: %{_lib}nsl-devel +%endif # x86_64 specific stuff %if "%{_lib}" != "lib" %if 0%{?mdkversion} || ( 0%{?mgaversion} && 0%{?mgaversion} <= 2) @@ -1505,7 +1515,7 @@ for i in designer/designer assistant linguist/linguist; do popd done -%if 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %suse_update_desktop_file tqassistant Documentation %suse_update_desktop_file tqdesigner GUIDesigner %suse_update_desktop_file tqlinguist Translation diff --git a/redhat/dependencies/tqt3/trinity-tqt3-rpmlintrc b/redhat/dependencies/tqt/trinity-tqt-rpmlintrc index d131ff5e9..d131ff5e9 100644 --- a/redhat/dependencies/tqt3/trinity-tqt3-rpmlintrc +++ b/redhat/dependencies/tqt/trinity-tqt-rpmlintrc diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec index 29b285b3f..48e1489f3 100644 --- a/redhat/dependencies/tqtinterface/tqtinterface.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.4 +%define tde_version 14.1.5 %endif %define tde_pkg tqtinterface |