[svn] r6391 - trunk/rpms/evolution-rss
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Sun Jun 29 15:12:27 CEST 2008
Author: hadams
Date: 2008-06-29 14:12:27 +0100 (Sun, 29 Jun 2008)
New Revision: 6391
Added:
trunk/rpms/evolution-rss/evolution-rss-0.0.8-empty-desc.patch
trunk/rpms/evolution-rss/evolution-rss-0.0.8-norss-enabled.patch
trunk/rpms/evolution-rss/evolution-rss-0.0.8-norss-popup.patch
trunk/rpms/evolution-rss/evolution-rss-0.0.8-xulrunner.patch
Modified:
trunk/rpms/evolution-rss/evolution-rss.spec
Log:
Patches added and modified for EL5.2
Added: trunk/rpms/evolution-rss/evolution-rss-0.0.8-empty-desc.patch
===================================================================
--- trunk/rpms/evolution-rss/evolution-rss-0.0.8-empty-desc.patch (rev 0)
+++ trunk/rpms/evolution-rss/evolution-rss-0.0.8-empty-desc.patch 2008-06-29 13:12:27 UTC (rev 6391)
@@ -0,0 +1,14 @@
+--- 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
Added: trunk/rpms/evolution-rss/evolution-rss-0.0.8-norss-enabled.patch
===================================================================
--- trunk/rpms/evolution-rss/evolution-rss-0.0.8-norss-enabled.patch (rev 0)
+++ trunk/rpms/evolution-rss/evolution-rss-0.0.8-norss-enabled.patch 2008-06-29 13:12:27 UTC (rev 6391)
@@ -0,0 +1,55 @@
+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/src/rss.c) (revision 229)
++++ evolution-rss/src/rss.c (.../evolution-rss/src/rss.c) (working copy)
+@@ -2775,6 +2775,12 @@
+
+ void org_gnome_cooly_rss_refresh(void *ep, EMPopupTargetSelect *t);
+
++gboolean
++check_if_enabled (gpointer key, gpointer value, gpointer user_data)
++{
++ return value;
++}
++
+ void
+ org_gnome_cooly_rss_refresh(void *ep, EMPopupTargetSelect *t)
+ {
+@@ -2791,6 +2797,10 @@
+ if (!rf->online)
+ return;
+
++ //no feeds enabled
++ if (!g_hash_table_find(rf->hre, check_if_enabled, NULL))
++ return;
++
+ if (!rf->setup || g_hash_table_size(rf->hrname)<1)
+ {
+ e_error_run(NULL,
+@@ -2799,15 +2809,6 @@
+ NULL);
+ return;
+ }
+- if (!feeds_enabled())
+- {
+- e_error_run(NULL,
+- "org-gnome-evolution-rss:feederr",
+- _("No RSS feeds enabled!"),
+- _("Go to Edit->Preferences->News & Blogs to enable feeds."),
+- NULL);
+- return;
+- }
+ readrss_dialog = e_error_new(NULL,
+ "org-gnome-evolution-rss:readrss",
+ _("Reading RSS feeds..."),
+@@ -2902,6 +2903,10 @@
+
+ rf->t = t;
+
++ //no feeds enabled
++ if (!g_hash_table_find(rf->hre, check_if_enabled, NULL))
++ return;
++
+ if (!rf->setup || g_hash_table_size(rf->hrname)<1)
+ {
+ e_error_run(NULL, "org-gnome-evolution-rss:generr", "No RSS feeds configured!", NULL);
Added: trunk/rpms/evolution-rss/evolution-rss-0.0.8-norss-popup.patch
===================================================================
--- trunk/rpms/evolution-rss/evolution-rss-0.0.8-norss-popup.patch (rev 0)
+++ trunk/rpms/evolution-rss/evolution-rss-0.0.8-norss-popup.patch 2008-06-29 13:12:27 UTC (rev 6391)
@@ -0,0 +1,25 @@
+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;
+ }
+
Added: trunk/rpms/evolution-rss/evolution-rss-0.0.8-xulrunner.patch
===================================================================
--- trunk/rpms/evolution-rss/evolution-rss-0.0.8-xulrunner.patch (rev 0)
+++ trunk/rpms/evolution-rss/evolution-rss-0.0.8-xulrunner.patch 2008-06-29 13:12:27 UTC (rev 6391)
@@ -0,0 +1,52 @@
+Index: evolution-rss-patch/src/rss.c
+===================================================================
+--- evolution-rss-patch/src/rss.c (.../http://svn.gnome.oorg/svn/evolution-rss/trunk) (revision 231)
++++ evolution-rss-patch/src/rss.c (.../evolution-rss-patch) (working copy)
+@@ -85,8 +85,12 @@
+ #ifdef HAVE_RENDERKIT
+
+ #ifdef HAVE_GTKMOZEMBED
++#ifdef HAVE_LIBXUL
++#include <gtkembedmoz/gtkmozembed.h>
++#else
+ #include <gtkmozembed.h>
+ #endif
++#endif
+
+ #ifdef HAVE_OLD_WEBKIT
+ #include "webkitgtkglobal.h"
+@@ -1512,7 +1516,7 @@
+ gtk_widget_set_size_request((GtkWidget *)data, width, height);
+ // apparently resizing gtkmozembed widget won't redraw if using xulrunner
+ // there is no point in reload for the rest
+-#ifdef HAVE_XULRUNNER
++#if defined(HAVE_XULRUNNER) || defined(HAVE_LIBXUL)
+ gtk_moz_embed_reload(rf->mozembed, GTK_MOZ_EMBED_FLAG_RELOADNORMAL);
+ #endif
+ }
+@@ -1527,7 +1531,13 @@
+ g_setenv("MOZILLA_FIVE_HOME", GECKO_HOME, 1);
+ g_unsetenv("MOZILLA_FIVE_HOME");
+
++// this means xulrunner at least 1.9
++#ifdef HAVE_LIBXUL
++ gtk_moz_embed_set_path(GECKO_HOME);
++#else
+ gtk_moz_embed_set_comp_path(GECKO_HOME);
++#endif
++
+ gchar *profile_dir = g_build_filename (g_get_home_dir (),
+ ".evolution",
+ "mail",
+Index: evolution-rss-patch/src/Makefile.am
+===================================================================
+--- evolution-rss-patch/src/Makefile.am (.../http://svn.gnome.oorg/svn/evolution-rss/trunk) (revision 231)
++++ evolution-rss-patch/src/Makefile.am (.../evolution-rss-patch) (working copy)
+@@ -3,6 +3,7 @@
+ -I$(EVOLUTION_SOURCE) \
+ -I$(top_srcdir) \
+ $(GECKO_CFLAGS) \
++ -I$(GECKO_INCLUDE_ROOT) \
+ $(WEBKIT_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
Modified: trunk/rpms/evolution-rss/evolution-rss.spec
===================================================================
--- trunk/rpms/evolution-rss/evolution-rss.spec 2008-06-24 22:58:29 UTC (rev 6390)
+++ trunk/rpms/evolution-rss/evolution-rss.spec 2008-06-29 13:12:27 UTC (rev 6391)
@@ -3,33 +3,82 @@
Name: evolution-rss
Version: 0.0.8
-Release: 1
+Release: 2
Summary: Evolution plugin for rss feed support
-URL: http://mips.edu.ms/evo/index.php/Evolution_RSS_Reader_Plugin
+URL: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
Group: Productivity/Networking/Email/Clients
License: GPL
-Source: http://mips.edu.ms/evolution-rss-%{version}.tar.gz
+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
+
Requires: evolution
-BuildRequires: gettext-devel, evolution-devel, perl(XML::Parser)
-BuildRequires: firefox-devel
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun):GConf2
+
+#BuildRequires: gettext-devel, evolution-devel, perl(XML::Parser)
+#BuildRequires: firefox-devel
+
+BuildRequires: gettext
+BuildRequires: evolution-devel
+BuildRequires: evolution-data-server-devel
+BuildRequires: dbus-glib-devel
+BuildRequires: gecko-libs = 1.9
+BuildRequires: gecko-devel = 1.9
+BuildRequires: perl(XML::Parser)
+BuildRequires: libtool
+
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
RSS Evolution plugin enables evolution to read rss feeds.
%prep
-%setup
+%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
%build
-%configure
+autoreconf -i -f
+%configure --disable-webkit
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR="%{buildroot}"
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+%{__make} install DESTDIR="%{buildroot}" INSTALL="install -p"
+find %{buildroot} -name \*\.la -print | xargs rm -f
%find_lang %{name}
+%pre
+if [ "$1" -gt 1 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
+fi
+
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+/sbin/ldconfig
+
+%preun
+if [ "$1" -eq 0 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+fi
+
+%postun -p /sbin/ldconfig
+
%clean
%{__rm} -rf %{buildroot}
@@ -49,6 +98,9 @@
/etc/gconf/schemas/evolution-rss.schemas
%changelog
+* Sun Jun 29 2008 Heiko Adams <info-2007 at fedora-blog.de> - 0.0.8-2
+- rebuild for el5.2
+
* Mon Mar 03 2008 Heiko Adams <info-2007 at fedora-blog.de> - 0.0.8-1
- Update to 0.0.8
More information about the svn-commits
mailing list