SPECS (DEVEL): evolution.spec - up to 2.24 - disabled composer_includes.pat...

[qwiat]

Author: qwiat                        Date: Tue Sep 30 21:02:40 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- up to 2.24
- disabled composer_includes.patch (need to be fixed)

---- Files affected:
SPECS:
   evolution.spec (1.233.2.4 -> 1.233.2.5) 

---- Diffs:

================================================================
Index: SPECS/evolution.spec
diff -u SPECS/evolution.spec:1.233.2.4 SPECS/evolution.spec:1.233.2.5
--- SPECS/evolution.spec:1.233.2.4	Sat Jul  5 23:37:30 2008
+++ SPECS/evolution.spec	Tue Sep 30 23:02:35 2008
@@ -5,19 +5,19 @@
 %bcond_without	kerberos5	# build without kerberos5 support
 %bcond_without	pilot		# build without pilot support
 #
-%define		basever	2.23
+%define		basever	2.24
 #
 Summary:	The GNOME Email/Calendar/Addressbook Suite
 Summary(pl.UTF-8):	Klient poczty dla GNOME/Kalendarz/Książka Adresowa
 Summary(pt_BR.UTF-8):	Cliente de email integrado com calendário e catálogo de endereços
 Summary(zh_CN.UTF-8):	Evolution - GNOME个人和工作组信息管理工具(包括电子邮件，日历和地址薄)
 Name:		evolution
-Version:	2.23.4
-Release:	1
+Version:	2.24.0
+Release:	0.1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution/2.23/%{name}-%{version}.tar.bz2
-# Source0-md5:	5a6ceba4a7cdb33fb02fe32e1c58cb40
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution/2.24/%{name}-%{version}.tar.bz2
+# Source0-md5:	50784255d9da0987032c806fc0226b10
 Source1:	%{name}-gg16.png
 Source2:	%{name}-gg48.png
 Source3:	%{name}-addressbook.desktop
@@ -26,7 +26,7 @@
 Source6:	%{name}-tasks.desktop
 Patch0:		%{name}-nolibs.patch
 Patch1:		%{name}-gnome-icon-theme.patch
-Patch2:		%{name}-composer_includes.patch
+#Patch2:		%{name}-composer_includes.patch
 Patch3:		%{name}-as_needed-fix.patch
 URL:		http://www.gnome.org/projects/evolution/
 BuildRequires:	GConf2-devel >= 2.23.0
@@ -229,11 +229,11 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 %patch3 -p1
 
-sed -i -e 's#sr at Latn#sr at latin#' po/LINGUAS
-mv po/sr@{Latn,latin}.po
+#sed -i -e 's#sr at Latn#sr at latin#' po/LINGUAS
+#mv po/sr@{Latn,latin}.po
 
 %build
 %{__glib_gettextize}
@@ -586,8 +586,8 @@
 %lang(sv) %{_datadir}/evolution/%{basever}/default/sv/mail
 %lang(zh_CN) %{_datadir}/evolution/%{basever}/default/zh_CN/mail
 
-%{_datadir}/idl/evolution-%{basever}/Composer.idl
-%{_datadir}/idl/evolution-%{basever}/Evolution-Composer.idl
+#%{_datadir}/idl/evolution-%{basever}/Composer.idl
+#%{_datadir}/idl/evolution-%{basever}/Evolution-Composer.idl
 %{_datadir}/idl/evolution-%{basever}/Evolution-Mail.idl
 %{_libdir}/bonobo/servers/GNOME_Evolution_Mail.server
 
@@ -645,7 +645,7 @@
 
 # face
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-face.so
-%{evo_plugins_dir}/org-gnome-face-ui.xml
+#%{evo_plugins_dir}/org-gnome-face-ui.xml
 %{evo_plugins_dir}/org-gnome-face.eplug
 %{_datadir}/evolution/%{basever}/errors/org-gnome-face.errors.xml
 
@@ -706,9 +706,9 @@
 %{evo_plugins_dir}/org-gnome-mark-all-read.eplug
 
 # print-message
-%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-print-message.so
-%{evo_plugins_dir}/org-gnome-print-message.eplug
-%{evo_plugins_dir}/org-gnome-print-message.xml
+#%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-print-message.so
+#%{evo_plugins_dir}/org-gnome-print-message.eplug
+#%{evo_plugins_dir}/org-gnome-print-message.xml
 
 # sa-junk-plugin
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-sa-junk-plugin.so
@@ -810,8 +810,8 @@
 %{evo_plugins_dir}/org-gnome-evolution-google.eplug
 
 # hula-account-setup
-%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-evolution-hula-account-setup.so
-%{evo_plugins_dir}/org-gnome-evolution-hula-account-setup.eplug
+#%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-evolution-hula-account-setup.so
+#%{evo_plugins_dir}/org-gnome-evolution-hula-account-setup.eplug
 
 # mark-calendar-offline
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-mark-calendar-offline.so
@@ -852,6 +852,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.233.2.5  2008/09/30 21:02:35  qwiat
+- up to 2.24
+- disabled composer_includes.patch (need to be fixed)
+
 Revision 1.233.2.4  2008/07/05 21:37:30  wolvverine
 - BR and R
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/evolution.spec?r1=1.233.2.4&r2=1.233.2.5&f=u