rpms/liferea/devel liferea-1.4.10-gtkhtml2_x64.patch, NONE, 1.1 liferea.spec, 1.102, 1.103

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/pkgs/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3906

Modified Files:
	liferea.spec 
Added Files:
	liferea-1.4.10-gtkhtml2_x64.patch 
Log Message:
* Mon Jan  7 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.4.10-2
- Build only gtkhtml2 plugin for now, until xulrunner support is fixed.
- Add patch to build gtkhtml2 for x84_64.


liferea-1.4.10-gtkhtml2_x64.patch:

--- NEW FILE liferea-1.4.10-gtkhtml2_x64.patch ---
diff -ur liferea-1.4.10.OLD/configure liferea-1.4.10/configure
--- liferea-1.4.10.OLD/configure	2007-12-19 15:00:52.000000000 -0500
+++ liferea-1.4.10/configure	2008-01-07 15:12:39.000000000 -0500
@@ -21685,8 +21685,8 @@
 echo $ECHO_N "checking for 64bit platform... $ECHO_C" >&6; }
 case "$target" in
    x86_64-*-*)
-     enable_gtkhtml2=no
-     { echo "$as_me:$LINENO: result: yes -> disabling GtkHTML2" >&5
+     enable_gtkhtml2=yes
+     { echo "$as_me:$LINENO: result: yes -> enabling GtkHTML2" >&5
 echo "${ECHO_T}yes -> disabling GtkHTML2" >&6; }
      ;;
    *)


Index: liferea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- liferea.spec	19 Dec 2007 21:51:03 -0000	1.102
+++ liferea.spec	7 Jan 2008 20:34:36 -0000	1.103
@@ -2,7 +2,7 @@
 
 Name:           liferea
 Version:        1.4.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -10,9 +10,13 @@
 URL:            http://liferea.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:		%{name}-fedorafeed.patch
+# Temporary hack to work around gtkhtml2 support on x86_64,
+# until xulrunner support is fixed.
+Patch1:		%{name}-%{version}-gtkhtml2_x64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gecko-devel = %{gecko_ver}
+#BuildRequires:  gecko-devel = %{gecko_ver}
+BuildRequires:	gtkhtml2-devel
 BuildRequires:  GConf2-devel
 BuildRequires:	libX11-devel
 BuildRequires:	libSM-devel
@@ -45,7 +49,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .fedorafeed
-
+%patch1 -p1 -b .gtkhtml2
 
 %build
 %configure --disable-schemas-install	\
@@ -117,6 +121,10 @@
 
 
 %changelog
+* Mon Jan  7 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.4.10-2
+- Build only gtkhtml2 plugin for now, until xulrunner support is fixed.
+- Add patch to build gtkhtml2 for x84_64.
+
 * Wed Dec 19 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.4.10-1
 - Update to 1.4.10.
 - Update feed patch.