rpms/liferea/F-8 liferea-gtkhtml2_x64.patch, NONE, 1.1 .cvsignore, 1.67, 1.68 liferea-fedorafeed.patch, 1.3, 1.4 liferea.spec, 1.103, 1.104 sources, 1.68, 1.69

Fri Feb 22 23:11:57 UTC 2008

Author: mwiriadi

Update of /cvs/pkgs/rpms/liferea/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4069/F-8

Modified Files:
	.cvsignore liferea-fedorafeed.patch liferea.spec sources 
Added Files:
	liferea-gtkhtml2_x64.patch 
Log Message:
 new version
 builds with gcc4.3
 added firefox-devel and xulrunner-devel for different fedora's



liferea-gtkhtml2_x64.patch:

--- NEW FILE liferea-gtkhtml2_x64.patch ---
--- liferea-1.4.12/configure	2008-02-01 07:15:45.000000000 +0900
+++ liferea-1.4.12-mod/configure	2008-02-20 23:21:59.000000000 +0900
@@ -21821,8 +21821,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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-8/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	17 Jan 2008 16:31:31 -0000	1.67
+++ .cvsignore	22 Feb 2008 23:11:14 -0000	1.68
@@ -1 +1 @@
-liferea-1.4.11.tar.gz
+liferea-1.4.12.tar.gz

liferea-fedorafeed.patch:

Index: liferea-fedorafeed.patch
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-8/liferea-fedorafeed.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- liferea-fedorafeed.patch	20 Dec 2007 00:35:14 -0000	1.3
+++ liferea-fedorafeed.patch	22 Feb 2008 23:11:14 -0000	1.4
@@ -1,17 +1,15 @@
-diff -urp liferea-1.4.10.OLD/opml/feedlist.opml liferea-1.4.10/opml/feedlist.opml
---- liferea-1.4.10.OLD/opml/feedlist.opml	2007-12-06 00:42:28.000000000 -0500
-+++ liferea-1.4.10/opml/feedlist.opml	2007-12-19 15:43:02.000000000 -0500
-@@ -21,6 +21,13 @@
+--- liferea-1.4.12/opml/feedlist.opml	2007-12-06 14:42:28.000000000 +0900
++++ liferea-1.4.12-mod/opml/feedlist.opml	2008-02-20 22:38:17.000000000 +0900
+@@ -20,6 +20,12 @@
+ 		</outline>	
  	</outline>
  	<!-- end of default block -->
- 
 +	<outline text="Fedora">
 +		<outline text="FedoraNews.org" htmlUrl="http://fedoranews.org/" xmlUrl="http://fedoranews.org/cms/node/feed" />
 +		<outline text="Red Hat Magazine" htmlUrl="http://www.redhat.com/magazine/" xmlUrl="http://feeds.feedburner.com/RedHatMagazine" />
 +		<outline text="Planet Fedora" htmlUrl="http://planet.fedoraproject.org/" xmlUrl="http://planet.fedoraproject.org/atom.xml" />
 +		<outline text="Fedora Info" htmlUrl="http://fedoraproject.org/infofeed/" xmlUrl="http://fedoraproject.org/infofeed/rss20.xml" />
 +       </outline>
-+
+ 
  	<!-- the following search folders should also be in sync for all feed lists -->
  	<!-- Do only translate the @text attributes in all of the following <outline> tags! -->
- 	<outline text="Unread" title="Unread" description="Unread" type="vfolder" htmlUrl="" xmlUrl="vfolder">


Index: liferea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-8/liferea.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- liferea.spec	8 Feb 2008 18:10:59 -0000	1.103
+++ liferea.spec	22 Feb 2008 23:11:14 -0000	1.104
@@ -1,8 +1,8 @@
 %define gecko_ver 1.8.1.12
 
 Name:           liferea
-Version:        1.4.11
-Release: 	2%{?dist}
+Version:        1.4.12
+Release: 	    1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -10,9 +10,9 @@
 URL:            http://liferea.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:		%{name}-fedorafeed.patch
+Patch1:         %{name}-gtkhtml2_x64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gecko-devel = %{gecko_ver}
 BuildRequires:  GConf2-devel
 BuildRequires:	libX11-devel
 BuildRequires:	libSM-devel
@@ -26,9 +26,16 @@
 BuildRequires:	libglade2-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:	perl(XML::Parser)
+BuildRequires:	perl-XML-Parser
 
+%if 0%{?fedora} <= 8
+BuildRequires: gecko-devel = %{gecko_ver}
 Requires:	gecko-libs = %{gecko_ver}
+BuildRequires: firefox-devel
+%else
+BuildRequires:	gtkhtml2-devel
+BuildRequires:    xulrunner-devel
+%endif
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -45,11 +52,11 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .fedorafeed
-
+%patch1 -p1 -b .gtkhtml2
 
 %build
 %configure --disable-schemas-install	\
-	--disable-lua
+	--disable-lua --enable-xulrunner
 
 make %{?_smp_mflags}
 
@@ -117,6 +124,11 @@
 
 
 %changelog
+* Wed Feb 20 2008 Marc Wiriadisastra <marc at mwiriadi.id.au> - 1.5.12-1
+- new version
+- builds with gcc4.3
+- added firefox-devel and xulrunner-devel for different fedora's
+
 * Fri Feb  8 2008 Christopher Aillon <caillon at redhat.com> - 1.4.11-2
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-8/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	17 Jan 2008 16:31:31 -0000	1.68
+++ sources	22 Feb 2008 23:11:14 -0000	1.69
@@ -1 +1 @@
-b96a479a4b72560cbdd8df8b7efd24b3  liferea-1.4.11.tar.gz
+a4c70843ad3820b63047010216cd8cf2  liferea-1.4.12.tar.gz


