rpms/liferea/F-9 liferea-xulrunner.patch, NONE, 1.1 .cvsignore, 1.71, 1.72 liferea.spec, 1.111, 1.112 sources, 1.72, 1.73

[Marc Wiriadisastra (mwiriadi)]

Author: mwiriadi

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

Modified Files:
	.cvsignore liferea.spec sources 
Added Files:
	liferea-xulrunner.patch 
Log Message:
New release with patch for xulrunner included



liferea-xulrunner.patch:

--- NEW FILE liferea-xulrunner.patch ---
diff -up liferea-1.4.13/src/mozilla/mozilla.c.old liferea-1.4.13/src/mozilla/mozilla.c
--- liferea-1.4.13/src/mozilla/mozilla.c.old	2007-07-23 19:56:53.000000000 +0200
+++ liferea-1.4.13/src/mozilla/mozilla.c	2008-04-28 11:15:32.000000000 +0200
@@ -37,7 +37,7 @@ static void mozilla_init(void) {
 	/* Avoid influencing the component loading by $MOZILLA_FIVE_HOME */
 	g_unsetenv("MOZILLA_FIVE_HOME");
 
-	gtk_moz_embed_set_comp_path(MOZILLA_LIB_ROOT);
+	gtk_moz_embed_set_path(MOZILLA_LIB_ROOT);
 
 	mozembed_init();	
 }
diff -up liferea-1.4.13/configure.old liferea-1.4.13/configure
--- liferea-1.4.13/configure.old	2007-07-23 19:56:53.000000000 +0200
+++ liferea-1.4.13/configure	2008-04-28 11:15:32.000000000 +0200
@@ -25830,7 +25830,7 @@ fi
 
    MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider-gtkmozembed | awk '{print $1}' | sed "s/^-I//"`
    MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT`
-   MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider-gtkmozembed | awk '{print $1}' |  cut -c 3-`
+   MOZILLA_LIB_ROOT=`$PKG_CONFIG --variable=libdir $gecko_provider-gtkmozembed`
 
       MOZILLA_CFLAGS="$MOZILLA_CFLAGS \
 -I$MOZILLA_INCLUDE_ROOT \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-9/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore	17 Mar 2008 13:49:28 -0000	1.71
+++ .cvsignore	15 May 2008 10:25:09 -0000	1.72
@@ -1 +1 @@
-liferea-1.4.13.tar.gz
+liferea-1.4.15.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-9/liferea.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- liferea.spec	7 May 2008 03:47:00 -0000	1.111
+++ liferea.spec	15 May 2008 10:25:09 -0000	1.112
@@ -1,8 +1,8 @@
-%define gecko_ver 1.8.1.12
+%define gecko_ver 1.8.1.14
 
 Name:           liferea
-Version:        1.4.13
-Release: 	3%{?dist}
+Version:        1.4.15
+Release: 	4%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -11,6 +11,7 @@
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:		%{name}-fedorafeed.patch
 Patch1:         %{name}-gtkhtml2_x64.patch
+Patch2:         %{name}-xulrunner.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  GConf2-devel
@@ -33,7 +34,6 @@
 Requires:	gecko-libs = %{gecko_ver}
 BuildRequires: firefox-devel
 %else
-BuildRequires:	gtkhtml2-devel
 BuildRequires:    xulrunner-devel
 %endif
 
@@ -53,11 +53,11 @@
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .fedorafeed
 %patch1 -p1 -b .gtkhtml2
+%patch2 -p1 -b .xulrunner
 
 %build
-%configure --disable-schemas-install	\
-	--disable-lua --enable-xulrunner
-
+%configure --disable-schemas-install  --enable-mozilla \
+	--disable-lua
 make %{?_smp_mflags}
 
 
@@ -124,8 +124,20 @@
 
 
 %changelog
-* Tue May 06 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.13-3
-- Bump release to fix upgrade path (again).
+* Tue Apr 22 2008 Marc Wiriadisastra <marc at mwiriadi.id.au> - 1.4.15-4
+- Update to the latest gecko version
+
+* Sun Apr 20 2008 Arkady L. Shane <ashejn at yandex-team.ru> - 1.4.15-3
+- Rebuild against xulrunner
+- disable gtkhtml
+
+* Sat Apr 19 2008 Arkady L. Shane <ashejn at yandex-team.ru> - 1.4.15-2
+- Rebuild against newer webkit
+
+* Fri Apr 18 2008 Arkady L. Shane <ashejn at yandex-team.ru> - 1.4.15-1
+- Update to 1.4.15
+- rebuilt with WebKit engine as liferea cannot be compiled with
+  xulrunner (#399541)
 
 * Mon Apr 07 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.13-2
 - Rebuild for N-E-V-R issues.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liferea/F-9/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	17 Mar 2008 13:49:29 -0000	1.72
+++ sources	15 May 2008 10:25:09 -0000	1.73
@@ -1 +1 @@
-53940aba8d3499758c68a6283d6fe626  liferea-1.4.13.tar.gz
+e4ae96a0d41d94c31271ba791caec922  liferea-1.4.15.tar.gz