This commit was manufactured by cvs2git to create branch 'DEVEL'.

Sprout from master 2008-01-18 20:11:36 UTC Marcin Banasiak <marcin.banasiak@gmail.com> '- kill versioned soname in notification plugin'
Cherrypick from master 2009-08-07 00:31:20 UTC aredridel <aredridel@pld-linux.org> '- 1.6.0 merged from DEVEL':
    liferea-lua51.patch -> 1.2
Delete:
    liferea-desktop.patch
    liferea.spec

diff --git a/liferea-desktop.patch b/liferea-desktop.patch
deleted file mode 100644 (file)
index 932aced..0000000
--- a/liferea-desktop.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -urN liferea-1.4.4/liferea.desktop.in liferea-1.4.4.new/liferea.desktop.in
---- liferea-1.4.4/liferea.desktop.in   2007-09-26 20:59:22.000000000 +0200
-+++ liferea-1.4.4.new/liferea.desktop.in       2007-10-05 18:42:54.000000000 +0200
-@@ -7,5 +7,5 @@
- StartupNotify=true
- Terminal=false
- Type=Application
--Categories=Network;News;
-+Categories=GTK;Network;News;
- Version=0.9.4

diff --git a/liferea-lua51.patch b/liferea-lua51.patch
index c517092c724eaa39dc717a6cfeb05a7fdcbcf073..de2e5a7a00a352272c6d5ada32067fd1673fbb8c 100644 (file)
--- a/liferea-lua51.patch
+++ b/liferea-lua51.patch
@@ -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)

diff --git a/liferea.spec b/liferea.spec
deleted file mode 100644 (file)
index 7cfb71c..0000000
--- a/liferea.spec
+++ /dev/null
@@ -1,169 +0,0 @@
-# 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 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.4.10
-Release:       2
-License:       GPL v2
-Group:         X11/Applications/Networking
-Source0:       http://dl.sourceforge.net/liferea/%{name}-%{version}.tar.gz
-# Source0-md5: 7a60b58fc0044f72fb0d67f77eaffad5
-Patch0:                %{name}-desktop.patch
-Patch1:                %{name}-xulrunner.patch
-Patch2:                %{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
-%{?with_dbus:BuildRequires:    dbus-glib-devel >= 0.33}
-BuildRequires: gettext-devel
-BuildRequires: gnutls-devel
-BuildRequires: gtk+2-devel >= 2:2.8.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}
-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
-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.
-
-%description -l pl.UTF-8
-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
-
-%build
-%{__glib_gettextize}
-%{__intltoolize}
-%{__aclocal}
-%{__libtoolize}
-%{__autoheader}
-%{__automake}
-%{__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}
-%{__make}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.la
-
-%find_lang %{name}
-
-%post
-%gconf_schema_install liferea.schemas
-%update_icon_cache hicolor
-
-%preun
-%gconf_schema_uninstall liferea.schemas
-
-%postun
-%update_icon_cache hicolor
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f %{name}.lang
-%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/*
-%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/*.so.*.*.*
-%{_iconsdir}/hicolor/48x48/apps/liferea.png
-%{_mandir}/pl/man1/liferea.1*
-%{_sysconfdir}/gconf/schemas/liferea.schemas
-%{_datadir}/%{name}
-%{_desktopdir}/*.desktop
-%{_mandir}/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