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

- Removed explicit mozilla_build_version; instead use pkg-config to

Browse Source 
determine the path to the NSS/NSPR headers.
- Use a macro to express requirement on pilot-link (was 1:0.11.4, now 0.12;
    patches depend on this)
- Re-enabled the new-mail-notify plugin (my patch to handle differing DBus
    versions is in the upstream tarball; but configure.in disables the
    plugin for dbus versions > 0.23; patched configure.in to allow
    arbitrary DBus versions, and run autoconf at the start of the build)
    (#156328)
This commit is contained in:
dmalcolm 2005-05-05 21:57:27 +00:00
parent 38e72c17d3
commit f93df14187
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
evolution.spec
View File

@ -14,15 +14,7 @@ ExcludeArch: ppc64
%define dbus_version 0.31
%define gnomevfs2_version 2.4
##########################################################
# 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.7
%endif
##########################################################
%define pilot_link_version 0.12.0
%define ldap_support 1
%define krb5_support 1
@ -36,7 +28,7 @@ ExcludeArch: ppc64
Name: evolution
Version: 2.2.2
Release: 3
Release: 4
License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-root
URL: http://www.ximian.com/
@ -58,6 +50,8 @@ Patch101: evo-calendar-print-with-pango-4.patch
Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch
Patch105: evolution-2.2.2-fix-new-mail-notify.patch
# not accepted, but proposed on a few occasions. fixes problems with
# some cyrus servers
#Patch200: evolution-1.4.5-imap-command-length.patch
@ -110,8 +104,8 @@ BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: gtk-doc
%if %{use_mozilla_nss}
BuildRequires: mozilla-nspr-devel >= 37:%{mozilla_build_version}
BuildRequires: mozilla-nss-devel >= 37:%{mozilla_build_version}
BuildRequires: mozilla-nspr-devel
BuildRequires: mozilla-nss-devel
%else
BuildRequires: openssl-devel
%endif
@ -128,7 +122,7 @@ BuildRequires: openldap-devel >= 2.0.11
BuildRequires: gnome-pilot-devel >= 2.0.6
# bleah, gnome-pilot really sucks this in, but then I have to have an explicit
# versioning for gnome-pilot when it changes less than pilot-link itself
BuildRequires: pilot-link-devel >= 1:0.11.4
BuildRequires: pilot-link-devel >= %{pilot_link_version}
Requires: gnome-pilot >= 2.0.6
%endif
@ -174,6 +168,7 @@ Development files needed for building things which link against evolution.
%patch101 -p1 -b .calendar-print-with-pango
%patch104 -p1 -b .port-to-pilot-link-0.12
%patch105 -p1 -b .fix-new-mail-notify
#patch200 -p1 -b .commandlength
@ -212,13 +207,13 @@ mkdir -p krb5-fakeprefix/%{_lib}
%endif
%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
%define ssl_flags --enable-openssl=yes
%endif
%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!"
exit 1
fi
@ -233,6 +228,9 @@ if pkg-config openssl ; then
fi
%endif
# Rerun autoconf since we patched configure.in (patch for new-mail-notify plugin):
autoconf
%configure \
--enable-gtk-doc=yes \
--enable-ipv6 \
@ -333,6 +331,16 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/*/*.a
%changelog
* Thu May 5 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-4
- Removed explicit mozilla_build_version; instead use pkg-config to determine
the path to the NSS/NSPR headers.
- Use a macro to express requirement on pilot-link (was 1:0.11.4, now 0.12;
patches depend on this)
- Re-enabled the new-mail-notify plugin (my patch to handle differing DBus
versions is in the upstream tarball; but configure.in disables the plugin for
dbus versions > 0.23; patched configure.in to allow arbitrary DBus versions,
and run autoconf at the start of the build) (#156328)
* Sat Apr 30 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-3
- updated mozilla_build_version to 1.7.7