rpms/evolution-data-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- bumped libsoup requirement to 2.2.3; removed mozilla_build_version, using

Browse Source 
pkg-config instead for locating NSPRS and NSS headers/libraries
    (#158085)
This commit is contained in:
dmalcolm 2005-05-18 16:59:12 +00:00
parent 7e93af778b
commit b6a800200f
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
evolution-data-server.spec
View File

@ -8,7 +8,7 @@ ExcludeArch: ppc64
%define krb5_support 1 %define krb5_support 1
%define nntp_support 1 %define nntp_support 1
%define soup_version 2.2.2 %define soup_version 2.2.3
%define orbit2_version 2.9.8 %define orbit2_version 2.9.8
%define libbonobo_version 2.4.2 %define libbonobo_version 2.4.2
@ -20,20 +20,10 @@ ExcludeArch: ppc64
%define use_gtk_doc 1 %define use_gtk_doc 1
%endif %endif
##########################################################
# The Mozilla NSS API/ABI stabilised by version 1.7.3
# The libraries are always located in the libdir, and a dependency on them will be autogenerated.
# However, the headers are in /usr/include/mozilla-%{mozilla_build_version} and so they move each time the mozilla version changes.
# We use this macro to locate the headers:
%if %{use_mozilla_nss}
%define mozilla_build_version 1.7.6
%endif
##########################################################
Summary: Backend data server for evolution Summary: Backend data server for evolution
Name: evolution-data-server Name: evolution-data-server
Version: 1.2.2 Version: 1.2.2
Release: 2 Release: 3
License: GPL License: GPL
Group: System Environment/Libraries Group: System Environment/Libraries
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@ -65,8 +55,8 @@ BuildRequires: libbonobo-devel >= %{libbonobo_version}
BuildRequires: libgnomeui-devel BuildRequires: libgnomeui-devel
BuildRequires: libglade2-devel BuildRequires: libglade2-devel
%if %{use_mozilla_nss} %if %{use_mozilla_nss}
BuildRequires: mozilla-nspr-devel >= 37:%{mozilla_build_version} BuildRequires: mozilla-nspr-devel
BuildRequires: mozilla-nss-devel >= 37:%{mozilla_build_version} BuildRequires: mozilla-nss-devel
%else %else
BuildRequires: openssl-devel BuildRequires: openssl-devel
%endif %endif
@ -140,13 +130,13 @@ mkdir -p krb5-fakeprefix/%{_lib}
%endif %endif
%if %{use_mozilla_nss} %if %{use_mozilla_nss}
%define ssl_flags --with-nspr-includes=/usr/include/mozilla-%{mozilla_build_version}/nspr --with-nspr-libs=%{_libdir} --with-nss-includes=/usr/include/mozilla-%{mozilla_build_version}/nss --with-nss-libs=%{_libdir} %define ssl_flags --enable-nss=yes --enable-smime=yes
%else %else
%define ssl_flags --enable-openssl=yes %define ssl_flags --enable-openssl=yes
%endif %endif
%if %{use_mozilla_nss} %if %{use_mozilla_nss}
if [ ! -f /usr/include/mozilla-%{mozilla_build_version}/nspr/nspr.h ]; then if ! pkg-config --exists mozilla-nss; then
echo "Unable to find suitable version of mozilla nss to use!" echo "Unable to find suitable version of mozilla nss to use!"
exit 1 exit 1
fi fi
@ -214,6 +204,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed May 18 2005 David Malcolm <dmalcolm@redhat.com> - 1.2.2-3
- bumped libsoup requirement to 2.2.3; removed mozilla_build_version, using
pkg-config instead for locating NSPRS and NSS headers/libraries (#158085)
* Mon Apr 11 2005 David Malcolm <dmalcolm@redhat.com> - 1.2.2-2 * Mon Apr 11 2005 David Malcolm <dmalcolm@redhat.com> - 1.2.2-2
- added patch to calendar/libecal/e-cal.c to fix missing declaration of open_calendar - added patch to calendar/libecal/e-cal.c to fix missing declaration of open_calendar