From 01f49a515056a6e195d0f2f2dbd2ae8e08158ab1 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Jul 02 2008 18:28:51 +0000 Subject: update to 0.1.0 --- diff --git a/.cvsignore b/.cvsignore index 0c73f06..b275893 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-rss-0.0.8.tar.gz +evolution-rss-0.1.0.tar.gz diff --git a/evolution-rss-0.0.8-empty-desc.patch b/evolution-rss-0.0.8-empty-desc.patch deleted file mode 100644 index cc069d5..0000000 --- a/evolution-rss-0.0.8-empty-desc.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- evolution-rss-0.0.8/src/rss.c 2008-03-03 14:26:04.000000000 +0100 -+++ evolution-rss-0.0.8a/src/rss.c 2008-03-19 13:08:11.000000000 +0100 -@@ -3398,8 +3398,9 @@ - } - } - if (strcasecmp (node->name, match)==0) { -- if (node->children->type == 1 && (node->children != NULL -- || node->children->next != NULL)) { -+ if (node->children != NULL -+ && (node->children->type == 1 -+ || node->children->next != NULL)) { - #ifdef RDF_DEBUG - g_print("NODE DUMP:%s\n", xmlNodeGetContent(node->children->next)); - #endif diff --git a/evolution-rss-0.0.8-norss-popup.patch b/evolution-rss-0.0.8-norss-popup.patch deleted file mode 100644 index 773d349..0000000 --- a/evolution-rss-0.0.8-norss-popup.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: evolution-rss/src/rss.c -=================================================================== ---- evolution-rss/src/rss.c (.../svn+ssh://lucilanga@svn.gnome.org/svn/evolution-rss/tags/EVOLUTION-RSS_0_0_8) (revision 224) -+++ evolution-rss/src/rss.c (.../evolution-rss) (working copy) -@@ -2793,10 +2793,7 @@ - - if (!rf->setup || g_hash_table_size(rf->hrname)<1) - { -- e_error_run(NULL, -- "org-gnome-evolution-rss:generr", -- _("No RSS feeds configured!"), -- NULL); -+ taskbar_push_message(_("No RSS feeds configured!")); - return; - } - if (!feeds_enabled()) -@@ -2904,7 +2901,7 @@ - - if (!rf->setup || g_hash_table_size(rf->hrname)<1) - { -- e_error_run(NULL, "org-gnome-evolution-rss:generr", "No RSS feeds configured!", NULL); -+ taskbar_push_message(_("No RSS feeds configured!")); - return; - } - diff --git a/evolution-rss.spec b/evolution-rss.spec index 734da8f..4d15655 100644 --- a/evolution-rss.spec +++ b/evolution-rss.spec @@ -1,12 +1,10 @@ Summary: Evolution RSS Reader Name: evolution-rss -Version: 0.0.8 -Release: 5%{?dist} +Version: 0.1.0 +Release: 1%{?dist} Group: Applications/Internet License: GPLv2 and GPLv2+ Source: http://gnome.eu.org/%{name}-%{version}.tar.gz -Patch0: evolution-rss-0.0.8-empty-desc.patch -Patch1: evolution-rss-0.0.8-norss-popup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin Requires: evolution @@ -19,7 +17,8 @@ BuildRequires: gettext BuildRequires: evolution-devel BuildRequires: evolution-data-server-devel BuildRequires: dbus-glib-devel -BuildRequires: gecko-libs = 1.9 +BuildRequires: xulrunner-devel-unstable +BuildRequires: WebKit-gtk-devel BuildRequires: perl(XML::Parser) BuildRequires: libtool @@ -28,12 +27,9 @@ This is an evolution plugin which enables evolution to read rss feeds. %prep %setup -q -n evolution-rss-%{version} -%patch0 -p1 -b .empty-fix -%patch1 -p1 -b .norss-popup %build -autoreconf -i -f -%configure --disable-webkit +%configure make %{?_smp_mflags} %install @@ -75,8 +71,8 @@ fi %{_bindir}/evolution-import-rss %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_datadir}/evolution/*/errors/org-gnome-evolution-rss.error -%{_datadir}/evolution/*/glade/rss-ui.glade -%{_datadir}/evolution/*/images/rss.png +%{_datadir}/evolution/*/glade/*.glade +%{_datadir}/evolution/*/images/*.png %{_libdir}/evolution/*/plugins/org-gnome-evolution-rss.eplug %{_libdir}/evolution/*/plugins/org-gnome-evolution-rss.xml %{_libdir}/evolution/*/plugins/liborg-gnome-evolution-rss.so @@ -90,6 +86,9 @@ fi %doc TODO %changelog +* Wed Jul 2 2008 Lucian Langa - 0.1.0-1 +- New upstream + * Thu Mar 24 2008 Lucian Langa - 0.0.8-5 - Fixed wrong function def in previous patch diff --git a/sources b/sources index 72cb0e7..8f9ea88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5adce093e332573bc1fcfaf23c1f8b6 evolution-rss-0.0.8.tar.gz +63479fcf4c3af998ab2794e5a0f075f6 evolution-rss-0.1.0.tar.gz