Drop krb5 dependency
This commit is contained in:
parent
46f37563a2
commit
0b4cc22c51
@ -22,7 +22,6 @@
|
|||||||
%define ldap_support 1
|
%define ldap_support 1
|
||||||
%define libnotify_support 1
|
%define libnotify_support 1
|
||||||
%define libpst_support 1
|
%define libpst_support 1
|
||||||
%define krb5_support 1
|
|
||||||
|
|
||||||
# Coverity scan can override this to 0, to skip checking in gtk-doc generated code
|
# Coverity scan can override this to 0, to skip checking in gtk-doc generated code
|
||||||
%{!?with_docs: %define with_docs 1}
|
%{!?with_docs: %define with_docs 1}
|
||||||
@ -33,7 +32,7 @@
|
|||||||
|
|
||||||
Name: evolution
|
Name: evolution
|
||||||
Version: 3.11.5
|
Version: 3.11.5
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Group: Applications/Productivity
|
Group: Applications/Productivity
|
||||||
Summary: Mail and calendar client for GNOME
|
Summary: Mail and calendar client for GNOME
|
||||||
License: GPLv2+ and GFDL
|
License: GPLv2+ and GFDL
|
||||||
@ -101,13 +100,6 @@ BuildRequires: yelp-tools
|
|||||||
BuildRequires: openldap-devel >= 2.0.11
|
BuildRequires: openldap-devel >= 2.0.11
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{krb5_support}
|
|
||||||
BuildRequires: krb5-devel
|
|
||||||
# tweak for krb5 1.2 vs 1.3
|
|
||||||
%define krb5dir /usr/kerberos
|
|
||||||
#define krb5dir `pwd`/krb5-fakeprefix
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{libnotify_support}
|
%if %{libnotify_support}
|
||||||
BuildRequires: libnotify-devel
|
BuildRequires: libnotify-devel
|
||||||
%endif
|
%endif
|
||||||
@ -205,10 +197,6 @@ This package contains the plugin to import Microsoft Personal Storage Table
|
|||||||
%patch01 -p1 -b .ldaphack
|
%patch01 -p1 -b .ldaphack
|
||||||
%patch02 -p1 -b .help-contents
|
%patch02 -p1 -b .help-contents
|
||||||
|
|
||||||
mkdir -p krb5-fakeprefix/include
|
|
||||||
mkdir -p krb5-fakeprefix/lib
|
|
||||||
mkdir -p krb5-fakeprefix/%{_lib}
|
|
||||||
|
|
||||||
# Remove the welcome email from Novell
|
# Remove the welcome email from Novell
|
||||||
for inbox in mail/default/*/Inbox; do
|
for inbox in mail/default/*/Inbox; do
|
||||||
echo -n "" > $inbox
|
echo -n "" > $inbox
|
||||||
@ -222,12 +210,6 @@ done
|
|||||||
%define ldap_flags --without-openldap
|
%define ldap_flags --without-openldap
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{krb5_support}
|
|
||||||
%define krb5_flags --with-krb5=%{krb5dir}
|
|
||||||
%else
|
|
||||||
%define krb5_flags --without-krb5
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%define ssl_flags --enable-nss=yes --enable-smime=yes
|
%define ssl_flags --enable-nss=yes --enable-smime=yes
|
||||||
|
|
||||||
if ! pkg-config --exists nss; then
|
if ! pkg-config --exists nss; then
|
||||||
@ -255,7 +237,7 @@ autoconf
|
|||||||
%configure \
|
%configure \
|
||||||
--disable-maintainer-mode \
|
--disable-maintainer-mode \
|
||||||
--with-sub-version=" (%{version}-%{release})" \
|
--with-sub-version=" (%{version}-%{release})" \
|
||||||
%ldap_flags %krb5_flags %ssl_flags %gtkdoc_flags \
|
%ldap_flags %ssl_flags %gtkdoc_flags \
|
||||||
--enable-plugins=all
|
--enable-plugins=all
|
||||||
export tagname=CC
|
export tagname=CC
|
||||||
make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasing"
|
make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasing"
|
||||||
@ -536,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 03 2014 Milan Crha <mcrha@redhat.com> - 3.11.5-2
|
||||||
|
- Drop krb5 dependency
|
||||||
|
|
||||||
* Mon Feb 03 2014 Milan Crha <mcrha@redhat.com> - 3.11.5-1
|
* Mon Feb 03 2014 Milan Crha <mcrha@redhat.com> - 3.11.5-1
|
||||||
- Update to 3.11.5
|
- Update to 3.11.5
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user