summaryrefslogtreecommitdiffstats
path: root/redhat/libraries/libtdeldap
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-09-02 23:19:14 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-09-02 23:19:14 +0200
commitffed930935095fac5a3c79dc4a58ffbc51541482 (patch)
tree877c02c3bbbc63c800037a699200374dad03042d /redhat/libraries/libtdeldap
parent04dae637208c43e774f6b8d92f717c03b15ea9a9 (diff)
downloadtde-packaging-ffed930935095fac5a3c79dc4a58ffbc51541482.tar.gz
tde-packaging-ffed930935095fac5a3c79dc4a58ffbc51541482.zip
RPM Packaging: update R14 libraries
Diffstat (limited to 'redhat/libraries/libtdeldap')
-rw-r--r--redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec9
1 files changed, 6 insertions, 3 deletions
diff --git a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec
index 47ca83b17..6256383ba 100644
--- a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec
+++ b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec
@@ -40,7 +40,6 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0: libtdeldap-14.0.0-ftbfs.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
@@ -48,7 +47,13 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
+# OPENLDAP support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: openldap-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: openldap2-devel
+%endif
%description
@@ -100,7 +105,6 @@ libtdeldap-trinity-dev contains development files and documentation.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .ftbfs
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -110,7 +114,6 @@ libtdeldap-trinity-dev contains development files and documentation.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \