rpms/mail-notification/devel mail-notification-evolution.patch, 1.1, 1.2 mail-notification.spec, 1.14, 1.15

[Thorsten Leemhuis (thl)]

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27585

Modified Files:
	mail-notification-evolution.patch mail-notification.spec 
Log Message:
fixes for evolution >= 2.5

mail-notification-evolution.patch:

Index: mail-notification-evolution.patch
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification-evolution.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mail-notification-evolution.patch	22 Sep 2005 17:27:33 -0000	1.1
+++ mail-notification-evolution.patch	17 Jan 2006 18:07:25 -0000	1.2
@@ -17,13 +17,13 @@
  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
++	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.6 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
++  ($PKG_CONFIG --exists "evolution-plugin-2.6 $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`
++		pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.6 $evolution_plugin_min_version" 2>/dev/null`
  	else
  		pkg_failed=yes
  	fi
@@ -33,13 +33,13 @@
  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
++	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.6 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
++  ($PKG_CONFIG --exists "evolution-plugin-2.6 $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`
++		pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.6 $evolution_plugin_min_version" 2>/dev/null`
  	else
  		pkg_failed=yes
  	fi
@@ -48,7 +48,7 @@
  
  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"`
++	EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.6 $evolution_plugin_min_version"`
  	# Put the nasty error message in config.log where it belongs
  	echo "$EVOLUTION_PLUGIN_PKG_ERRORS" 1>&5
  
@@ -57,7 +57,7 @@
  	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`
++	evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.6 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mail-notification.spec	17 Jan 2006 10:14:21 -0000	1.14
+++ mail-notification.spec	17 Jan 2006 18:07:27 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        2.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -25,7 +25,8 @@
 BuildRequires:  libgcrypt-devel >= 1.2.0
 BuildRequires:  libicu-devel >= 2.6
 BuildRequires:  gob2
-BuildRequires:  evolution-devel evolution-data-server-devel
+BuildRequires:  evolution-devel >= 2.5
+BuildRequires:  evolution-data-server-devel >= 1.5
 
 
 Requires(post):   GConf2
@@ -49,7 +50,7 @@
 
 %build
 export LDFLAGS="-Wl,--export-dynamic"
-%configure --disable-schemas-install  --enable-evolution --with-evolution-source-dir=/usr/include/evolution-2.4
+%configure --disable-schemas-install  --enable-evolution --with-evolution-source-dir=/usr/include/evolution-2.6
 make %{?_smp_mflags}
 
 
@@ -110,13 +111,16 @@
 %{_datadir}/applications/fedora-mail-notification.desktop
 %{_datadir}/applications/fedora-mail-notification-properties.desktop
 %{_datadir}/gnome/help/mail-notification/
-%{_libdir}/evolution/2.4/plugins/*
+%{_libdir}/evolution/2.6/plugins/*
 %dir %{_datadir}/omf/mail-notification/
 %{_datadir}/omf/mail-notification/mail-notification-C.omf
 %{_datadir}/pixmaps/mail-notification.png
 
 
 %changelog
+* Thu Jan 17 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 2.0-9
+- fixes for evolution >= 2.5
+
 * Thu Jan 17 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 2.0-8
 - rebuild