diff options
Diffstat (limited to 'redhat/dependencies/libcarddav/libcarddav.spec')
| -rw-r--r-- | redhat/dependencies/libcarddav/libcarddav.spec | 11 |
1 files changed, 10 insertions, 1 deletions
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 \ |