- added as_needed-fix patch

- release 1

Changed files:
    evolution.spec -> 1.221

diff --git a/evolution.spec b/evolution.spec
index bba84dcdac0cc7d26b8fe22e3f70a592bf287e79..8e290240bf78721b6b90711dabc58a8a697468fa 100644 (file)
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,7 +1,4 @@
 #
-# TODO:
-# - it builds without kerberos5 support (undefined reference to `krb5_init_context'), check why and fix it
-#
 # Conditional build:
 %bcond_without ldap            # build without ldap support
 %bcond_without kerberos5       # build without kerberos5 support
@@ -15,7 +12,7 @@ Summary(pt_BR.UTF-8): Cliente de email integrado com calendário e catálogo de
 Summary(zh_CN.UTF-8):  Evolution - GNOME个人和工作组信息管理工具(包括电子邮件，日历和地址薄)
 Name:          evolution
 Version:       2.12.0
-Release:       0.1
+Release:       1
 License:       GPL v2
 Group:         Applications/Mail
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/evolution/2.12/%{name}-%{version}.tar.bz2
@@ -30,6 +27,7 @@ Patch0:               %{name}-nolibs.patch
 Patch1:                %{name}-gnome-icon-theme.patch
 Patch2:                %{name}-groupwise-features-link.patch
 Patch3:                %{name}-composer_includes.patch
+Patch4:                %{name}-as_needed-fix.patch
 URL:           http://www.gnome.org/projects/evolution/
 BuildRequires: GConf2-devel >= 2.20.0
 BuildRequires: ORBit2-devel >= 1:2.14.8
@@ -41,8 +39,8 @@ BuildRequires:        dbus-glib-devel >= 0.73
 BuildRequires: evolution-data-server-devel >= 1.12.0
 BuildRequires: flex
 BuildRequires: gettext-devel
-BuildRequires: gnome-common >= 2.18.0
-BuildRequires: gnome-doc-utils >= 0.11.2
+BuildRequires: gnome-common >= 2.20.0
+BuildRequires: gnome-doc-utils >= 0.12.0
 %{?with_pilot:BuildRequires:   gnome-pilot-devel >= 2.0.14}
 BuildRequires: gnome-vfs2-devel >= 2.20.0
 BuildRequires: gtk-doc >= 1.8
@@ -229,6 +227,7 @@ Palmem.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__glib_gettextize}
@@ -484,7 +483,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/components/libevolution-calendar.so
 %{_libdir}/bonobo/servers/GNOME_Evolution_Calendar*
-#%{_libdir}/evolution/%{basever}/plugins/publish-calendar.glade
 
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/plugins/*calendar*.so
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/plugins/*default-source*.so