packages (DEVEL): evolution/evolution-nolibs.patch, evolution/evolution.spe...

wiget wiget at pld-linux.org
Mon Sep 12 10:38:55 CEST 2011 

Author: wiget                        Date: Mon Sep 12 08:38:55 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 3.1.91

---- Files affected:
packages/evolution:
   evolution-nolibs.patch (1.2 -> 1.2.2.1) , evolution.spec (1.296 -> 1.296.2.1) 

---- Diffs:

================================================================
Index: packages/evolution/evolution-nolibs.patch
diff -u packages/evolution/evolution-nolibs.patch:1.2 packages/evolution/evolution-nolibs.patch:1.2.2.1
--- packages/evolution/evolution-nolibs.patch:1.2	Fri Oct 16 17:28:57 2009
+++ packages/evolution/evolution-nolibs.patch	Mon Sep 12 10:38:50 2011
@@ -1,16 +1,15 @@
-diff -urN evolution-2.28.0/m4/evo_ldap_check.m4 evolution-2.28.0.new/m4/evo_ldap_check.m4
---- evolution-2.28.0/m4/evo_ldap_check.m4	2009-08-11 13:50:27.000000000 +0200
-+++ evolution-2.28.0.new/m4/evo_ldap_check.m4	2009-10-15 15:01:56.206824013 +0200
-@@ -55,9 +55,9 @@
+--- evolution-3.1.91/m4/evo_ldap_check.m4.orig	2011-06-08 19:12:25.000000000 +0200
++++ evolution-3.1.91/m4/evo_ldap_check.m4	2011-09-12 08:22:43.075017176 +0200
+@@ -55,9 +55,9 @@ AC_DEFUN([EVO_LDAP_CHECK],[
  			AC_MSG_ERROR([evolution requires OpenLDAP version >= 2])
  		fi
  
--		AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"])
+-		AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"], [AC_CHECK_LIB(resolv, __res_query, [LDAP_LIBS="-lresolv"])])
 -		AC_CHECK_LIB(socket, bind, [LDAP_LIBS="$LDAP_LIBS -lsocket"])
 -		AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])
