diff options
| author | François Andriot <albator78@libertysurf.fr> | 2024-06-13 08:37:13 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2024-06-13 08:38:31 +0200 |
| commit | ac47c91c6c011631186592695e4251a3bb97dcca (patch) | |
| tree | d91e4e98d96b4b2618d9fb3b879c28b67fc63a8f /redhat/core/tdeaccessibility | |
| parent | 1488354ed514d043f0c15ddbe8b9aa7c0b43f46c (diff) | |
| download | tde-packaging-ac47c91c.tar.gz tde-packaging-ac47c91c.zip | |
RPM: synchronize redhat directory with r14.1.x branch
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/core/tdeaccessibility')
| -rw-r--r-- | redhat/core/tdeaccessibility/tdeaccessibility.spec | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/redhat/core/tdeaccessibility/tdeaccessibility.spec b/redhat/core/tdeaccessibility/tdeaccessibility.spec index 7034a5984..35b6e2804 100644 --- a/redhat/core/tdeaccessibility/tdeaccessibility.spec +++ b/redhat/core/tdeaccessibility/tdeaccessibility.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.0 +%define tde_version 14.1.2 %endif %define tde_pkg tdeaccessibility %define tde_prefix /opt/trinity @@ -95,11 +95,23 @@ BuildRequires: trinity-akode-devel %endif # ALSA support -BuildRequires: alsa-lib-devel +%if 0%{?mdkver} +BuildRequires: %{_lib}asound-devel +%else +BuildRequires: alsa-lib-devel +%endif # GLIB2 support BuildRequires: glib2-devel +# JPEG support +%if 0%{?mdkver} +%define libjpeg %{_lib}jpeg +%else +%define libjpeg libjpeg +%endif +BuildRequires: %{libjpeg}-devel + # XCB support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos} BuildRequires: libxcb-devel @@ -401,7 +413,7 @@ Summary: Development files for tdeaccessibility Group: Development/Libraries/X11 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-tdelibs-devel >= %{version} -Requires: libjpeg-devel +Requires: %{libjpeg}-devel Requires: libpng-devel Obsoletes: trinity-kdeaccessibility-devel < %{?epoch:%{epoch}:}%{version}-%{release} @@ -439,7 +451,7 @@ unset QTDIR QTLIB QTINC export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_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 |