summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kcmldapcontroller
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications/kcmldapcontroller')
-rw-r--r--redhat/applications/kcmldapcontroller/kcmldapcontroller.spec (renamed from redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec)91
1 files changed, 48 insertions, 43 deletions
diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec
index 88a889e4e..b84e6d939 100644
--- a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec
+++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
%endif
%define tde_pkg kcmldapcontroller
%define tde_prefix /opt/trinity
@@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: trinity-libtdeldap-devel >= 0.5
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -91,13 +91,16 @@ BuildRequires: openldap2-devel
BuildRequires: openldap24-libs-devel
%endif
+# KRB5 support
+#BuildRequires: krb5-devel
+
# HEIMDAL support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: heimdal-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libheimdal-devel
-%endif
+#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+#BuildRequires: heimdal-devel
+#%endif
+#%if 0%{?suse_version}
+#BuildRequires: libheimdal-devel
+#%endif
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -113,6 +116,15 @@ BuildRequires: libcom_err-devel
BuildRequires: %{_lib}ext2fs-devel
%endif
+# ACL support
+BuildRequires: libacl-devel
+
+# IDN support
+BuildRequires: libidn-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
Requires: trinity-kcontrol-ldap-controller = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -132,9 +144,9 @@ This is a TDE control center module to manage users, groups, and machines in Ker
%files -n trinity-kcontrol-ldap-controller
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING
+%doc AUTHORS COPYING
%{tde_bindir}/primaryrccertupdater
-%if 0%{?pclinuxos} == 0
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?rhel} >= 7
%{tde_libdir}/slapi-acl-manager.la
%{tde_libdir}/slapi-acl-manager.so
%endif
@@ -161,55 +173,48 @@ This is a TDE control center module to manage users, groups, and machines in Ker
%__rm -rf acl-updater
%endif
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-extra_includes="%{_includedir}"
-extra_libs="%{_libdir}"
-
-if [ -d "%{_includedir}/openldap24" ]; then
- extra_includes="%{_includedir}/openldap24:${extra_includes}"
- extra_libs="%{_libdir}/openldap24:${extra_libs}"
-fi
-
-if [ -d "%{_includedir}/heimdal" ]; then
- extra_includes="%{_includedir}/heimdal:${extra_includes}"
- extra_libs="%{_libdir}/heimdal:${extra_libs}"
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
fi
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --docdir=%{tde_tdedocdir} \
- --libdir=%{tde_libdir} \
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
+ -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility \
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
\
- --with-extra-includes=${extra_includes} \
- --with-extra-libs=${extra_libs} \
+ ..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
%clean