From 2676b63410ac3a29e5281a90d6e52def3aa8620d Mon Sep 17 00:00:00 2001 From: Marc Wiriadisastra Date: Feb 22 2008 22:53:19 +0000 Subject: new version builds with gcc4.3 added firefox-devel and xulrunner-devel for different fedora's --- 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 index 2cfbf86..38ff21c 100644 --- a/liferea-gtkhtml2_x64.patch +++ b/liferea-gtkhtml2_x64.patch @@ -1,6 +1,5 @@ -diff -ur liferea-1.4.11.OLD/configure liferea-1.4.11/configure ---- liferea-1.4.11.OLD/configure 2008-01-16 14:19:38.000000000 -0500 -+++ liferea-1.4.11/configure 2008-01-16 16:42:06.000000000 -0500 +--- 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 diff --git a/liferea.spec b/liferea.spec index 5990487..3a56e80 100644 --- a/liferea.spec +++ b/liferea.spec @@ -1,8 +1,8 @@ -%define gecko_ver 1.8.1.10 +%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,19 +10,15 @@ License: GPLv2+ 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}-gtkhtml2_x64.patch +Patch1: %{name}-gtkhtml2_x64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#BuildRequires: gecko-devel = %{gecko_ver} -BuildRequires: gtkhtml2-devel BuildRequires: GConf2-devel BuildRequires: libX11-devel BuildRequires: libSM-devel BuildRequires: gnutls-devel BuildRequires: libnotify-devel -BuildRequires: NetworkManager-glib-devel +BuildRequires: NetworkManager-glib-devel BuildRequires: libxslt-devel >= 1.1.19 BuildRequires: sqlite-devel BuildRequires: dbus-devel @@ -30,9 +26,16 @@ BuildRequires: dbus-glib-devel BuildRequires: libglade2-devel BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: perl(XML::Parser) +BuildRequires: perl-XML-Parser -#Requires: gecko-libs = %{gecko_ver} +%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 @@ -53,7 +56,7 @@ browse through their items, and show their contents. %build %configure --disable-schemas-install \ - --disable-lua + --disable-lua --enable-xulrunner make %{?_smp_mflags} @@ -121,56 +124,54 @@ fi %changelog -* Tue Feb 19 2008 Fedora Release Engineering - 1.4.11-2 -- Autorebuild for GCC 4.3 - -* Wed Jan 16 2008 Brian Pepple - 1.4.11-1 -- Update to 1.4.11. +* 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 -* Mon Jan 7 2008 Brian Pepple - 1.4.10-3 -- Ugh. Drop the requires on gecko also, since we're not using xulrunner. +* Fri Feb 8 2008 Christopher Aillon - 1.4.11-2 +- Rebuild against newer gecko -* Mon Jan 7 2008 Brian Pepple - 1.4.10-2 -- Build only gtkhtml2 plugin for now, until xulrunner support is fixed. -- Add patch to build gtkhtml2 for x84_64. +* Thu Jan 17 2008 Brian Pepple - 1.4.11-1 +- Update to 1.4.11. release fixes news bin crasher. (#429021) * Wed Dec 19 2007 Brian Pepple - 1.4.10-1 - Update to 1.4.10. - Update feed patch. -* Sun Dec 2 2007 Brian Pepple - 1.4.9-2 -- Update feed patch. - * Sun Dec 2 2007 Brian Pepple - 1.4.9-1 - Update to 1.4.9. +- Update feed patch. * Tue Nov 27 2007 Christopher Aillon - 1.4.8-2 - Rebuild against newer gecko -* Wed Nov 21 2007 Brian Pepple - 1.4.8-1 +* Thu Nov 22 2007 Brian Pepple - 1.4.8-1 - Update to 1.4.8. -- fixes LD_LIBRARY_PATH security bug. CVE-2006-4791 (#393311) +- fixes LD_LIBRARY_PATH security bug. CVE-2006-4791 -* Sun Nov 11 2007 Brian Pepple - 1.4.7-1 +* Thu Nov 15 2007 Brian Pepple - 1.4.7-1 - Update to 1.4.7. +- Drop opml & nm patches. fixed upstream. +- Update fedora feed patch for 1.4.x. +- add BR on sqlite-devel, dbus-devel, dbus-glib-devel, libglade2-devel. +- Don't build gtkhtml2 plugin for now. -* Tue Nov 6 2007 Brian Pepple - 1.4.6-4 +* Tue Nov 6 2007 Brian Pepple - 1.2.23-6 - Rebuild for new gecko libs. -* Fri Nov 2 2007 Brian Pepple - 1.4.6-3 -- Update gecko version needed. +* Wed Oct 31 2007 Brian Pepple - 1.2.23-5 +- Add patch to fix opml security bug: CVE-2007-5751. (#360641) -* Fri Nov 2 2007 Brian Pepple - 1.4.6-2 -- Update Fedora feed patch. +* Wed Oct 24 2007 Jeremy Katz - 1.2.23-4 +- Fix build against new NetworkManager -* Mon Oct 29 2007 Brian Pepple - 1.4.6-1 -- Update to 1.4.6. +* Tue Oct 23 2007 Jeremy Katz - 1.2.23-3 +- Don't build against NetworkManager as the nm-glib api seems to have changed + +* Tue Oct 23 2007 Jeremy Katz - 1.2.23-2 +- Rebuild against new firefox -* Tue Oct 16 2007 Brian Pepple - 1.4.5b-1 -- Update to 1.4.5b -- add BR on sqlite-devel, dbus-devel, dbus-glib-devel, libglade2-devel. -- Don't build gtkhtml2 plugin for now. - * Sat Sep 8 2007 Brian Pepple - 1.2.23-1 - Update to 1.2.23. 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