rpms/mail-notification/devel mail-notification-evolution.patch, NONE, 1.1 mail-notification.spec, 1.10, 1.11
Thorsten Leemhuis (thl)
fedora-extras-commits at redhat.com
Thu Sep 22 17:27:35 UTC 2005
Author: thl
Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21136
Modified Files:
mail-notification.spec
Added Files:
mail-notification-evolution.patch
Log Message:
add mail-notification-evolution.patch and enable evo-support (from Radek Vokal)
mail-notification-evolution.patch:
--- NEW FILE mail-notification-evolution.patch ---
--- mail-notification-2.0/src/mn-evolution-folder-tree-control.c.evolution 2005-09-14 16:17:50.000000000 +0200
+++ mail-notification-2.0/src/mn-evolution-folder-tree-control.c 2005-09-14 16:17:37.000000000 +0200
@@ -22,7 +22,7 @@
#include <libbonoboui.h>
/* headers from the Evolution source tree */
-#include "mail/mail-component.h"
+/*#include "mail/mail-component.h"*/
#include "mail/em-folder-tree.h"
#include "mn-evolution.h"
--- mail-notification-2.0/configure.evolution 2005-08-09 22:01:09.000000000 +0200
+++ mail-notification-2.0/configure 2005-09-14 16:15:51.000000000 +0200
@@ -24784,12 +24784,12 @@
if test "x$ac_cv_env_EVOLUTION_PLUGIN_CFLAGS_set" = "xset"; then
pkg_cv_EVOLUTION_PLUGIN_CFLAGS=$ac_cv_env_EVOLUTION_PLUGIN_CFLAGS_value
elif test -n "$PKG_CONFIG"; then
- if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
- ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
+ if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.4 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
+ ($PKG_CONFIG --exists "evolution-plugin-2.4 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null`
+ pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.4 $evolution_plugin_min_version" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -24807,12 +24807,12 @@
if test "x$ac_cv_env_EVOLUTION_PLUGIN_LIBS_set" = "xset"; then
pkg_cv_EVOLUTION_PLUGIN_LIBS=$ac_cv_env_EVOLUTION_PLUGIN_LIBS_value
elif test -n "$PKG_CONFIG"; then
- if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
- ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
+ if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.4 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
+ ($PKG_CONFIG --exists "evolution-plugin-2.4 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null`
+ pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.4 $evolution_plugin_min_version" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -24824,7 +24824,7 @@
echo "${ECHO_T}$pkg_cv_EVOLUTION_PLUGIN_LIBS" >&6
if test $pkg_failed = yes; then
- EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.2 $evolution_plugin_min_version"`
+ EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.4 $evolution_plugin_min_version"`
# Put the nasty error message in config.log where it belongs
echo "$EVOLUTION_PLUGIN_PKG_ERRORS" 1>&5
@@ -24841,7 +24841,7 @@
if test $found = yes; then
echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5
echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6
- evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.2 2>/dev/null`
+ evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.4 2>/dev/null`
if test -n "$evolution_plugindir"; then
echo "$as_me:$LINENO: result: $evolution_plugindir" >&5
echo "${ECHO_T}$evolution_plugindir" >&6
Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mail-notification.spec 3 Sep 2005 17:00:53 -0000 1.10
+++ mail-notification.spec 22 Sep 2005 17:27:33 -0000 1.11
@@ -1,6 +1,6 @@
Name: mail-notification
Version: 2.0
-Release: 3%{?dist}
+Release: 5%{?dist}
Summary: Status icon that informs you if you have new mail
Group: Applications/Internet
@@ -10,6 +10,7 @@
Source1: mail-notification-README.FEDORA
Patch0: http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-buildfix.diff
Patch1: http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-gmail-properties-fix.diff
+Patch2: mail-notification-evolution.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext >= 0.14.1
@@ -24,6 +25,7 @@
BuildRequires: libgcrypt-devel >= 1.2.0
BuildRequires: libicu-devel >= 2.6
BuildRequires: gob2
+BuildRequires: evolution-devel
Requires(post): GConf2
@@ -43,10 +45,10 @@
cp %{SOURCE1} ./README.FEDORA
%patch0 -b .patch0
%patch1 -b .patch1
-
+%patch2 -p1 -b .evolution
%build
-%configure --disable-evolution
+%configure --enable-evolution --with-evolution-source-dir=/usr/include/evolution-2.4
make %{?_smp_mflags}
@@ -102,10 +104,12 @@
%{_sysconfdir}/sound/events/mail-notification.soundlist
%{_bindir}/*
%{_libdir}/bonobo/servers/GNOME_MailNotification.server
+%{_libdir}/bonobo/servers/GNOME_MailNotification_Evolution.server
%{_datadir}/%{name}
%{_datadir}/applications/fedora-mail-notification.desktop
%{_datadir}/applications/fedora-mail-notification-properties.desktop
%{_datadir}/gnome/help/mail-notification/
+%{_libdir}/evolution/2.4/plugins/*
%dir %{_datadir}/omf/mail-notification/
%{_datadir}/omf/mail-notification/mail-notification-C.omf
%{_datadir}/pixmaps/mail-notification.png
@@ -113,6 +117,12 @@
%changelog
+* Thu Sep 22 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 2.0-5
+- BR evo-devel
+
+* Tue Sep 20 2005 Radek Vokal <rvokal at redhat.com> 2.0-4
+- add mail-notification-evolution.patch and enable evo-support
+
* Sat Sep 03 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.0-3
- rebuild for new icu
More information about the fedora-extras-commits
mailing list