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

- Update to 2.31.1

Browse Source 
- Update BuildRequires.
- Remove imap4 camel provider support (dropped upstream).
This commit is contained in:
Milan Crha 2010-05-03 16:59:25 +00:00
parent 388ac32d2a
commit ce9227a9d0
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
evolution-data-server-2.29.90.tar.bz2 evolution-data-server-2.31.1.tar.bz2

34
evolution-data-server.spec
View File

@ -5,18 +5,18 @@
%define dbus_glib_version 0.6 %define dbus_glib_version 0.6
%define glib2_version 2.16.1 %define glib2_version 2.16.1
%define gtk2_version 2.14.0 %define gtk2_version 2.20.0
%define gtk_doc_version 1.9 %define gtk_doc_version 1.9
%define intltool_version 0.35.5 %define intltool_version 0.35.5
%define libgdata_version 0.6.3
%define libgweather_version 2.25.4 %define libgweather_version 2.25.4
%define libical_version 0.43 %define libical_version 0.43
%define soup_version 2.3.0 %define soup_version 2.3.0
%define sqlite_version 3.5 %define sqlite_version 3.5
%define eds_base_version 2.30 %define eds_base_version 3.0
%define use_gnome_keyring 1 %define use_gnome_keyring 1
%define support_imap4_provider 0
%define camel_provider_dir %{_libdir}/evolution-data-server-1.2/camel-providers %define camel_provider_dir %{_libdir}/evolution-data-server-1.2/camel-providers
%define eds_extensions_dir %{_libdir}/evolution-data-server-1.2/extensions %define eds_extensions_dir %{_libdir}/evolution-data-server-1.2/extensions
@ -24,14 +24,14 @@
### Abstract ### ### Abstract ###
Name: evolution-data-server Name: evolution-data-server
Version: 2.29.90 Version: 2.31.1
Release: 3%{?dist} Release: 1%{?dist}
Group: System Environment/Libraries Group: System Environment/Libraries
Summary: Backend data server for Evolution Summary: Backend data server for Evolution
License: LGPLv2+ License: LGPLv2+
URL: http://projects.gnome.org/evolution/ URL: http://projects.gnome.org/evolution/
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Source: http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2 Source: http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.bz2
Provides: evolution-webcal = %{version} Provides: evolution-webcal = %{version}
Obsoletes: evolution-webcal < 2.24.0 Obsoletes: evolution-webcal < 2.24.0
@ -51,13 +51,14 @@ BuildRequires: gettext
BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gnome-common BuildRequires: gnome-common
BuildRequires: gnutls-devel BuildRequires: gnutls-devel
BuildRequires: gperf
BuildRequires: gtk-doc >= %{gtk_doc_version} BuildRequires: gtk-doc >= %{gtk_doc_version}
BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: intltool >= %{intltool_version} BuildRequires: intltool >= %{intltool_version}
BuildRequires: libglade2-devel
%if %{use_gnome_keyring} %if %{use_gnome_keyring}
BuildRequires: gnome-keyring-devel BuildRequires: gnome-keyring-devel
%endif %endif
BuildRequires: libgdata-devel >= %{libgdata_version}
BuildRequires: libgweather-devel >= %{libgweather_version} BuildRequires: libgweather-devel >= %{libgweather_version}
BuildRequires: libical-devel >= %{libical_version} BuildRequires: libical-devel >= %{libical_version}
BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: libsoup-devel >= %{soup_version}
@ -167,12 +168,6 @@ fi
%define keyring_flags --disable-gnome-keyring %define keyring_flags --disable-gnome-keyring
%endif %endif
%if %{support_imap4_provider}
%define imap4_flags --enable-imap4=yes
%else
%define imap4_flags --enable-imap4=no
%endif
export CPPFLAGS="-I%{_includedir}/et" export CPPFLAGS="-I%{_includedir}/et"
export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et" export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et"
@ -192,7 +187,7 @@ autoconf
--enable-file-locking=fcntl \ --enable-file-locking=fcntl \
--enable-dot-locking=no \ --enable-dot-locking=no \
--enable-gtk-doc \ --enable-gtk-doc \
%ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags \ %ldap_flags %krb5_flags %nntp_flags %ssl_flags \
%keyring_flags %keyring_flags
export tagname=CC export tagname=CC
make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
@ -257,10 +252,8 @@ rm -rf $RPM_BUILD_ROOT
%{camel_provider_dir}/libcamelimap.so %{camel_provider_dir}/libcamelimap.so
%{camel_provider_dir}/libcamelimap.urls %{camel_provider_dir}/libcamelimap.urls
%if %{support_imap4_provider} %{camel_provider_dir}/libcamelimapx.so
%{camel_provider_dir}/libcamelimap4.so %{camel_provider_dir}/libcamelimapx.urls
%{camel_provider_dir}/libcamelimap4.urls
%endif
%{camel_provider_dir}/libcamellocal.so %{camel_provider_dir}/libcamellocal.so
%{camel_provider_dir}/libcamellocal.urls %{camel_provider_dir}/libcamellocal.urls
@ -333,6 +326,11 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/libedataserverui %{_datadir}/gtk-doc/html/libedataserverui
%changelog %changelog
* Mon May 03 2010 Milan Crha <mcrha@redhat.com> - 2.31.1-1.fc14
- Update to 2.31.1
- Update BuildRequires.
- Remove imap4 camel provider support (dropped upstream).
* Tue Feb 09 2010 Milan Crha <mcrha@redhat.com> - 2.29.90-3.fc13 * Tue Feb 09 2010 Milan Crha <mcrha@redhat.com> - 2.29.90-3.fc13
- Return back BuildRequires: libglade2-devel. - Return back BuildRequires: libglade2-devel.

2
sources
View File

@ -1 +1 @@
69a18f130a80a6713e58572ce98f4c18 evolution-data-server-2.29.90.tar.bz2 f496139410627884c3943da85fe65240 evolution-data-server-2.31.1.tar.bz2