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/dependencies/libcarddav/libcarddav.spec | |
parent | 1488354ed514d043f0c15ddbe8b9aa7c0b43f46c (diff) | |
download | tde-packaging-ac47c91c6c011631186592695e4251a3bb97dcca.tar.gz tde-packaging-ac47c91c6c011631186592695e4251a3bb97dcca.zip |
RPM: synchronize redhat directory with r14.1.x branch
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/dependencies/libcarddav/libcarddav.spec')
-rw-r--r-- | redhat/dependencies/libcarddav/libcarddav.spec | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index a06752bc1..cf992da1e 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.0 +%define tde_version 14.1.2 %endif %define tde_pkg libcarddav %define tde_prefix /opt/trinity @@ -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 \ |