SPECS (DEVEL): liferea.spec - updated to 1.5.6 - removed obsolete -no_versi...

Sat Nov 22 13:54:37 CET 2008

Author: megabajt                     Date: Sat Nov 22 12:54:37 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- updated to 1.5.6
- removed obsolete -no_versioned_soname.patch and -xulrunner.patch
- now webkit is the only supported backend:
  - removed gtkhtml, mozilla and webkit subpackages
  - added appropriate obsoletes
  - webkit backend has been moved to the main package (there is no need to
    separate backends)

---- Files affected:
SPECS:
   liferea.spec (1.164.2.2 -> 1.164.2.3) 

---- Diffs:

================================================================
Index: SPECS/liferea.spec
diff -u SPECS/liferea.spec:1.164.2.2 SPECS/liferea.spec:1.164.2.3

--- SPECS/liferea.spec:1.164.2.2	Mon Jul  7 11:45:44 2008
+++ SPECS/liferea.spec	Sat Nov 22 13:54:32 2008
@@ -1,66 +1,54 @@
 # $Revision$, $Date$
 # TODO:
 # - create subpackage -lua (?)
-# - webkit support
 #
 # Conditional build:
-%bcond_without	dbus		# without DBUS support
-%bcond_without	gtkhtml		# without GtkHTML
-%bcond_without	xulrunner	# without XULRunner backend
+%bcond_without	dbus		# without D-Bus support
 %bcond_without	lua		# without LUA scripting support
 %bcond_with	nm		# with NetworkManager support
 #
-%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.5.4
-Release:	0.1
+Version:	1.5.6
+Release:	1
 License:	GPL v2
 Group:		X11/Applications/Networking
 Source0:	http://dl.sourceforge.net/liferea/%{name}-%{version}.tar.gz
-# Source0-md5:	865b287195e4cc156b2cfe540716d856
+# Source0-md5:	6da515071c10d1daaedbf57526f5e4cf
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-xulrunner.patch
-Patch2:		%{name}-lua51.patch
-Patch3:		%{name}-no_versioned_soname.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
+BuildRequires:	avahi-glib-devel >= 0.6.0
+BuildRequires:	curl-devel >= 7.15.0
 %{?with_dbus:BuildRequires:	dbus-glib-devel >= 0.33}
 BuildRequires:	gettext-devel
-BuildRequires:	gnutls-devel
-BuildRequires:	gtk+2-devel >= 2:2.8.0
+BuildRequires:	glib2-devel >= 1:2.16.0
+BuildRequires:	gtk+2-devel >= 2:2.10.0
+BuildRequires:	gtk-webkit-devel >= 1.0
 BuildRequires:	intltool >= 0.35.5
 BuildRequires:	libglade2-devel >= 2.0.0
-%{?with_gtkhtml:BuildRequires:	libgtkhtml-devel >= 2.6.3}
 BuildRequires:	libnotify-devel >= 0.3.2
-BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 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
-%{?with_xulrunner:BuildRequires:	xulrunner-devel}
+BuildRequires:	sqlite3-devel >= 3.3.0
+BuildRequires:	xorg-lib-libSM-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
+Obsoletes:	liferea-mozilla
+Obsoletes:	liferea-webkit
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_noautoreqdep	libgtkembedmoz.so libxpcom.so
-# we have strict deps for it
-%define		_noautoreq	libxpcom.so
-
 %description
 Liferea is a GTK+ clone of FeedReader.
 
@@ -68,64 +56,32 @@
 Liferea jest klonem, napisanym za pomocą biblioteki GTK+, programu
 FeedReader.
 
-%package gtkhtml
-Summary:	GtkHTML module for Liferea
-Summary(pl.UTF-8):	Moduł GtkHTML dla Liferea
-Group:		X11/Applications/Networking
-Requires:	%{name} = %{version}-%{release}
-Provides:	%{name}-backend = %{version}-%{release}
-
-%description gtkhtml
-GtkHTML module for Liferea.
-
-%description gtkhtml -l pl.UTF-8
-Moduł GtkHTML dla Liferea.
-
-%package mozilla
-Summary:	Mozilla HTML browser module for Liferea
-Summary(pl.UTF-8):	Moduł przeglądarki HTML dla Liferea oparty na Mozilli
-Group:		X11/Applications/Networking
-Requires:	%{name} = %{version}-%{release}
-%requires_eq_to	xulrunner xulrunner-devel
-Provides:	%{name}-backend = %{version}-%{release}
-
-%description mozilla
-Mozilla HTML browser module for Liferea.
-
-%description mozilla -l pl.UTF-8
-Moduł przeglądarki HTML dla Liferea oparty na Mozilli.
-
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
 
 %build
 %{__glib_gettextize}
 %{__intltoolize}
 %{__aclocal}
 %{__libtoolize}
-%{__autoheader}
 %{__automake}
+%{__autoheader}
 %{__autoconf}
 %configure \
 	--disable-schemas-install \
 	%{!?with_dbus: --disable-dbus} \
-	%{!?with_gtkhtml: --disable-gtkhtml2} \
 	%{!?with_lua: --disable-lua} \
-	%{!?with_nm: --disable-nm} \
-	%{!?with_xulrunner: --disable-xulrunner}
+	%{!?with_nm: --disable-nm}
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+	DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.la
 
@@ -151,28 +107,18 @@
 %attr(755,root,root) %{_bindir}/liferea-add-feed
 %attr(755,root,root) %{_bindir}/liferea-bin
 %dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/liblihtmlw.so
 %attr(755,root,root) %{_libdir}/%{name}/liblinotiflibnotify.so
-%{_iconsdir}/hicolor/48x48/apps/liferea.png
+%if %{with lua}
+%attr(755,root,root) %{_libdir}/%{name}/libliscrlua.so
+%endif
+%{_iconsdir}/hicolor/*/*/*.png
+%{_iconsdir}/hicolor/*/*/*.svg
 %{_sysconfdir}/gconf/schemas/liferea.schemas
 %{_datadir}/%{name}
-%{_desktopdir}/*.desktop
+%{_desktopdir}/liferea.desktop
 %{_mandir}/man1/liferea.1*
 %{_mandir}/pl/man1/liferea.1*
-%if %{with lua}
-%attr(755,root,root) %{_libdir}/%{name}/libliscrlua.so
-%endif
-
-%if %{with gtkhtml}
-%files gtkhtml
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/liblihtmlg.so
-%endif
-
-%if %{with xulrunner}
-%files mozilla
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/liblihtmlx.so
-%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -180,6 +126,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.164.2.3  2008/11/22 12:54:32  megabajt
+- updated to 1.5.6
+- removed obsolete -no_versioned_soname.patch and -xulrunner.patch
+- now webkit is the only supported backend:
+  - removed gtkhtml, mozilla and webkit subpackages
+  - added appropriate obsoletes
+  - webkit backend has been moved to the main package (there is no need to
+    separate backends)
+
 Revision 1.164.2.2  2008/07/07 09:45:44  blues
 - 1.5.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/liferea.spec?r1=1.164.2.2&r2=1.164.2.3&f=u

