packages: lyricue/lyricue.spec - Added fix for deprecated Gtk2 syntax. Fixe...

[caleb]

Author: caleb                        Date: Tue May 25 09:05:55 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Added fix for deprecated Gtk2 syntax. Fixed in upstream cvs, remove on next release,
- Added suggests for totem (if available client uses totem-video-thumnailer and server use it for playback),
- Client package requires server because it embeds it as a preview,
- Suggests for Gtk2::Spell and Gtk2::Clutter, used if installed.

---- Files affected:
packages/lyricue:
   lyricue.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: packages/lyricue/lyricue.spec
diff -u packages/lyricue/lyricue.spec:1.18 packages/lyricue/lyricue.spec:1.19
--- packages/lyricue/lyricue.spec:1.18	Mon May 24 15:47:00 2010
+++ packages/lyricue/lyricue.spec	Tue May 25 11:05:50 2010
@@ -1,7 +1,5 @@
 # $Revision$, $Date$
 # TODO:
-# - Make sure server subpackage can run without the client
-# - Package missing dependencies (perl-Gtk2-Clutter and perl-Clutter-GStreamer)
 # - Add bconds for with[out] mysql and sqlite backend options
 
 %include    /usr/lib/rpm/macros.perl
@@ -9,7 +7,7 @@
 Summary:	GNU Lyric Display System, client interface
 Name:		lyricue
 Version:	2.2.1
-Release:	0.1
+Release:	0.2
 License:	GPL
 Group:		X11/Applications/Graphics
 Source0:	http://www.lyricue.org/archive/%{name}_%{version}.tar.gz
@@ -18,9 +16,10 @@
 BuildRequires:	gettext-devel
 BuildRequires:	rpm-perlprov
 BuildRequires:	sed >= 4.0
+Requires:	%{name}-remote
+Requires:	%{name}-server
 Requires:	mysql-client
-Suggests:	%{name}-remote
-Suggests:	%{name}-server
+Requires:	perl-Gtk2 >= 1.220
 Suggests:	diatheke
 Suggests:	mysql
 Suggests:	perl-Clutter
@@ -28,8 +27,10 @@
 Suggests:	perl-DBD-mysql
 Suggests:	perl-DBD-mysql
 Suggests:	perl-DBD-SQLite
-Suggests:	perl-Gtk2-Spell
+Suggests:	perl-Gtk2-Clutter
+Suggests:	perl-Gtk2-spell
 Suggests:	perl-Gtk2-TrayIcon
+Suggests:	totem
 Suggests:	unoconv
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -43,11 +44,14 @@
 %package server
 Summary:	GNU Lyric Display System, server interface
 Group:		X11/Applications/Graphics
+Requires:	perl-Gtk2 >= 1.220
 Suggests:	perl-Clutter
 Suggests:	perl-Clutter-GStreamer
 Suggests:	perl-DBD-mysql
 Suggests:	perl-DBD-SQLite
+Suggests:	perl-Gtk2-Clutter
 Suggests:	perl-Locale-gettext
+Suggests:	totem
 
 %description server
 Component to handle action display and projection of slides.
@@ -67,9 +71,11 @@
 
 # Fix Spanish language code
 %{__sed} -e 's#po/es_ES#po/es#' -i Makefile
-
 mv debian/po/es{_ES,}.po
 
+# Fix issue with use of deprecated method in Gtk2, fixed in cvs upstream
+%{__sed} -i -e 's!Gtk2::Gdk::Color->from_string!Gtk2::Gdk::Color->parse!' %{name}_server
+
 %build
 %{__make}
 
@@ -112,6 +118,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2010/05/25 09:05:50  caleb
+- Added fix for deprecated Gtk2 syntax. Fixed in upstream cvs, remove on next release,
+- Added suggests for totem (if available client uses totem-video-thumnailer and server use it for playback),
+- Client package requires server because it embeds it as a preview,
+- Suggests for Gtk2::Spell and Gtk2::Clutter, used if installed.
+
 Revision 1.18  2010/05/24 13:47:00  caleb
 - Up to 2.2.1 (talked upstream into archiving tarballs in addition to current debs),
 - Removed patch file in favor of more maintainable regex in %prep,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lyricue/lyricue.spec?r1=1.18&r2=1.19&f=u