summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2012-06-25 08:34:21 -0400
committerStephen Gallagher <sgallagh@redhat.com>2012-06-25 09:35:44 -0400
commitd783d4562c704ccc65143370a4e0c2dfd91c61d2 (patch)
treedd03ceec3d1615c3f33d1807bc1b490562c91e10 /contrib
parenta8781a38b5fca84647d59199fd0b0b4b2d4624e0 (diff)
downloadsssd-d783d4562c704ccc65143370a4e0c2dfd91c61d2.tar.gz
sssd-d783d4562c704ccc65143370a4e0c2dfd91c61d2.tar.xz
sssd-d783d4562c704ccc65143370a4e0c2dfd91c61d2.zip
BUILD: Change default unicode library to glib2
This patch also removes the references to 'cvs' and 'nscd' from BUILD.txt, as they are no longer necessary.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/sssd.spec.in10
1 files changed, 2 insertions, 8 deletions
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 777de90f9..859af0cee 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -7,7 +7,6 @@
%global rhel5_minor %(%{__grep} -o "5.[0-9]*" /etc/redhat-release |%{__sed} -s 's/5.//')
%if 0%{?is_rhel5} > 0
-%global with_unicode_lib --with-unicode-lib=glib2
# we don't want to provide private python extension libs
%{?filter_setup:
%filter_provides_in %{python_sitearch}/.*\.so$
@@ -111,6 +110,8 @@ BuildRequires: libnl-devel
BuildRequires: gettext-devel
BuildRequires: pkgconfig
BuildRequires: findutils
+BuildRequires: glib2-devel
+
%if (0%{?enable_experimental} == 1)
# RHEL 5 is too old to support samba4 and the PAC responder
%if !0%{?is_rhel5}
@@ -118,12 +119,6 @@ BuildRequires: samba4-devel
%endif
%endif
-%if 0%{?is_rhel5} > 0
-BuildRequires: glib2-devel
-%else
-BuildRequires: libunistring-devel
-%endif
-
%description
Provides a set of daemons to manage access to remote directories and
authentication mechanisms. It provides an NSS and PAM interface toward
@@ -242,7 +237,6 @@ autoreconf -ivf
--enable-pammoddir=/%{_lib}/security \
--disable-static \
--disable-rpath \
- %{with_unicode_lib} \
%{with_ccache} \
%{experimental}