--- a/ChangeLog Fri May 21 20:28:49 2010 +0000
+++ b/ChangeLog Fri May 21 21:32:53 2010 +0000
@@ -3,6 +3,7 @@
* SFEopenjpeg.spec: update to 1.3, split devel package
* encumbered/SFEmplayer-snap.spec: openjpeg and giflib support
* base-specs/libx264.spec: update to new tarball
+ * SFEliferea.spec: update to 1.6.3, dependency on webkit
2010-05-06 Mark Wright <[email protected]>
--- a/SFEliferea.spec Fri May 21 20:28:49 2010 +0000
+++ b/SFEliferea.spec Fri May 21 21:32:53 2010 +0000
@@ -5,17 +5,18 @@
#
%include Solaris.inc
-Name: SFEliferea
-Summary: Liferea - aggregator for online news feeds
-Version: 1.4.16b
-Source: %{sf_download}/liferea/liferea-%{version}.tar.gz
-Patch1: liferea-01-liferea.in.diff
-Patch2: liferea-02-libxsltversion.diff
-Patch3: liferea-03-no-unix03.diff
-Patch4: liferea-04-htmlview.c.diff
-Patch5: liferea-05-itemview.c.diff
-SUNW_BaseDir: %{_basedir}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Name: SFEliferea
+Summary: Liferea - aggregator for online news feeds
+Version: 1.6.3
+Source: %{sf_download}/liferea/liferea-%{version}.tar.gz
+URL: http://liferea.sourceforge.net/
+Group: Applications/Internet
+License: GPLv2
+Patch3: liferea-03-no-unix03.diff
+Patch4: liferea-04-htmlview.c.diff
+Patch5: liferea-05-itemview.c.diff
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
BuildRequires: SUNWgnome-libs-devel
BuildRequires: SUNWdbus-devel
@@ -32,6 +33,8 @@
%else
Requires: SUNWuiu8
%endif
+BuildRequires: SFEwebkitgtk-devel
+Requires: SFEwebkitgtk
%package root
Summary: %{summary} - / filesystem
@@ -48,11 +51,9 @@
%prep
%setup -q -n liferea-%version
-%patch1 -p0 -b .orig
-%patch2 -p0 -b .orig
-%patch3 -p0 -b .orig
-%patch4 -p0 -b .orig
-%patch5 -p0 -b .orig
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -69,6 +70,7 @@
glib-gettextize -f
libtoolize --copy --force
+intltoolize --force --copy
aclocal $ACLOCAL_FLAGS
autoheader
automake -a -c -f
@@ -77,8 +79,7 @@
./configure --prefix=%{_prefix} --mandir=%{_mandir} \
--libdir=%{_libdir} \
--libexecdir=%{_libexecdir} \
- --sysconfdir=%{_sysconfdir} \
- --enable-gecko=firefox
+ --sysconfdir=%{_sysconfdir}
# FIXME: adding INTLLIBS=-lresolv is cheating, instead,
# src/Makefile.am and configure.in should be updated to link to resolv
@@ -136,10 +137,25 @@
%dir %attr (0755, root, other) %{_datadir}/liferea
%dir %attr (0755, root, other) %{_datadir}/icons
%dir %attr (0755, root, other) %{_datadir}/icons/hicolor
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/16x16
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/16x16/apps
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/22x22
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/22x22/apps
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/24x24
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/24x24/apps
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/32x32
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/32x32/apps
%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/48x48
%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/48x48/apps
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/scalable
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/scalable/apps
%{_datadir}/liferea/*
+%{_datadir}/icons/hicolor/16x16/apps/*
+%{_datadir}/icons/hicolor/22x22/apps/*
+%{_datadir}/icons/hicolor/24x24/apps/*
+%{_datadir}/icons/hicolor/32x32/apps/*
%{_datadir}/icons/hicolor/48x48/apps/*
+%{_datadir}/icons/hicolor/scalable/apps/*
%dir %attr(0755, root, bin) %{_mandir}
%dir %attr(0755, root, bin) %{_mandir}/*
%{_mandir}/*/*
@@ -157,6 +173,8 @@
%endif
%changelog
+* Fri May 21 2010 - Milan Jurik
+- update to 1.6.3, dependency on webkit
* Mon Jun 23 2008 - [email protected]
- 1.4.16b
* Sun Nov 18 2007 - [email protected]
--- a/patches/liferea-03-no-unix03.diff Fri May 21 20:28:49 2010 +0000
+++ b/patches/liferea-03-no-unix03.diff Fri May 21 21:32:53 2010 +0000
@@ -1,22 +1,20 @@
---- src/common.c.orig Mon Jun 23 03:30:12 2008
-+++ src/common.c Mon Jun 23 03:30:24 2008
-@@ -37,8 +37,6 @@
+--- liferea-1.6.3/src/parsers/ns_dc.c Fri May 21 22:44:46 2010
++++ liferea-1.6.3-patch/src/parsers/ns_dc.c Fri May 21 22:43:40 2010
+@@ -23,7 +23,6 @@
+ # include <config.h>
+ #endif
+
+-#define _XOPEN_SOURCE 600 /* glibc2 needs this (man strptime) */
+
+ #include "ns_dc.h"
+ #include "common.h"
+--- liferea-1.6.3/src/common.c Fri May 21 22:44:46 2010
++++ liferea-1.6.3-patch/src/common.c Fri May 21 22:47:27 2010
+@@ -37,7 +37,6 @@
# include <config.h>
#endif
-#define _XOPEN_SOURCE 600 /* glibc2 needs this (man strptime) */
--
+
#include <libxml/uri.h>
-
- #include <glib.h>
---- src/parsers/ns_dc.c.old Mon Jun 23 03:32:24 2008
-+++ src/parsers/ns_dc.c Mon Jun 23 03:32:29 2008
-@@ -23,8 +23,6 @@
- # include <config.h>
- #endif
-
--#define _XOPEN_SOURCE 600 /* glibc2 needs this (man strptime) */
--
- #include "ns_dc.h"
- #include "conf.h"
- #include "common.h"
+ #include <gtk/gtk.h>
--- a/patches/liferea-04-htmlview.c.diff Fri May 21 20:28:49 2010 +0000
+++ b/patches/liferea-04-htmlview.c.diff Fri May 21 21:32:53 2010 +0000
@@ -1,5 +1,5 @@
---- src/htmlview.c.old Mon Jun 23 03:34:58 2008
-+++ src/htmlview.c Mon Jun 23 03:34:49 2008
+--- liferea-1.6.3/src/htmlview.c Sun May 24 12:11:35 2009
++++ liferea-1.6.3-patch/src/htmlview.c Fri May 21 22:49:34 2010
@@ -316,7 +316,7 @@
}
--- a/patches/liferea-05-itemview.c.diff Fri May 21 20:28:49 2010 +0000
+++ b/patches/liferea-05-itemview.c.diff Fri May 21 21:32:53 2010 +0000
@@ -1,11 +1,11 @@
---- src/itemview.c.old Mon Jun 23 03:40:14 2008
-+++ src/itemview.c Mon Jun 23 03:40:28 2008
-@@ -87,7 +87,7 @@
- itemView_priv.needsHTMLViewUpdate = TRUE;
+--- liferea-1.6.3/src/ui/itemview.c Fri May 1 20:53:17 2009
++++ liferea-1.6.3-patch/src/ui/itemview.c Fri May 21 22:45:32 2010
+@@ -135,7 +135,7 @@
}
--void itemview_set_mode(guint mode) {
-+void itemview_set_mode(itemViewMode mode) {
-
- if(itemView_priv.mode != mode) {
- itemView_priv.mode = mode;
+ void
+-itemview_set_mode (guint mode)
++itemview_set_mode (itemViewMode mode)
+ {
+ if (itemview->priv->mode != mode) {
+ itemview->priv->mode = mode;