SPECS: liferea.spec - starting update to 1.2.7 - gtkhtml backend d...

megabajt megabajt at pld-linux.org
Sat Feb 24 16:14:18 CET 2007


Author: megabajt                     Date: Sat Feb 24 15:14:18 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- starting update to 1.2.7
- gtkhtml backend doesn't exist on x86_64
- release 0.1; NFY

---- Files affected:
SPECS:
   liferea.spec (1.119 -> 1.120) 

---- Diffs:

================================================================
Index: SPECS/liferea.spec
diff -u SPECS/liferea.spec:1.119 SPECS/liferea.spec:1.120
--- SPECS/liferea.spec:1.119	Wed Feb 14 02:18:27 2007
+++ SPECS/liferea.spec	Sat Feb 24 16:14:13 2007
@@ -2,20 +2,23 @@
 #
 # Conditional build:
 %bcond_without	dbus		# without DBUS support
-%bcond_without	mozilla		# without mozilla
 %bcond_without	gtkhtml		# without GtkHTML
-%bcond_without	mozilla_firefox	# build with mozilla-firefox-devel
+%bcond_without	xulrunner	# without XULRunner backend
 #
+%ifarch %{x8664}
+%undefine	with_gtkhtml	# GtkHTML backend disabled on x86_64
+%endif
 Summary:	A RSS feed reader
 Summary(pl.UTF-8):	Program do pobierania informacji w formacie RSS
 Name:		liferea
-Version:	1.2.6
-Release:	1
+Version:	1.2.7
+Release:	0.1
 License:	GPL v2
 Group:		X11/Applications/Networking
 Source0:	http://dl.sourceforge.net/liferea/%{name}-%{version}.tar.gz
 # Source0-md5:	57d6dccc89d2a05af027b9c06dd145c4
 Patch0:		%{name}-desktop.patch
+Patch1:		%{name}-xulrunner.patch
 URL:		http://liferea.sourceforge.net/
 BuildRequires:	GConf2-devel >= 2.10.0
 BuildRequires:	autoconf
@@ -28,19 +31,16 @@
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 1:2.6.19
 BuildRequires:	libxslt-devel >= 1.1.19
-%if %{with mozilla}
-%if %{with mozilla_firefox}
-BuildRequires:	mozilla-firefox-devel
-%else
-BuildRequires:	mozilla-devel
-%endif
-%endif
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	xulrunner-devel
 Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
 Requires(post,preun):	GConf2
 Requires:	%{name}-backend = %{version}-%{release}
+%ifarch %{x8664}
+Obsoletes:	liferea-gtkhtml
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautoreqdep	libgtkembedmoz.so libxpcom.so
@@ -70,11 +70,7 @@
 Summary(pl.UTF-8):	Moduł przeglądarki HTML dla Liferea oparty na Mozilli
 Group:		X11/Applications/Networking
 Requires:	%{name} = %{version}-%{release}
-%if %{with mozilla_firefox}
-%requires_eq	mozilla-firefox-libs
-%else
-Requires:	mozilla-embedded = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides mozilla-embedded)
-%endif
+%requires_eq_to	xulrunner xulrunner-devel
 Provides:	%{name}-backend = %{version}-%{release}
 
 %description mozilla
@@ -86,6 +82,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 #%{__glib_gettextize}
@@ -98,7 +95,7 @@
 	--disable-schemas-install \
 	%{!?with_dbus: --disable-dbus} \
 	%{!?with_gtkhtml: --disable-gtkhtml2} \
-	%{!?with_mozilla: --disable-gecko}
+	%{!?with_xulrunner: --disable-xulrunner}
 %{__make}
 
 %install
@@ -144,10 +141,10 @@
 %attr(755,root,root) %{_libdir}/%{name}/liblihtmlg.so*
 %endif
 
-%if %{with mozilla}
+%if %{with xulrunner}
 %files mozilla
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/liblihtmlm.so*
+%attr(755,root,root) %{_libdir}/%{name}/liblihtmlx.so*
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -156,6 +153,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.120  2007/02/24 15:14:13  megabajt
+- starting update to 1.2.7
+- gtkhtml backend doesn't exist on x86_64
+- release 0.1; NFY
+
 Revision 1.119  2007/02/14 01:18:27  sls
 - ver. 1.2.6
 - BR: libxslt-devel >= 1.1.19
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/liferea.spec?r1=1.119&r2=1.120&f=u



More information about the pld-cvs-commit mailing list