X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=evolution-rss.spec;h=be480d7058648d8a5b3ba7bd524decb20c4e4c7e;hb=77e0448a4261f82546dfbbacb1b805b5d7f093b0;hp=0a345a1987d9853d7ffe0f92405ae61550554c32;hpb=c40acb98510b4ea1258e2519799e18a0275d3cf5;p=packages%2Fevolution-rss.git

diff --git a/evolution-rss.spec b/evolution-rss.spec
index 0a345a1..be480d7 100644
--- a/evolution-rss.spec
+++ b/evolution-rss.spec
@@ -1,37 +1,41 @@
 #
-# 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:	2
+Version:	0.1.2
+Release:	6
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://gnome.eu.org/%{name}-%{version}.tar.gz
-# Source0-md5:	c5adce093e332573bc1fcfaf23c1f8b6
+# Source0-md5:	a7c04b6f330c49785d34f59a19537798
 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:	GConf2-devel >= 2.26.0
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	dbus-glib-devel >= 0.74
-BuildRequires:	evolution-devel >= 2.22.0
+BuildRequires:	evolution-devel >= 2.26.0
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 2:2.12.8
-BuildRequires:	intltool >= 0.36.2
+BuildRequires:	gtk+2-devel >= 2:2.14.0
+%{?with_webkit:BuildRequires:	gtk-webkit-devel}
+BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libglade2-devel >= 1:2.6.2
-BuildRequires:	libgnomeui-devel >= 2.22.0
+BuildRequires:	libgnomeui-devel >= 2.24.0
 BuildRequires:	libsoup-devel >= 2.4.0
+BuildRequires:	libstdc++-devel
 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
+Requires:	evolution >= 2.26.0
+Requires:	gtk+2 >= 2:2.14.0
+%{?with_xulrunner:%requires_eq	xulrunner-libs}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # we have strict deps for xulrunner-libs
@@ -46,6 +50,7 @@ Czytnik kanałów informacyjnych RSS dla Evolution.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -54,7 +59,9 @@ Czytnik kanałów informacyjnych RSS dla Evolution.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	%{?!with_xulrunner:--disable-gecko} \
+	%{?!with_webkit:--disable-webkit}
 %{__make}
 
 %install
@@ -81,10 +88,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/evolution-import-rss
 %attr(755,root,root) %{_libdir}/evolution/*/plugins/liborg-gnome-evolution-rss.so
-%{_libdir}/bonobo/servers/GNOME_Evolution_RSS_2.22.server
+%{_libdir}/bonobo/servers/GNOME_Evolution_RSS_2.26.server
 %{_libdir}/evolution/*/plugins/org-gnome-evolution-rss.eplug
 %{_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