-+		dnl AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"])
-+		AC_CHECK_FUNC(bind, , [AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")])
-+		AC_CHECK_FUNC(gethostbyaddr, , [AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")])
++		dnl AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"], [AC_CHECK_LIB(resolv, __res_query, [LDAP_LIBS="-lresolv"])])
++		AC_CHECK_FUNC(bind, , [AC_CHECK_LIB(socket, bind, [LDAP_LIBS="$LDAP_LIBS -lsocket"])])
++		AC_CHECK_FUNC(gethostbyaddr, , [AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])])
  		AC_CHECK_LIB(lber, ber_get_tag, [
  			if test "$with_static_ldap" = "yes"; then
  				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"

================================================================
Index: packages/evolution/evolution.spec
diff -u packages/evolution/evolution.spec:1.296 packages/evolution/evolution.spec:1.296.2.1
--- packages/evolution/evolution.spec:1.296	Sun Sep 11 11:30:47 2011
+++ packages/evolution/evolution.spec	Mon Sep 12 10:38:50 2011
@@ -4,19 +4,19 @@
 %bcond_without	ldap		# build without ldap support
 %bcond_without	kerberos5	# build without kerberos5 support
 #
-%define		basever	3.0
+%define		basever	3.2
 #
 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:	3.0.3
-Release:	3
+Version:	3.1.91
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution/3.0/%{name}-%{version}.tar.xz
-# Source0-md5:	3d0fd6ee9d20d53ad810625c385af2d5
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution/3.1/%{name}-%{version}.tar.xz
+# Source0-md5:	e1a5da45f18a4c5bc2f6a5f6e2eb443a
 Source1:	%{name}-gg16.png
 Source2:	%{name}-gg48.png
 Source3:	%{name}-addressbook.desktop
@@ -42,7 +42,7 @@
 BuildRequires:	gstreamer-devel
 BuildRequires:	gtk+3-devel >= 3.0.0
 BuildRequires:	gtk-doc >= 1.9
-BuildRequires:	gtkhtml-devel >= 4.0.1
+BuildRequires:	gtkhtml-devel >= 4.1.2
 #BuildRequires:	gtkimageview-devel >= 1.6
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
 BuildRequires:	intltool >= 0.40.0
@@ -311,7 +311,8 @@
 %gconf_schema_install apps-evolution-mail-notification.schemas
 %gconf_schema_install apps-evolution-template-placeholders.schemas
 %gconf_schema_install apps_evolution_email_custom_header.schemas
-%gconf_schema_install bogo-junk-plugin.schemas
+%gconf_schema_install evolution-bogofilter.schemas
+%gconf_schema_install evolution-spamassassin.schemas
 %gconf_schema_install evolution-mail.schemas
 %update_desktop_database_post
 
@@ -321,7 +322,8 @@
 %gconf_schema_uninstall apps-evolution-mail-notification.schemas
 %gconf_schema_uninstall apps-evolution-template-placeholders.schemas
 %gconf_schema_uninstall apps_evolution_email_custom_header.schemas
-%gconf_schema_uninstall bogo-junk-plugin.schemas
+%gconf_schema_uninstall evolution-bogofilter.schemas
+%gconf_schema_uninstall evolution-spamassassin.schemas
 %gconf_schema_uninstall evolution-mail.schemas
 
 %postun mail
@@ -359,6 +361,7 @@
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-plugin-lib.so
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-offline-alert.so
 %attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-plugin-manager.so
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-online-accounts.so
 
 
 %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas
@@ -392,6 +395,9 @@
 %lang(sr at latin) %dir %{_datadir}/evolution/%{basever}/default/sr at latin
 %lang(zh_CN) %dir %{_datadir}/evolution/%{basever}/default/zh_CN
 
+%{_datadir}/evolution/%{basever}/address_formats.dat
+%{_datadir}/evolution/%{basever}/countrytransl.map
+
 %dir %{_datadir}/evolution/%{basever}/errors
 %{_datadir}/evolution/%{basever}/errors/e-system.error
 %{_datadir}/evolution/%{basever}/errors/filter.error
@@ -606,9 +612,10 @@
 %{evo_plugins_dir}/org-gnome-evolution-bbdb.eplug
 
 # bogo-junk-plugin
-%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-bogo-junk-plugin.so
-%{evo_plugins_dir}/org-gnome-bogo-junk-plugin.eplug
-%{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
+#%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-bogo-junk-plugin.so
+#%{evo_plugins_dir}/org-gnome-bogo-junk-plugin.eplug
+%{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-bogofilter.so
 
 # dbx-import
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-dbx-import.so
@@ -624,14 +631,14 @@
 #%{evo_plugins_dir}/org-gnome-image-inline.eplug
 
 # groupwise-features
-%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-groupwise-features.so
-%{evo_plugins_dir}/org-gnome-groupwise-features.eplug
-%{evo_plugins_dir}/org-gnome-compose-send-options.xml
-%{_datadir}/evolution/%{basever}/errors/org-gnome-mail-retract.error
-%{_datadir}/evolution/%{basever}/errors/org-gnome-process-meeting.error
-%{_datadir}/evolution/%{basever}/errors/org-gnome-proxy-login.error
-%{_datadir}/evolution/%{basever}/errors/org-gnome-proxy.error
-%{_datadir}/evolution/%{basever}/errors/org-gnome-shared-folder.error
+#%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-groupwise-features.so
+#%{evo_plugins_dir}/org-gnome-groupwise-features.eplug
+#%{evo_plugins_dir}/org-gnome-compose-send-options.xml
+#%{_datadir}/evolution/%{basever}/errors/org-gnome-mail-retract.error
+#%{_datadir}/evolution/%{basever}/errors/org-gnome-process-meeting.error
+#%{_datadir}/evolution/%{basever}/errors/org-gnome-proxy-login.error
+#%{_datadir}/evolution/%{basever}/errors/org-gnome-proxy.error
+#%{_datadir}/evolution/%{basever}/errors/org-gnome-shared-folder.error
 
 # imap-features
 %attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-imap-features.so
@@ -665,8 +672,10 @@
 %{evo_plugins_dir}/org-gnome-pst-import.eplug
 
 # sa-junk-plugin
-%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-sa-junk-plugin.so
-%{evo_plugins_dir}/org-gnome-sa-junk-plugin.eplug
+#%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-sa-junk-plugin.so
+#%{evo_plugins_dir}/org-gnome-sa-junk-plugin.eplug
+%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/libevolution-module-spamassassin.so
+%{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas
 
 # subject-thread
 #%attr(755,root,root) %{evo_plugins_dir}/liborg-gnome-subject-thread.so
@@ -762,6 +771,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.296.2.1  2011/09/12 08:38:50  wiget
+- up to 3.1.91
+
 Revision 1.296  2011/09/11 09:30:47  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/evolution/evolution-nolibs.patch?r1=1.2&r2=1.2.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/evolution/evolution.spec?r1=1.296&r2=1.296.2.1&f=u

More information about the pld-cvs-commit mailing list