[svn] r6401 - trunk/rpms/evolution-rss

[packagers at lists.rpmforge.net]

Author: hadams
Date: 2008-07-07 20:48:23 +0100 (Mon, 07 Jul 2008)
New Revision: 6401

Added:
   trunk/rpms/evolution-rss/evolution-rss-0.1.0-centos.patch
   trunk/rpms/evolution-rss/evolution-rss-0.1.0-firefox-import.patch
Modified:
   trunk/rpms/evolution-rss/evolution-rss.spec
Log:
Updated to version 0.1.0

Added: trunk/rpms/evolution-rss/evolution-rss-0.1.0-centos.patch
===================================================================
--- trunk/rpms/evolution-rss/evolution-rss-0.1.0-centos.patch	                        (rev 0)
+++ trunk/rpms/evolution-rss/evolution-rss-0.1.0-centos.patch	2008-07-07 19:48:23 UTC (rev 6401)
@@ -0,0 +1,15 @@
+Index: src/rss-config-factory.c
+===================================================================
+--- src/rss-config-factory.c	(revision 334)
++++ src/rss-config-factory.c	(working copy)
+@@ -1747,7 +1747,9 @@
+ 	gtk_tree_view_column_set_sort_column_id (column, 2);
+ 	gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview),
+                                                    2);
+-	gtk_tree_view_set_tooltip_column (treeview, 1);
++#if GTK_VERSION >= 2012000
++        gtk_tree_view_set_tooltip_column (treeview, 1);
++#endif
+ 
+ 	if (rf->hr != NULL)
+         	g_hash_table_foreach(rf->hrname, construct_list, store);

Added: trunk/rpms/evolution-rss/evolution-rss-0.1.0-firefox-import.patch
===================================================================
--- trunk/rpms/evolution-rss/evolution-rss-0.1.0-firefox-import.patch	                        (rev 0)
+++ trunk/rpms/evolution-rss/evolution-rss-0.1.0-firefox-import.patch	2008-07-07 19:48:23 UTC (rev 6401)
@@ -0,0 +1,44 @@
+Index: src/misc.c
+===================================================================
+--- src/misc.c	(.../svn+ssh://lucilanga@svn.gnome.org/svn/evolution-rss/tags/EVOLUTION-RSS_0_1_0/src/misc.c)	(revision 333)
++++ src/misc.c	(.../src/misc.c)	(working copy)
+@@ -65,6 +65,8 @@
+ {
+ 	if (strstr(text, "feed//"))
+ 		text = strextr(text, "feed//");
++	if (strstr(text, "feed:"))
++		text = strextr(text, "feed:");
+ 	if (strstr(text, "feed://"))
+ 		text = strextr(text, "feed://");
+  	if (!strstr (text, "http://") 
+Index: src/network-soup.c
+===================================================================
+--- src/network-soup.c	(.../svn+ssh://lucilanga@svn.gnome.org/svn/evolution-rss/tags/EVOLUTION-RSS_0_1_0/src/network-soup.c)	(revision 333)
++++ src/network-soup.c	(.../src/network-soup.c)	(working copy)
+@@ -488,7 +488,7 @@
+ 
+ 	if (!rf->b_session)
+ 		rf->b_session = soup_sess = 
+-			soup_session_sync_new_with_options(SOUP_SESSION_TIMEOUT, SS_TIMEOUT, NULL);
++			soup_session_sync_new_with_options(SOUP_SESSION_TIMEOUT, SS_TIMEOUT, NULL);		
+ 	else
+ 		soup_sess = rf->b_session;
+ 
+@@ -499,14 +499,14 @@
+             G_CALLBACK (reauthenticate), soup_sess);
+ #endif
+ 
+-	suri = soup_uri_new(url);
+-	if (!suri)
++	req = soup_message_new(SOUP_METHOD_GET, url);
++	if (!req)
+ 	{
+ 		g_set_error(err, NET_ERROR, NET_ERROR_GENERIC,
+ 				soup_status_get_phrase(2));			//invalid url
+ 		goto out;
+ 	}
+-	req = soup_message_new_from_uri(SOUP_METHOD_GET, suri);
++	d(g_print("request ok :%d\n", req->status_code));
+ 	g_signal_connect(G_OBJECT(req), "got-chunk",
+ 			G_CALLBACK(got_chunk_blocking_cb), &info);
+ 	for (; headers; headers = headers->next) {

Modified: trunk/rpms/evolution-rss/evolution-rss.spec
===================================================================
--- trunk/rpms/evolution-rss/evolution-rss.spec	2008-07-07 17:57:16 UTC (rev 6400)
+++ trunk/rpms/evolution-rss/evolution-rss.spec	2008-07-07 19:48:23 UTC (rev 6401)
@@ -2,19 +2,22 @@
 # Authority: hadams
 
 Name:		evolution-rss
-Version:	0.0.8
-Release:	3
+Version:	0.1.0
+Release:	1
 Summary:	Evolution plugin for rss feed support
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
 Group:		Productivity/Networking/Email/Clients
 License:	GPL
 Source:         hhttp://gnome.eu.org/evolution-rss-%{version}.tar.gz
 
-Patch0: 	evolution-rss-0.0.8-empty-desc.patch
-Patch1: 	evolution-rss-0.0.8-norss-popup.patch
-Patch2: 	evolution-rss-0.0.8-norss-enabled.patch
-Patch3: 	evolution-rss-0.0.8-xulrunner.patch
+#Patch0: 	evolution-rss-0.0.8-empty-desc.patch
+#Patch1: 	evolution-rss-0.0.8-norss-popup.patch
+#Patch2: 	evolution-rss-0.0.8-norss-enabled.patch
+#Patch3: 	evolution-rss-0.0.8-xulrunner.patch
 
+Patch0: 	evolution-rss-0.1.0-firefox-import.patch
+Patch1: 	evolution-rss-0.1.0-centos.patch
+
 Requires:       evolution, xulrunner
 Requires(pre): 	GConf2
 Requires(post): GConf2
@@ -40,11 +43,14 @@
 
 %prep
 %setup -q -n evolution-rss-%{version}
-%patch0 -p1 -b .empty-fix
-%patch1 -p1 -b .norss-popup
-%patch2 -p1 -b .norss-enabled
-%patch3 -p1 -b .xulrunner
+#%patch0 -p1 -b .empty-fix
+#%patch1 -p1 -b .norss-popup
+#%patch2 -p1 -b .norss-enabled
+#%patch3 -p1 -b .xulrunner
 
+%patch0 -b .firefox-import
+%patch1 -b .centos
+
 %build
 autoreconf -i -f
 %configure --disable-webkit
@@ -99,6 +105,10 @@
 /etc/gconf/schemas/evolution-rss.schemas
 
 %changelog
+* Mon Jul 07 2008 Heiko Adams <info-2007 at fedora-blog.de> - 0.1.0-1
+- update to 0.1.0
+- added additional patches
+
 * Mon Jul 07 2008 Heiko Adams <info-2007 at fedora-blog.de> - 0.0.8-3
 - rebuild for FF3 final