SPECS: evolution-rss.spec - updated to 0.1.0 - updated -ac.patch; added -li...

[megabajt]

Author: megabajt                     Date: Wed Jul  9 19:09:01 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 0.1.0
- updated -ac.patch; added -libxul.patch to fix build with xulrunner 1.9
- added xulrunner and webkit bconds

---- Files affected:
SPECS:
   evolution-rss.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/evolution-rss.spec
diff -u SPECS/evolution-rss.spec:1.19 SPECS/evolution-rss.spec:1.20
--- SPECS/evolution-rss.spec:1.19	Sat Apr 26 23:37:36 2008
+++ SPECS/evolution-rss.spec	Wed Jul  9 21:08:56 2008
@@ -1,18 +1,20 @@
 # $Revision$, $Date$
 #
-# TODO:
-# - add webkit / xulrunner bcond
+# Conditional build:
+%bcond_without	xulrunner	# without XULRunner render
+%bcond_without	webkit		# without WebKit render
 #
 Summary:	RSS Reader for Evolution Mail
 Summary(pl.UTF-8):	Czytnik kanałów informacyjnych RSS dla Evolution
 Name:		evolution-rss
-Version:	0.0.8
-Release:	3
+Version:	0.1.0
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://gnome.eu.org/%{name}-%{version}.tar.gz
-# Source0-md5:	c5adce093e332573bc1fcfaf23c1f8b6
+# Source0-md5:	63479fcf4c3af998ab2794e5a0f075f6
 Patch0:		%{name}-ac.patch
+Patch1:		%{name}-libxul.patch
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
 BuildRequires:	GConf2-devel >= 2.22.0
 BuildRequires:	autoconf
@@ -21,6 +23,7 @@
 BuildRequires:	evolution-devel >= 2.22.0
 BuildRequires:	gettext-devel
 BuildRequires:	gtk+2-devel >= 2:2.12.8
+%{?with_webkit:BuildRequires:	gtk-webkit-devel}
 BuildRequires:	intltool >= 0.36.2
 BuildRequires:	libglade2-devel >= 1:2.6.2
 BuildRequires:	libgnomeui-devel >= 2.22.0
@@ -28,11 +31,11 @@
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
-BuildRequires:	xulrunner-devel
+%{?with_xulrunner:BuildRequires:	xulrunner-devel >= 1.9-5}
 Requires(post,postun):	GConf2
 Requires:	evolution >= 2.22.0
 Requires:	gtk+2 >= 2:2.12.8
-%requires_eq	xulrunner-libs
+%{?with_xulrunner:%requires_eq	xulrunner-libs}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # we have strict deps for xulrunner-libs
@@ -47,6 +50,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -55,7 +59,9 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	%{?!with_xulrunner:--disable-gecko} \
+	%{?!with_webkit:--disable-webkit}
 %{__make}
 
 %install
@@ -87,8 +93,8 @@
 %{_libdir}/evolution/*/plugins/org-gnome-evolution-rss.xml
 %{_sysconfdir}/gconf/schemas/evolution-rss.schemas
 %{_datadir}/evolution/*/errors/org-gnome-evolution-rss.error
-%{_datadir}/evolution/*/glade/rss-ui.glade
-%{_datadir}/evolution/*/images/rss.png
+%{_datadir}/evolution/*/glade/*.glade
+%{_datadir}/evolution/*/images/*.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -96,6 +102,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2008/07/09 19:08:56  megabajt
+- updated to 0.1.0
+- updated -ac.patch; added -libxul.patch to fix build with xulrunner 1.9
+- added xulrunner and webkit bconds
+
 Revision 1.19  2008/04/26 21:37:36  megabajt
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/evolution-rss.spec?r1=1.19&r2=1.20&f=u