- up to 0.2.0, problem: build with xulrunner

Changed files:
    evolution-rss.spec -> 1.48

diff --git a/evolution-rss.spec b/evolution-rss.spec
index 5b38280c36ebd247fac676d2f58e52b2ad7a623d..0a8ac38101e4137908d29e80d9063de31e109428 100644 (file)
--- a/evolution-rss.spec
+++ b/evolution-rss.spec
@@ -1,26 +1,24 @@
 #
 # Conditional build:
-%bcond_without xulrunner       # without XULRunner render
+%bcond_with    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.1.4
-Release:       11
+Version:       0.2.0
+Release:       0.1
 License:       GPL v2
 Group:         X11/Applications
 Source0:       http://gnome.eu.org/%{name}-%{version}.tar.gz
-# Source0-md5: e6df6ae91fe41882ccb54231b28d7efd
-Patch0:                %{name}-ac.patch
-Patch1:                %{name}-libxul.patch
-Patch2:                %{name}-0.1.4-recv-feeds2.patch
+# Source0-md5: 8d5ba1cce5081dc777e69a83695a7962
 URL:           http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
 BuildRequires: GConf2-devel >= 2.26.0
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: dbus-glib-devel >= 0.74
 BuildRequires: evolution-devel >= 2.26.0
+BuildRequires: geoclue-devel
 BuildRequires: gettext-devel
 BuildRequires: gnome-common
 BuildRequires: gtk+2-devel >= 2:2.14.0
@@ -28,7 +26,8 @@ BuildRequires:        gtk+2-devel >= 2:2.14.0
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libglade2-devel >= 1:2.6.2
 BuildRequires: libgnomeui-devel >= 2.24.0
-BuildRequires: libsoup-devel >= 2.4.0
+BuildRequires: libproxy-devel
+BuildRequires: libsoup-gnome-devel >= 2.30
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
 BuildRequires: pkgconfig
@@ -51,9 +50,6 @@ Czytnik kanałów informacyjnych RSS dla Evolution.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__intltoolize}
@@ -66,6 +62,7 @@ Czytnik kanałów informacyjnych RSS dla Evolution.
        %{__enable_disable xulrunner gecko} \
        %{__with xulrunner gecko libxul} \
        %{__enable_disable webkit}
+
 %{__make}
 
 %install
@@ -76,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 
 rm $RPM_BUILD_ROOT%{_libdir}/evolution/*/plugins/liborg-gnome-evolution-rss.la
 
-%find_lang %{name}
+%find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -92,10 +89,11 @@ 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.28.server
+#%{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.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/*.glade
+%{_datadir}/evolution/*/ui/*.ui
+#%{_datadir}/evolution/*/glade/*.glade
 %{_datadir}/evolution/*/images/*.png