X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=liferea.spec;h=54a4530fb3fd5255c98991c9a0cbf4ea7324bcc2;hb=9c9cdc4a38af45b1176b273d019eae8d393c9c92;hp=9f52a931650f5232fb4a7a8e114e0c38fc98b0ae;hpb=17a8db3af333ed16e7ab95d8f2e1cfdc2bcf3183;p=packages%2Fliferea.git

diff --git a/liferea.spec b/liferea.spec
index 9f52a93..54a4530 100644
--- a/liferea.spec
+++ b/liferea.spec
@@ -1,47 +1,42 @@
-# TODO:
-# - create subpackage -lua (?)
-#
-# Conditional build:
-%bcond_without	dbus		# without D-Bus support
-%bcond_without	lua		# without LUA scripting support
-%bcond_without	nm		# with NetworkManager support
-#
 Summary:	A RSS feed reader
 Summary(pl.UTF-8):	Program do pobierania informacji w formacie RSS
 Name:		liferea
-Version:	1.6.2
+Version:	1.8.0
 Release:	1
-License:	GPL v2
+License:	GPL v2+
 Group:		X11/Applications/Networking
-Source0:	http://dl.sourceforge.net/liferea/%{name}-%{version}.tar.gz
-# Source0-md5:	dc1de9a080be73eecf53a8f551d7ad52
+Source0:	http://downloads.sourceforge.net/liferea/%{name}-%{version}.tar.gz
+# Source0-md5:	6313e3049b586be110c9402900609fe0
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-lua51.patch
 URL:		http://liferea.sourceforge.net/
 BuildRequires:	GConf2-devel >= 2.10.0
-%{?with_nm:BuildRequires:	NetworkManager-devel}
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.6
 BuildRequires:	avahi-glib-devel >= 0.6.0
-%{?with_dbus:BuildRequires:	dbus-glib-devel >= 0.33}
+BuildRequires:	geoclue-devel
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 2:2.16.0
-BuildRequires:	gtk-webkit-devel >= 1.1.7
-BuildRequires:	intltool >= 0.35.5
+BuildRequires:	glib2-devel >= 1:2.26.0
+BuildRequires:	gstreamer-devel >= 0.10
+BuildRequires:	gtk+2-devel >= 2:2.18.0
+BuildRequires:	gtk-webkit-devel >= 1.2.2
+BuildRequires:	intltool >= 0.40.0
+BuildRequires:	json-glib-devel
 BuildRequires:	libglade2-devel >= 1:2.0.0
-BuildRequires:	libnotify-devel >= 0.3.2
-BuildRequires:	libsoup-devel >= 2.26.1
+BuildRequires:	libnotify-devel >= 0.7.0
+BuildRequires:	libsoup-devel >= 2.28.2
 BuildRequires:	libtool
+BuildRequires:	libunique-devel
 BuildRequires:	libxml2-devel >= 1:2.6.27
 BuildRequires:	libxslt-devel >= 1.1.19
-%{?with_lua:BuildRequires:	lua51-devel}
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	sqlite3-devel >= 3.6.10
 BuildRequires:	xorg-lib-libSM-devel
-Requires(post,postun):	gtk+2
-Requires(post,postun):	hicolor-icon-theme
 Requires(post,preun):	GConf2
+Requires(post,postun):	gtk-update-icon-cache
+Requires(post,postun):	hicolor-icon-theme
+Requires:	glib2 >= 1:2.26.0
+Requires:	gtk+2 >= 2:2.18.0
 Obsoletes:	liferea-gtkhtml
 Obsoletes:	liferea-mozilla
 Obsoletes:	liferea-webkit
@@ -57,7 +52,6 @@ FeedReader.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__glib_gettextize}
@@ -69,9 +63,7 @@ FeedReader.
 %{__autoconf}
 %configure \
 	--disable-schemas-install \
-	%{!?with_dbus: --disable-dbus} \
-	%{!?with_lua: --disable-lua} \
-	%{!?with_nm: --disable-nm}
+	--disable-silent-rules
 
 %{__make}
 
@@ -81,8 +73,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.la
-
 %find_lang %{name}
 
 %post
@@ -100,14 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/liferea
 %attr(755,root,root) %{_bindir}/liferea-add-feed
-%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/liblinotiflibnotify.so
-%if %{with lua}
-%attr(755,root,root) %{_libdir}/%{name}/libliscrlua.so
-%endif
 %{_iconsdir}/hicolor/*/*/*.png
 %{_iconsdir}/hicolor/*/*/*.svg
 %{_sysconfdir}/gconf/schemas/liferea.schemas