rpms/evolution-rss/F-12 evolution-rss-0.1.4-vers-detect.patch, NONE, 1.1 evolution-rss.spec, 1.45, 1.46

Lucian Langa lucilanga at fedoraproject.org
Fri Dec 25 17:29:05 UTC 2009 

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29072

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.1.4-vers-detect.patch 
Log Message:
* Fri Dec 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-13
- upstream patch to fix evo version detection

evolution-rss-0.1.4-vers-detect.patch:
 configure.ac    |    2 +-
 m4/evolution.m4 |   19 +++++++++----------
 src/Makefile.am |    2 +-
 src/parser.c    |    5 +++++
 4 files changed, 16 insertions(+), 12 deletions(-)

--- NEW FILE evolution-rss-0.1.4-vers-detect.patch ---
diff -Naur evolution-rss-0.1.4/configure.ac evolution-rss-0.1.4-mod/configure.ac
--- evolution-rss-0.1.4/configure.ac	2009-08-25 15:13:05.000000000 +0300
+++ evolution-rss-0.1.4-mod/configure.ac	2009-12-25 18:26:07.000000000 +0200
@@ -35,7 +35,7 @@
 dnl locate libsoup flavour
 SOUP=
 PKG_CHECK_MODULES([LIBSOUP_24], libsoup-2.4, [SOUP=2.4], [SOUP=])
-if test "x$SOUP" != "x2.4" -a "$evolution_exec_int" -ge "22190"; then
+if test "x$SOUP" != "x2.4" -a "$evolution_version_int" -ge "22190"; then
 	AC_MSG_ERROR([libsoup-2.4 devel headers required])
 else
 if test "x$SOUP" != "x2.4"; then
diff -Naur evolution-rss-0.1.4/m4/evolution.m4 evolution-rss-0.1.4-mod/m4/evolution.m4
--- evolution-rss-0.1.4/m4/evolution.m4	2009-04-24 14:53:19.000000000 +0300
+++ evolution-rss-0.1.4-mod/m4/evolution.m4	2009-12-24 20:14:18.000000000 +0200
@@ -1,16 +1,16 @@
 #  Evoution RSS Reader Plugin
-#  Copyright (C) 2007-2008 Lucian Langa <cooly at gnome.eu.org> 
-#  
+#  Copyright (C) 2007-2008 Lucian Langa <cooly at gnome.eu.org>
+#
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or 
+#  the Free Software Foundation; either version 2 of the License, or
 #  (at your option) any later version.
-#  
+#
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
-#  
+#
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -62,17 +62,16 @@
 fi
 AC_SUBST(EVOLUTION_VERSION)
 AC_MSG_RESULT($EVOLUTION_VERSION)
-AC_SUBST(EVOLUTION_BASE_VERSION)
 AC_SUBST(EVOLUTION_EXEC_VERSION)
 
-evolution_exec_int="$(echo "$EVOLUTION_EXEC_VERSION" | $AWK -F . '{print [$]1 * 10000 + [$]2 * 100 + [$]3}')"
-if test "$evolution_exec_int" -ge "21100"; then
+evolution_version_int="$(echo "$EVOLUTION_VERSION" | $AWK -F . '{print [$]1 * 10000 + [$]2 * 100 + [$]3}')"
+if test "$evolution_version_int" -ge "21100"; then
         AC_DEFINE_UNQUOTED(EVOLUTION_2_12,1, [evolution mail 2.12 present])
         AC_SUBST(EVOLUTION_2_12)
 fi
-AC_SUBST(evolution_exec_int)
+AC_SUBST(evolution_version_int)
 
-MINOR_VERSION="$(echo $EVOLUTION_EXEC_VERSION|cut -d. -f2|$AWK -F . '{print 1000 * [$]1}')"
+MINOR_VERSION="$(echo $EVOLUTION_VERSION|cut -d. -f2|$AWK -F . '{print 1000 * [$]1}')"
 AC_SUBST(MINOR_VERSION)
 
 dnl Evolution plugin install directory
diff -Naur evolution-rss-0.1.4/src/Makefile.am evolution-rss-0.1.4-mod/src/Makefile.am
--- evolution-rss-0.1.4/src/Makefile.am	2009-08-23 11:01:14.000000000 +0300
+++ evolution-rss-0.1.4-mod/src/Makefile.am	2009-12-24 20:14:18.000000000 +0200
@@ -9,7 +9,7 @@
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""		\
 	-DLOCALEDIR="\"$(LOCALEDIR)\""				\
 	-DEVOLUTION_VERSION_STRING=\"$(EVOLUTION_EXEC_VERSION)\"\
-	-DEVOLUTION_VERSION=$(evolution_exec_int)		\
+	-DEVOLUTION_VERSION=$(evolution_version_int) 		\
 	-DDATASERVER_VERSION=$(DATASERVER_VERSION)		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"            	\
 	-DEVOLUTION_ICONDIR=\""$(ICON_DIR)"\"            	\
diff -Naur evolution-rss-0.1.4/src/parser.c evolution-rss-0.1.4-mod/src/parser.c
--- evolution-rss-0.1.4/src/parser.c	2009-12-25 18:15:28.000000000 +0200
+++ evolution-rss-0.1.4-mod/src/parser.c	2009-12-25 18:36:29.000000000 +0200
@@ -932,6 +932,11 @@
 		//handle multiple enclosures
 		encl = layer_find_innerelement(top, "enclosure", "url",	// RSS 2.0 Enclosure
 			layer_find_innerelement(top, "link", "enclosure", NULL)); 		// ATOM Enclosure
+		//handle screwed feeds that set url to "" (feed does not validate!)
+		if (encl && !strlen(encl)) {
+					g_free(encl);
+					encl = NULL;
+		}
 //		encl = layer_find_tag_prop(el->children, "media", "url",	// RSS 2.0 Enclosure
 //							NULL); 		// ATOM Enclosure
 		//we have to free this somehow


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-12/evolution-rss.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- evolution-rss.spec	8 Dec 2009 18:14:25 -0000	1.45
+++ evolution-rss.spec	25 Dec 2009 17:29:04 -0000	1.46
@@ -11,7 +11,7 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	12%{?dist}
+Release:	13%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
@@ -25,6 +25,7 @@ Patch5:		evolution-rss-0.1.4-empty-sourc
 Patch6:		evolution-rss-0.1.4-reject-empty-url.patch
 Patch7:		evolution-rss-0.1.4-opml-fix.patch
 Patch8:		evolution-rss-0.1.4-status-icon.patch
+Patch9:		evolution-rss-0.1.4-vers-detect.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
@@ -57,8 +58,11 @@ This is an evolution plugin which enable
 %patch6 -p1 -b .reject-empty-url
 %patch7 -p1 -b .opml-fix
 %patch8 -p1 -b .status-icon
+%patch9 -p1 -b .vers-detect
 
 %build
+autoconf
+automake
 %configure --with-primary-render=gecko
 make %{?_smp_mflags}
 
@@ -110,6 +114,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Fri Dec 25 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-13
+- upstream patch to fix evo version detection
+
 * Tue Dec 08 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-12
 - upstream patch to fix status icon crash

More information about the fedora-extras-commits mailing list