evolution-rss r140 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Wed Jan 30 20:09:31 2008
New Revision: 140
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=140&view=rev

Log:
spec fixes

Modified:
   trunk/evolution-rss.spec.in
   trunk/src/rss.c

Modified: trunk/evolution-rss.spec.in
==============================================================================
--- trunk/evolution-rss.spec.in	(original)
+++ trunk/evolution-rss.spec.in	Wed Jan 30 20:09:31 2008
@@ -3,7 +3,7 @@
 %define release 1
 
 Summary: Evolution RSS Reader
-Name:	 %{name}
+Name: %{name}
 Version: %{version}
 Release: 1%{?dist}
 Group: Applications/Internet
@@ -14,19 +14,16 @@
 #Patch: evolution-rss-%{version}.patch
 Requires: evolution
 Requires: firefox-devel
-Requires: dbus
-Requires: dbus-glib
 
+Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
 BuildRequires: gettext
-BuildRequires: gettext-devel
-BuildRequires: gcc-c++
 BuildRequires: evolution-devel
 BuildRequires: evolution-data-server-devel 
-BuildRequires: dbus
 BuildRequires: dbus-glib-devel
+BuildRequires: firefox-devel
 BuildRequires: perl(XML::Parser)
 
 %description
@@ -37,11 +34,12 @@
 #%patch
 
 %build
-./configure --prefix="%{_prefix}" --sysconfdir="%{_sysconfdir}"  --libdir=%{_libdir} --disable-webkit
+%configure --prefix="%{_prefix}" --sysconfdir="%{_sysconfdir}"  --libdir=%{_libdir} --disable-webkit
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR="%{buildroot}"
 find %{buildroot} -name \*\.la -print | xargs rm -f
 %find_lang %{name}
@@ -49,22 +47,31 @@
 %clean
 rm -rf %{buildroot}
 
+%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 || :
+
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-	%{_sysconfdir}/gconf/schemas/evolution-rss.schemas >/dev/null
+	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||| :
 /sbin/ldconfig
 
 %preun
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule \
-	%{_sysconfdir}/gconf/schemas/evolution-rss.schemas >/dev/null
+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
+/sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_prefix}/bin/evolution-import-rss
+%{_bindir}/evolution-import-rss
 %{_sysconfdir}/gconf/schemas/evolution-rss.schemas
 %{_datadir}/evolution/*/errors/org-gnome-evolution-rss.error
 %{_datadir}/evolution/*/glade/rss-ui.glade
@@ -82,6 +89,8 @@
 %doc TODO
 
 %changelog
+* Wed Jan 30 2008 Lucian Langa <lucilanga gnome org>
+- Updates and sanitize
 * Thu Jan 24 2008 Lucian Langa <lucilanga gnome org>
 - Fixed rpmlint warnings
 - Updated to Fedora Packaging Guidelines

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Wed Jan 30 20:09:31 2008
@@ -3216,7 +3216,6 @@
 		utf8len = 5*inlen+1;
 		buffer2 = g_malloc(utf8len);
 		UTF8ToHtml(buffer2, &utf8len, content->str, &inlen);
-//		g_byte_array_free (buffer, 1);
 		xmlDoc *src = (xmlDoc *)parse_html(addr, buffer2, strlen(buffer2));
 
 		if (src)
@@ -3225,6 +3224,7 @@
 #ifdef RSS_DEBUG
 			g_print("%s\n", buff);
 #endif
+			g_print("%s\n", buff);
 			xmlFree(src);
 		}
 		else