packages: liferea/liferea-lua51.patch, liferea/liferea.spec - 1.6.0 merged ...
aredridel
aredridel at pld-linux.org
Fri Aug 7 02:31:28 CEST 2009
Author: aredridel Date: Fri Aug 7 00:31:28 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- 1.6.0 merged from DEVEL
---- Files affected:
packages/liferea:
liferea-lua51.patch (1.1 -> 1.2) , liferea.spec (1.196 -> 1.197)
---- Diffs:
================================================================
Index: packages/liferea/liferea-lua51.patch
diff -u packages/liferea/liferea-lua51.patch:1.1 packages/liferea/liferea-lua51.patch:1.2
--- packages/liferea/liferea-lua51.patch:1.1 Sat Mar 24 21:36:13 2007
+++ packages/liferea/liferea-lua51.patch Fri Aug 7 02:31:20 2009
@@ -1,11 +1,12 @@
---- liferea-1.2.8/configure.ac.orig 2007-03-24 18:58:40.000000000 +0000
-+++ liferea-1.2.8/configure.ac 2007-03-24 19:00:44.000000000 +0000
-@@ -139,7 +139,7 @@
- dnl Lua 5.1 does include a lua.pc file, so it shouldn't be distribution specific
- dnl However, the presence of lua.pc is certainly not a good indicator of lua version...
- PKG_CHECK_MODULES([LUA50], [lua50 lualib50] ,has_lua50=yes,has_lua50=no)
-- PKG_CHECK_MODULES([LUA51], [lua] ,has_lua51=yes,has_lua51=no)
-+ PKG_CHECK_MODULES([LUA51], [lua51] ,has_lua51=yes,has_lua51=no)
+diff -urN liferea-1.6.0-rc6/configure.ac liferea-1.6.0-rc6.new/configure.ac
+--- liferea-1.6.0-rc6/configure.ac 2009-06-22 19:31:47.000000000 +0200
++++ liferea-1.6.0-rc6.new/configure.ac 2009-06-30 10:25:41.631646126 +0200
+@@ -92,7 +92,7 @@
+
+ if test "x$enable_lua" = "xyes"; then
+ PKG_CHECK_MODULES([LUA], [lua >= 5.1],, [AC_MSG_NOTICE([No lua.pc >= 5.1 present, is there a lua5.1.pc?])
+- PKG_CHECK_MODULES([LUA], [lua5.1],,[enable_lua=no])])
++ PKG_CHECK_MODULES([LUA], [lua51],,[enable_lua=no])])
- if test "x$has_lua51" = "xyes" ; then
- LUA_CFLAGS="$LUA51_CFLAGS"
+ AC_SUBST(LUA_CFLAGS)
+ AC_SUBST(LUA_LIBS)
================================================================
Index: packages/liferea/liferea.spec
diff -u packages/liferea/liferea.spec:1.196 packages/liferea/liferea.spec:1.197
--- packages/liferea/liferea.spec:1.196 Wed Aug 5 18:11:02 2009
+++ packages/liferea/liferea.spec Fri Aug 7 02:31:20 2009
@@ -3,66 +3,51 @@
# - create subpackage -lua (?)
#
# 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
-%bcond_without webkit # without WebKit backend
+%bcond_without 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.4.28
-Release: 6
+Version: 1.6.0
+Release: 1
License: GPL v2
Group: X11/Applications/Networking
Source0: http://dl.sourceforge.net/liferea/%{name}-%{version}.tar.gz
-# Source0-md5: 411bd9e56a648056cdce96dbea104c3e
+# Source0-md5: 7c532101d3c9cfd71b76d3a8a82622fa
Patch0: %{name}-desktop.patch
-Patch1: %{name}-xulrunner.patch
-Patch2: %{name}-lua51.patch
-Patch3: %{name}-ac.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: automake >= 1:1.6
+BuildRequires: avahi-glib-devel >= 0.6.0
%{?with_dbus:BuildRequires: dbus-glib-devel >= 0.33}
BuildRequires: gettext-devel
-BuildRequires: gnutls-devel
-BuildRequires: gtk+2-devel >= 2:2.8.0
-%{?with_webkit:BuildRequires: gtk-webkit-devel}
+BuildRequires: gtk+2-devel >= 2:2.16.0
+BuildRequires: gtk-webkit-devel >= 1.1.7
BuildRequires: intltool >= 0.35.5
-BuildRequires: libglade2-devel >= 2.0.0
-%{?with_gtkhtml:BuildRequires: libgtkhtml-devel >= 2.6.3}
+BuildRequires: libglade2-devel >= 1:2.0.0
BuildRequires: libnotify-devel >= 0.3.2
-BuildRequires: libstdc++-devel
+BuildRequires: libsoup-devel >= 2.26.1
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: sed >= 4.0
-BuildRequires: sqlite3-devel
-%{?with_xulrunner:BuildRequires: xulrunner-devel >= 1.9-5}
+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: %{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.
@@ -70,77 +55,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.
-
-%package webkit
-Summary: WebKit module for Liferea
-Summary(pl.UTF-8): Moduł WebKit dla Liferea
-Group: X11/Applications/Networking
-Requires: %{name} = %{version}-%{release}
-Provides: %{name}-backend = %{version}-%{release}
-
-%description webkit
-WebKit module for Liferea.
-
-%description webkit -l pl.UTF-8
-Moduł WebKit dla Liferea.
-
%prep
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
%{__glib_gettextize}
%{__intltoolize}
%{__aclocal} -I m4
%{__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-gecko} \
- %{!?with_webkit: --disable-webkit}
+ %{!?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
@@ -164,30 +104,18 @@
%doc AUTHORS ChangeLog NEWS README
%attr(755,root,root) %{_bindir}/liferea
%attr(755,root,root) %{_bindir}/liferea-add-feed
-%attr(755,root,root) %{_bindir}/liferea-bin
%dir %{_libdir}/%{name}
%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
%if %{with webkit}
%files webkit
@@ -201,106 +129,33 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.196 2009/08/05 16:11:02 arekm
-- release 6
-
-Revision 1.195 2009/07/19 15:06:49 arekm
-- release 5
-
-Revision 1.194 2009/07/04 09:10:59 megabajt
-- release 4
-
-Revision 1.193 2009/06/18 14:30:02 hawk
-- release 3
-
-Revision 1.192 2009/05/06 20:34:20 megabajt
-- release 2
-
-Revision 1.191 2009/04/24 12:56:46 megabajt
-- updated to 1.4.28
-
-Revision 1.190 2009/03/20 15:30:36 megabajt
-- updated to 1.4.27
-
-Revision 1.189 2009/03/05 21:40:09 megabajt
-- updated to 1.4.26
-
-Revision 1.188 2009/02/20 13:26:39 adamg
-- updated ro 1.4.25
-
-Revision 1.187 2009/02/08 17:50:41 megabajt
-- updated to 1.4.24
-
-Revision 1.186 2009/01/12 20:13:47 arekm
-- release 2
-
-Revision 1.185 2008/12/23 21:54:33 megabajt
-- updated to 1.4.23
-
-Revision 1.184 2008/11/22 12:01:40 megabajt
-- updated to 1.4.22d
-- added -ac.patch
-
-Revision 1.183 2008/11/13 17:58:45 arekm
-- release 3
-
-Revision 1.182 2008/10/14 16:18:48 megabajt
-- release 2
-
-Revision 1.181 2008/10/06 14:45:23 megabajt
-- updated to 1.4.20
-
-Revision 1.180 2008/09/30 10:26:20 hawk
-- release 2
-
-Revision 1.179 2008/09/05 19:59:51 megabajt
-- updated to 1.4.19
-
-Revision 1.178 2008/07/27 21:14:17 megabajt
-- updated to 1.4.18
-
-Revision 1.177 2008/07/26 16:06:44 megabajt
-- release 2
-
-Revision 1.176 2008/07/22 20:19:32 megabajt
-- updated to 1.4.17
-
-Revision 1.175 2008/07/10 11:43:12 blues
-- rel.4
-
-Revision 1.174 2008/07/08 21:26:26 blues
-- rel.3
-
-Revision 1.173 2008/07/07 18:35:06 megabajt
-- updated -xulrunner.patch. Now it's ready for xulrunner 1.9
-- release 2
-
-Revision 1.172 2008/07/03 08:38:33 blues
-- 1.4.16b
-
-Revision 1.171 2008/06/11 11:18:42 megabajt
-- updated to 1.4.16
-- added webkit bcond and subpackage
-
-Revision 1.170 2008-04-26 22:18:06 megabajt
-- fix locale names cz => cs
-- release 3
+Revision 1.197 2009/08/07 00:31:20 aredridel
+- 1.6.0 merged from DEVEL
-Revision 1.169 2008-04-26 21:42:54 megabajt
-- release 2
+Revision 1.164.2.6 2009/08/07 00:29:10 aredridel
+- 1.6.0
-Revision 1.168 2008-04-26 18:13:23 megabajt
-- updated to 1.4.15
-- removed -no_versioned_soname.patch (applied upstream)
+Revision 1.164.2.5 2009/06/30 08:34:53 megabajt
+- updated to 1.6.0-rc6
-Revision 1.167 2008-04-23 07:49:06 hawk
-- release 3
+Revision 1.164.2.4 2009/03/30 21:07:39 megabajt
+- updated to 1.5.15
+- enabled nm bcond by default
+
+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.166 2008-03-27 21:07:42 hawk
-- release 2 (xulrunner 1.8.1.13)
+Revision 1.164.2.2 2008/07/07 09:45:44 blues
+- 1.5.4
-Revision 1.165 2008-03-10 07:39:44 aredridel
-- revert to 1.4.13 after branching to DEVEL
+Revision 1.164.2.1 2008/04/18 06:24:45 sls
+- ver. 1.5.1
Revision 1.164 2008-03-10 06:59:08 aredridel
- 1.5.0b
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/liferea/liferea-lua51.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/liferea/liferea.spec?r1=1.196&r2=1.197&f=u
More information about the pld-cvs-commit
mailing list