diff options
author | François Andriot <albator78@libertysurf.fr> | 2024-05-09 20:50:37 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2024-05-09 20:50:37 +0200 |
commit | c6d21f1119dd7eb5a1395a8d4640f837223f1ea3 (patch) | |
tree | 214cd960ed83db6ae7931d46e7f883b966150e01 /redhat/dependencies | |
parent | 2af6f1823f0e7b5fd6bac85f95e0881ff7d41506 (diff) | |
download | tde-packaging-c6d21f1119dd7eb5a1395a8d4640f837223f1ea3.tar.gz tde-packaging-c6d21f1119dd7eb5a1395a8d4640f837223f1ea3.zip |
RPM: initial support for OpenMandriva
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/dependencies')
-rw-r--r-- | redhat/dependencies/akode/akode.spec | 27 | ||||
-rw-r--r-- | redhat/dependencies/arts/arts.spec | 29 | ||||
-rw-r--r-- | redhat/dependencies/avahi-tqt/avahi-tqt.spec | 17 | ||||
-rw-r--r-- | redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/dbus-tqt/dbus-tqt.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/libart-lgpl/libart-lgpl.spec | 4 | ||||
-rw-r--r-- | redhat/dependencies/libcaldav/libcaldav.spec | 11 | ||||
-rw-r--r-- | redhat/dependencies/libcarddav/libcarddav.spec | 11 | ||||
-rw-r--r-- | redhat/dependencies/polkit-tqt/polkit-tqt.spec | 8 | ||||
-rw-r--r-- | redhat/dependencies/pytqt/pytqt.spec | 10 | ||||
-rw-r--r-- | redhat/dependencies/sip4-tqt/sip4-tqt.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/tde-cmake/tde-cmake.spec | 2 | ||||
-rw-r--r-- | redhat/dependencies/tqca-tls/tqca-tls.spec | 10 | ||||
-rw-r--r-- | redhat/dependencies/tqca/tqca.spec | 7 | ||||
-rw-r--r-- | redhat/dependencies/tqscintilla/tqscintilla.spec | 4 | ||||
-rw-r--r-- | redhat/dependencies/tqt3/tqt3.spec | 67 | ||||
-rw-r--r-- | redhat/dependencies/tqtinterface/tqtinterface.spec | 16 |
17 files changed, 173 insertions, 56 deletions
diff --git a/redhat/dependencies/akode/akode.spec b/redhat/dependencies/akode/akode.spec index 840e36846..958b3eed4 100644 --- a/redhat/dependencies/akode/akode.spec +++ b/redhat/dependencies/akode/akode.spec @@ -73,7 +73,7 @@ BuildRequires: trinity-filesystem >= %{tde_version} # FLAC support %define _with_flac --with-flac %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libflac-devel +BuildRequires: %{_lib}flac-devel %endif %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} BuildRequires: flac-devel @@ -93,14 +93,18 @@ BuildRequires: jack-audio-connection-kit-devel # SAMPLERATE support %if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define _with_libsamplerate --with-libsamplerate +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}samplerate-devel +%else BuildRequires: libsamplerate-devel %endif +%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 +BuildRequires: %{_lib}pulseaudio-devel %endif %if 0%{?rhel} || 0%{?fedora} BuildRequires: pulseaudio-libs-devel @@ -114,18 +118,33 @@ BuildRequires: pulseaudio-devel %ifarch %{ix86} x86_64 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %define _with_libmad --with-libmad +%if 0%{?mdkver} +BuildRequires: %{_lib}mad-devel +%else BuildRequires: libmad-devel %endif %endif +%endif # ALSA support %if 0%{?suse_version} BuildRequires: alsa-devel %else +%if 0%{?mdkver} +BuildRequires: %{_lib}asound-devel +%else BuildRequires: alsa-lib-devel %endif +%endif + +# VORBIS support +%if 0%{?mdkver} || 0%{?mgaversion} +%define libvorbis_devel %{_lib}vorbis-devel +%else +%define libvorbis_devel libvorbis-devel +%endif +BuildRequires: %{libvorbis_devel} -BuildRequires: libvorbis-devel BuildRequires: speex-devel @@ -314,7 +333,7 @@ This package contains the mad decoder for Akode. %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec index cc0015785..5b1ecb63a 100644 --- a/redhat/dependencies/arts/arts.spec +++ b/redhat/dependencies/arts/arts.spec @@ -72,10 +72,24 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: audiofile-devel -BuildRequires: alsa-lib-devel BuildRequires: glib2-devel BuildRequires: gsl-devel -BuildRequires: libvorbis-devel + +# VORBIS support +%if 0%{?mdkver} || 0%{?mgaversion} +%define libvorbis_devel %{_lib}vorbis-devel +%else +%define libvorbis_devel libvorbis-devel +%endif +BuildRequires: %{libvorbis_devel} + +# ALSA support +%if 0%{?mdkver} +%define alsa_devel %{_lib}asound-devel +%else +%define alsa_devel alsa-lib-devel +%endif +BuildRequires: %{alsa_devel} # ESOUND support #define with_esound 1 @@ -117,6 +131,9 @@ BuildRequires: libtool %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} || 0%{?mdkversion} || 0%{?mgaversion} %define mad_devel libmad-devel %endif +%if 0%{?mdkver} +%define mad_devel %{_lib}mad-devel +%endif BuildRequires: %{mad_devel} %endif %endif @@ -177,10 +194,10 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: arts-devel < %{?epoch:%{epoch}:}%{version}-%{release} %endif -Requires: alsa-lib-devel +Requires: %{alsa_devel} Requires: audiofile-devel -Requires: libvorbis-devel -%{?with_esound:Requires: esound-devel} +%{?libvorbis_devel:Requires: %{libvorbis_devel}} +%{?with_esound:Requires: esound-devel} %{?with_libmad:Requires: %{mad_devel}} %{?with_jack:Requires: %{jack_devel}} @@ -244,7 +261,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt.spec b/redhat/dependencies/avahi-tqt/avahi-tqt.spec index 30b64effe..94e0955f1 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt.spec @@ -68,7 +68,7 @@ BuildRequires: gettext-devel BuildRequires: xorg-x11-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libxi-devel +BuildRequires: %{_lib}xi-devel %endif %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora} BuildRequires: libXi-devel @@ -86,11 +86,15 @@ BuildRequires: dbus-devel %endif # PCAP support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}cap-devel +%else BuildRequires: libcap-devel +%endif # AVAHI support %if 0%{?mgaversion} || 0%{?mdkversion} -%define avahi_devel libavahi-client-devel +%define avahi_devel %{_lib}avahi-client-devel %endif %if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora} %define avahi_devel avahi-devel @@ -101,9 +105,12 @@ BuildRequires: libcap-devel %if 0%{?rhel} || 0%{?fedora} BuildRequires: expat-devel %endif -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?suse_version} BuildRequires: libexpat-devel %endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}expat-devel +%endif # NAS support %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} @@ -210,7 +217,7 @@ into a TQt main loop application. %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -222,6 +229,8 @@ fi -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ + \ + -DLIB_INSTALL_DIR="%{_libdir}" \ .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec index 6c2c42e3d..6a084abdf 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec @@ -158,7 +158,7 @@ See the dbus description for more information about D-BUS in general. %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt.spec b/redhat/dependencies/dbus-tqt/dbus-tqt.spec index 9e8e64960..758b7cf8c 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt.spec @@ -159,7 +159,7 @@ See the dbus description for more information about D-BUS in general. %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl.spec b/redhat/dependencies/libart-lgpl/libart-lgpl.spec index e457845d4..63c6772d4 100644 --- a/redhat/dependencies/libart-lgpl/libart-lgpl.spec +++ b/redhat/dependencies/libart-lgpl/libart-lgpl.spec @@ -184,7 +184,7 @@ especially suitable for embedded applications. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -199,6 +199,7 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + -DLIB_INSTALL_DIR="%{_libdir}" \ -DSHARE_INSTALL_PREFIX="%{_datadir}" \ \ -DWITH_ALL_OPTIONS=ON \ @@ -222,5 +223,4 @@ fi %__rm -rf $RPM_BUILD_ROOT - %changelog diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec index 605c3102f..0fe560871 100644 --- a/redhat/dependencies/libcaldav/libcaldav.spec +++ b/redhat/dependencies/libcaldav/libcaldav.spec @@ -60,16 +60,24 @@ BuildRequires: libtool BuildRequires: fdupes # GTK2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}gtk+2.0-devel +%else %if 0%{?rhel} == 4 BuildRequires: evolution28-gtk2-devel %else BuildRequires: glib2-devel BuildRequires: gtk2-devel %endif +%endif # CURL support %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} +%define libcurl_devel %{_lib}curl-devel >= 7.15.5 +%else %define libcurl_devel libcurl-devel >= 7.15.5 +%endif %else %define libcurl_devel curl-devel >= 7.15.5 %endif @@ -156,7 +164,7 @@ This package includes the development files. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -171,6 +179,7 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + -DLIB_INSTALL_DIR="%{_libdir}" \ -DSHARE_INSTALL_PREFIX="%{_datadir}" \ \ -DWITH_ALL_OPTIONS=ON \ diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index 4da81f397..cf992da1e 100644 --- a/redhat/dependencies/libcarddav/libcarddav.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -61,7 +61,11 @@ BuildRequires: libtool # CURL support %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} +%define libcurl_devel %{_lib}curl-devel >= 7.15.5 +%else %define libcurl_devel libcurl-devel >= 7.15.5 +%endif %else # Specific CURL version for TDE on RHEL 5 (and older) %define libcurl_devel curl-devel >= 7.15.5 @@ -69,12 +73,16 @@ BuildRequires: libtool %{?libcurl_devel:BuildRequires: %{libcurl_devel}} # GTK2 support +%if 0%{?mdkver} +BuildRequires: %{_lib}gtk+2.0-devel +%else %if 0%{?rhel} == 4 BuildRequires: evolution28-gtk2-devel %else BuildRequires: glib2-devel BuildRequires: gtk2-devel %endif +%endif %description Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. @@ -158,7 +166,7 @@ This package contains the development files. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -173,6 +181,7 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + -DLIB_INSTALL_DIR="%{_libdir}" \ -DSHARE_INSTALL_PREFIX="%{_datadir}" \ \ -DWITH_ALL_OPTIONS=ON \ diff --git a/redhat/dependencies/polkit-tqt/polkit-tqt.spec b/redhat/dependencies/polkit-tqt/polkit-tqt.spec index 84ae27465..cd6677eb2 100644 --- a/redhat/dependencies/polkit-tqt/polkit-tqt.spec +++ b/redhat/dependencies/polkit-tqt/polkit-tqt.spec @@ -59,7 +59,11 @@ BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: gettext +%if 0%{?mdkver} +BuildRequires: %{_lib}polkit1-devel +%else BuildRequires: polkit-devel +%endif %description PolicyKit is an application-level toolkit for defining and handling the policy @@ -195,7 +199,7 @@ This package contains example files and applications. %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -208,6 +212,8 @@ fi -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=ON \ \ + -DLIB_INSTALL_DIR="%{_libdir}" \ + \ -DBUILD_ALL="ON" \ -DWITH_ALL_OPTIONS="ON" \ .. diff --git a/redhat/dependencies/pytqt/pytqt.spec b/redhat/dependencies/pytqt/pytqt.spec index ac5cfa278..ade0f5694 100644 --- a/redhat/dependencies/pytqt/pytqt.spec +++ b/redhat/dependencies/pytqt/pytqt.spec @@ -88,8 +88,12 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -103,7 +107,7 @@ BuildRequires: xorg-x11-libXmu-devel BuildRequires: libXmu-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} >= 4 -BuildRequires: libxmu-devel +BuildRequires: %{_lib}xmu-devel %endif %if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3 BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel @@ -142,7 +146,7 @@ same way in both languages (with syntax differences, of course) %defattr(-,root,root,-) %doc NEWS README %dir %{python_sitearch}/PyTQt -%if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/PyTQt/__init__.py* %if 0%{?rhel} == 7 %{python_sitearch}/PyTQt/__pycache__/__init__.*.pyc @@ -232,7 +236,7 @@ packages based on them, like PyTDE. %files -n pytqt-devel %defattr(-,root,root,-) -%if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/PyTQt/pytqtconfig.py* %if 0%{?rhel} == 7 %{python_sitearch}/PyTQt/__pycache__/pytqtconfig.*.pyc diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec index 7e3b7ac4c..f4ce700ae 100644 --- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec +++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec @@ -113,7 +113,7 @@ specificity towards C++ and Python. %files -n sip4-tqt %defattr(-,root,root,-) %{python_sitearch}/sip_tqt.so -%if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/sip_tqt_config.py* %{python_sitearch}/sip_tqt_distutils.py* %if 0%{?rhel} == 7 diff --git a/redhat/dependencies/tde-cmake/tde-cmake.spec b/redhat/dependencies/tde-cmake/tde-cmake.spec index 3728e6314..4901e544e 100644 --- a/redhat/dependencies/tde-cmake/tde-cmake.spec +++ b/redhat/dependencies/tde-cmake/tde-cmake.spec @@ -73,7 +73,7 @@ intltool-merge used to merge translations into desktop files. %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec index 76bef58de..bc76e9208 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls.spec @@ -59,7 +59,13 @@ BuildRequires: libtqca-devel >= %{tde_epoch}:1.0 BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ -BuildRequires: openssl-devel >= 0.9.8 + +# OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else +BuildRequires: openssl-devel +%endif %description @@ -101,7 +107,7 @@ contains the TLS plugin. %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/dependencies/tqca/tqca.spec b/redhat/dependencies/tqca/tqca.spec index baa47c6a0..367e18958 100644 --- a/redhat/dependencies/tqca/tqca.spec +++ b/redhat/dependencies/tqca/tqca.spec @@ -67,7 +67,12 @@ Provides: %{libtqt3}-mt-tqca-tls = %{version}-%{release} BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ + +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel >= 0.9.8 +%endif %description Taking a hint from the similarly-named Java Cryptography Architecture, @@ -160,7 +165,7 @@ perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/dependencies/tqscintilla/tqscintilla.spec b/redhat/dependencies/tqscintilla/tqscintilla.spec index 448022bec..155b56e18 100644 --- a/redhat/dependencies/tqscintilla/tqscintilla.spec +++ b/redhat/dependencies/tqscintilla/tqscintilla.spec @@ -184,7 +184,7 @@ This package contains the documentation for tqscintilla. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -197,6 +197,8 @@ fi -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=ON \ \ + -DLIB_INSTALL_DIR="%{_libdir}" \ + \ -DBUILD_ALL="ON" \ -DWITH_ALL_OPTIONS="ON" \ .. diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec index c9d906451..aff20e142 100644 --- a/redhat/dependencies/tqt3/tqt3.spec +++ b/redhat/dependencies/tqt3/tqt3.spec @@ -64,13 +64,28 @@ BuildRequires: tar BuildRequires: zlib-devel # JPEG support -BuildRequires: libjpeg-devel +%if 0%{?mdkver} || 0%{?mgaversion} +%define libjpeg %{_lib}jpeg +%else +%define libjpeg libjpeg +%endif +%{?libjpeg:BuildRequires: %{libjpeg}-devel} # MNG support -BuildRequires: libmng-devel +%if 0%{?mdkver} || 0%{?mgaversion} +%define libmng %{_lib}mng +%else +%define libmng libmng +%endif +%{?libmng:BuildRequires: %{libmng}-devel} # PNG support -BuildRequires: libpng-devel +%if 0%{?mdkver} || 0%{?mgaversion} +%define libpng %{_lib}png +%else +%define libpng libpng +%endif +%{?libpng:BuildRequires: %{libpng}-devel} # GIF support BuildRequires: giflib-devel @@ -97,9 +112,12 @@ BuildRequires: cups-devel %{?glib2_devel:BuildRequires: %{glib2_devel}} # UUID support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 %define uuid_devel libuuid-devel %endif +%if 0%{?mgaversion} || 0%{?mdkversion} +%define uuid_devel %{_lib}uuid-devel +%endif %if 0%{?rhel} == 5 %define uuid_devel e2fsprogs-devel %endif @@ -108,8 +126,12 @@ BuildRequires: cups-devel # LIBAUDIO support %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} %define with_nas 1 +%if 0%{?mgaversion} || 0%{?mdkversion} +%define libaudio_devel %{_lib}audio-devel nas-devel +%else %define libaudio_devel nas-devel %endif +%endif %{?libaudio_devel:BuildRequires: %{libaudio_devel}} # Xrender support @@ -117,7 +139,7 @@ BuildRequires: cups-devel %define xrender_devel libXrender-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} -%define xrender_devel libxrender-devel +%define xrender_devel %{_lib}xrender-devel %endif %{?xrender_devel:BuildRequires: %{xrender_devel}} @@ -126,11 +148,10 @@ BuildRequires: cups-devel %define xrandr_devel libXrandr-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%define xrandr_devel %{_lib}xrandr-devel +%endif %if 0%{?pclinuxos} %define xrandr_devel %{_lib}xrandr2-devel -%else -%define xrandr_devel libxrandr-devel -%endif %endif %{?xrandr_devel:BuildRequires: %{xrandr_devel}} @@ -139,7 +160,7 @@ BuildRequires: cups-devel %define xcursor_devel libXcursor-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} -%define xcursor_devel libxcursor-devel +%define xcursor_devel %{_lib}xcursor-devel %endif %{?xcursor_devel:BuildRequires: %{xcursor_devel}} @@ -148,7 +169,7 @@ BuildRequires: cups-devel %define xinerama_devel libXinerama-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} -%define xinerama_devel libxinerama-devel +%define xinerama_devel %{_lib}xinerama-devel %endif %{?xinerama_devel:BuildRequires: %{xinerama_devel}} @@ -157,7 +178,7 @@ BuildRequires: cups-devel %define xft_devel libXft-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} -%define xft_devel libxft-devel +%define xft_devel %{_lib}xft-devel %endif %{?xft_devel:BuildRequires: %{xft_devel}} @@ -166,7 +187,7 @@ BuildRequires: cups-devel %define xext_devel libXext-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} -%define xext_devel libxext-devel +%define xext_devel %{_lib}xext-devel %endif %{?xext_devel:BuildRequires: %{xext_devel}} @@ -175,7 +196,7 @@ BuildRequires: cups-devel %define x11_devel libX11-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} -%define x11_devel libx11-devel +%define x11_devel %{_lib}x11-devel %endif %{?x11_devel:BuildRequires: %{x11_devel}} @@ -184,7 +205,7 @@ BuildRequires: cups-devel %define sm_devel libSM-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} -%define sm_devel libsm-devel +%define sm_devel %{_lib}sm-devel %endif %{?sm_devel:BuildRequires: %{sm_devel}} @@ -193,7 +214,7 @@ BuildRequires: cups-devel %define ice_devel libICE-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} -%define ice_devel libice-devel +%define ice_devel %{_lib}ice-devel %endif %{?ice_devel:BuildRequires: %{ice_devel}} @@ -210,7 +231,7 @@ BuildRequires: xorg-x11-libXmu-devel BuildRequires: libXmu-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} >= 4 -BuildRequires: libxmu-devel +BuildRequires: %{_lib}xmu-devel %endif %if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3 BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel @@ -221,7 +242,7 @@ BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel %define xi_devel xorg-x11-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} -%define xi_devel libxi-devel +%define xi_devel %{_lib}xi-devel %endif %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora} %define xi_devel libXi-devel @@ -245,9 +266,13 @@ BuildRequires: mesa-libGLU-devel %if 0%{?pclinuxos} BuildRequires: MesaGLU-devel %else +%if 0%{?mdkver} +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -281,7 +306,7 @@ BuildRequires: firebird-devel %endif # FBCLIENT support -%if 0%{?mgaversion} >= 6 +%if 0%{?mdkver} || 0%{?mgaversion} >= 6 BuildRequires: %{_lib}fbclient-devel %endif @@ -297,7 +322,7 @@ BuildRequires: libtirpc-devel BuildRequires: libnsl-devel BuildRequires: libtirpc-devel %endif -%if 0%{?mgaversion} +%if 0%{?mdkver} || 0%{?mgaversion} BuildRequires: %{_lib}nsl-devel BuildRequires: %{_lib}tirpc-devel %endif @@ -378,8 +403,8 @@ Requires: %{libtqt3}-mt = %{version}-%{release} Requires: glibc-devel Requires: fontconfig-devel Requires: freetype-devel -Requires: libjpeg-devel -Requires: libpng-devel +Requires: %{libjpeg}-devel +Requires: %{libpng}-devel Requires: zlib-devel %{?glib2_devel:Requires: %{glib2_devel}} diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec index 8b3f5b4d7..f36c916fb 100644 --- a/redhat/dependencies/tqtinterface/tqtinterface.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface.spec @@ -62,18 +62,20 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig # UUID support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 %define uuid_devel libuuid-devel %endif +%if 0%{?mgaversion} || 0%{?mdkversion} +%define uuid_devel %{_lib}uuid-devel +%endif %if 0%{?rhel} == 5 %define uuid_devel e2fsprogs-devel %endif %{?uuid_devel:BuildRequires: %{uuid_devel}} - # PTHREAD support %if 0%{?mdkversion} || 0%{?mgaversion} -%if 0%{?mgaversion} >= 7 +%if 0%{?mgaversion} >= 7 || 0%{?mdkver} BuildRequires: %{_lib}npth-devel %else BuildRequires: pth-devel @@ -95,8 +97,12 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -107,7 +113,7 @@ BuildRequires: Mesa-libGLU-devel BuildRequires: xorg-x11-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libxi-devel +BuildRequires: %{_lib}xi-devel %endif %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora} BuildRequires: libXi-devel @@ -213,7 +219,7 @@ although some code has been added for useful functions that are no longer part o %build unset QTDIR QTINC QTLIB -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi |