diff --git a/.cvsignore b/.cvsignore index 2f62c75..e012d6e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -liferea-1.4.11.tar.gz +liferea-1.4.12.tar.gz diff --git a/liferea-fedorafeed.patch b/liferea-fedorafeed.patch index 79463c7..a5696bd 100644 --- a/liferea-fedorafeed.patch +++ b/liferea-fedorafeed.patch @@ -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 @@ + - + + + + + + -+ + - diff --git a/liferea-gtkhtml2_x64.patch b/liferea-gtkhtml2_x64.patch new file mode 100644 index 0000000..38ff21c --- /dev/null +++ b/liferea-gtkhtml2_x64.patch @@ -0,0 +1,13 @@ +--- 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; } + ;; + *) diff --git a/liferea.spec b/liferea.spec index e8837d7..3a56e80 100644 --- a/liferea.spec +++ b/liferea.spec @@ -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 @@ License: GPLv2+ 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: dbus-glib-devel 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 @@ browse through their items, and show their contents. %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 @@ fi %changelog +* Wed Feb 20 2008 Marc Wiriadisastra - 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 - 1.4.11-2 - Rebuild against newer gecko diff --git a/sources b/sources index 40bf4ae..df11a06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b96a479a4b72560cbdd8df8b7efd24b3 liferea-1.4.11.tar.gz +a4c70843ad3820b63047010216cd8cf2 liferea-1.4.12.tar.gz