rpms/evolution/devel .cvsignore, 1.78, 1.79 evolution-2.7.1-no-gnome-common.patch, 1.4, 1.5 evolution-2.8.1-kill-ethread.patch, 1.14, 1.15 evolution.spec, 1.298, 1.299 sources, 1.78, 1.79
Milan Crha (mcrha)
fedora-extras-commits at redhat.com
Mon Oct 15 18:27:22 UTC 2007
Author: mcrha
Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4738
Modified Files:
.cvsignore evolution-2.7.1-no-gnome-common.patch
evolution-2.8.1-kill-ethread.patch evolution.spec sources
Log Message:
* Mon Oct 15 2007 Milan Crha <mcrha at redhat.com> - 2.12.1-1.fc8
- Update to 2.12.1
- Add files for the new backup-restore plugin.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- .cvsignore 17 Sep 2007 20:05:20 -0000 1.78
+++ .cvsignore 15 Oct 2007 18:26:48 -0000 1.79
@@ -1 +1 @@
-evolution-2.12.0.tar.bz2
+evolution-2.12.1.tar.bz2
evolution-2.7.1-no-gnome-common.patch:
Index: evolution-2.7.1-no-gnome-common.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.7.1-no-gnome-common.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- evolution-2.7.1-no-gnome-common.patch 9 Apr 2007 18:09:26 -0000 1.4
+++ evolution-2.7.1-no-gnome-common.patch 15 Oct 2007 18:26:48 -0000 1.5
@@ -1,6 +1,20 @@
---- evolution-2.10.1/configure.no-gnome-common 2007-04-09 12:32:23.000000000 -0400
-+++ evolution-2.10.1/configure 2007-04-09 12:33:02.000000000 -0400
-@@ -33161,154 +33161,6 @@
+diff -up evolution-2.12.1/configure.in.no-gnome-common evolution-2.12.1/configure.in
+--- evolution-2.12.1/configure.in.no-gnome-common 2007-10-15 08:30:42.000000000 +0200
++++ evolution-2.12.1/configure.in 2007-10-15 17:54:01.000000000 +0200
+@@ -1282,9 +1282,6 @@ AC_SUBST_FILE(EVO_MARSHAL_RULE)
+ dnl *************************
+ dnl CFLAGS and LIBS and stuff
+ dnl *************************
+-
+-GNOME_COMPILE_WARNINGS(yes)
+-CFLAGS="$CFLAGS $WARN_CFLAGS"
+ case $CFLAGS in
+ *-Wall*)
+ # Turn off the annoying "comparison between signed and unsigned"
+diff -up evolution-2.12.1/configure.no-gnome-common evolution-2.12.1/configure
+--- evolution-2.12.1/configure.no-gnome-common 2007-10-15 17:54:01.000000000 +0200
++++ evolution-2.12.1/configure 2007-10-15 18:47:03.000000000 +0200
+@@ -31564,137 +31564,6 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk
@@ -66,27 +80,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
- has_option=yes
-else
- echo "$as_me: failed program was:" >&5
@@ -155,15 +152,3 @@
case $CFLAGS in
*-Wall*)
# Turn off the annoying "comparison between signed and unsigned"
---- evolution-2.10.1/configure.in.no-gnome-common 2007-04-09 09:11:47.000000000 -0400
-+++ evolution-2.10.1/configure.in 2007-04-09 12:32:23.000000000 -0400
-@@ -1136,9 +1136,6 @@
- dnl *************************
- dnl CFLAGS and LIBS and stuff
- dnl *************************
--
--GNOME_COMPILE_WARNINGS(yes)
--CFLAGS="$CFLAGS $WARN_CFLAGS"
- case $CFLAGS in
- *-Wall*)
- # Turn off the annoying "comparison between signed and unsigned"
evolution-2.8.1-kill-ethread.patch:
Index: evolution-2.8.1-kill-ethread.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.8.1-kill-ethread.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- evolution-2.8.1-kill-ethread.patch 4 Sep 2007 04:39:01 -0000 1.14
+++ evolution-2.8.1-kill-ethread.patch 15 Oct 2007 18:26:48 -0000 1.15
@@ -927,7 +927,7 @@
}
/** alarm_queue_remove_client
-@@ -2155,22 +2141,16 @@
+@@ -2155,24 +2141,16 @@ alarm_queue_remove_async (EThread *e, Al
void
alarm_queue_remove_client (ECal *client, gboolean immediately)
{
@@ -942,16 +942,21 @@
- list = malloc (sizeof (struct _alarm_client_msg));
- list->client = client;
- msg->data = list;
+-
+- d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__));
+- if (immediately) {
+- alarm_queue_remove_async (NULL, msg, NULL);
+- g_free (list);
+- g_free (msg);
+- } else
+- e_thread_put(alarm_operation_thread, (EMsg *)msg);
+ msg = g_slice_new (struct _alarm_client_msg);
+ msg->header.func = (MessageFunc) alarm_queue_remove_async;
+ msg->client = client;
-
-- d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__));
- if (immediately)
-- alarm_queue_remove_async (NULL, msg, NULL);
++
++ if (immediately)
+ alarm_queue_remove_async (msg);
- else
-- e_thread_put(alarm_operation_thread, (EMsg *)msg);
++ else
+ message_push ((Message *) msg);
}
Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- evolution.spec 9 Oct 2007 18:01:19 -0000 1.298
+++ evolution.spec 15 Oct 2007 18:26:48 -0000 1.299
@@ -45,8 +45,8 @@
### Abstract ###
Name: evolution
-Version: 2.12.0
-Release: 8%{?dist}
+Version: 2.12.1
+Release: 1%{?dist}
License: GPLv2 and GFDL+
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
@@ -531,6 +531,7 @@
%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export
%{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify
%{_libexecdir}/evolution/%{evo_major}/killev
+%{_libexecdir}/evolution/%{evo_major}/evolution-backup
# Various conduits for gnome-pilot:
%if %{pilot_support}
@@ -681,6 +682,10 @@
%{evo_plugin_dir}/org-gnome-evolution-mail-attachments-import-ics.eplug
%{evo_plugin_dir}/liborg-gnome-evolution-mail-attachments-import-ics.so
+%{evo_plugin_dir}/liborg-gnome-backup-restore.so
+%{evo_plugin_dir}/org-gnome-backup-restore.eplug
+%{evo_plugin_dir}/org-gnome-backup-restore.xml
+
%files devel
%defattr(-, root, root)
%{_includedir}/evolution-%{evo_major}
@@ -713,6 +718,10 @@
%dir %{_datadir}/omf/evolution
%changelog
+* Mon Oct 15 2007 Milan Crha <mcrha at redhat.com> - 2.12.1-1.fc8
+- Update to 2.12.1
+- Add files for the new backup-restore plugin.
+
* Tue Oct 09 2007 Matthew Barnes <mbarnes at redhat.com. - 2.12.0-8.fc8
- Sync version requirements up with configure.in.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- sources 17 Sep 2007 20:05:20 -0000 1.78
+++ sources 15 Oct 2007 18:26:48 -0000 1.79
@@ -1 +1 @@
-aaa378a63477b56de214ea9eaa7f8560 evolution-2.12.0.tar.bz2
+392623efa9b79ede17ce90512f2c3c0a evolution-2.12.1.tar.bz2
More information about the fedora-extras-commits
mailing list