Author: caleb Date: Mon May 24 13:47:05 2010 GMT Module: packages Tag: HEAD ---- Log message: - 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, - Added more Suggests, - Removed Gnome2-Canvas suggest - support removed upstream, - Removed doc dir from install to avoid unpackaged files error.
---- Files affected: packages/lyricue: lyricue-perlshebang.patch (1.3 -> 1.4) , lyricue.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: packages/lyricue/lyricue-perlshebang.patch diff -u packages/lyricue/lyricue-perlshebang.patch:1.3 packages/lyricue/lyricue-perlshebang.patch:1.4 --- packages/lyricue/lyricue-perlshebang.patch:1.3 Fri May 21 21:18:18 2010 +++ packages/lyricue/lyricue-perlshebang.patch Mon May 24 15:47:00 2010 @@ -1,24 +1,15 @@ --- lyricue 2010-05-21 20:02:48.000000000 +0300 +++ lyricue 2010-05-21 21:22:19.045391671 +0300 -@@ -1,4 +1,4 @@ +@@ -1,1 +1,1 @@ -#!/usr/bin/env perl +#!/usr/bin/perl - my $ID = q$Id$; - - #****** lyricue/pod --- lyricue_remote 2010-05-21 20:02:48.000000000 +0300 +++ lyricue_remote 2010-05-21 21:22:23.666223831 +0300 -@@ -1,4 +1,4 @@ +@@ -1,1 +1,1 @@ -#!/usr/bin/env perl +#!/usr/bin/perl - #****** lyricue_remote/setup - # NAME - # Setup section --- lyricue_server 2010-05-21 20:27:46.000000000 +0300 +++ lyricue_server 2010-05-21 21:22:29.429556938 +0300 -@@ -1,4 +1,4 @@ +@@ -1,1 +1,1 @@ -#!/usr/bin/env perl +#!/usr/bin/perl - my $ID = q$Id$; - - #****** lyricue_server/pod ================================================================ Index: packages/lyricue/lyricue.spec diff -u packages/lyricue/lyricue.spec:1.17 packages/lyricue/lyricue.spec:1.18 --- packages/lyricue/lyricue.spec:1.17 Mon May 24 10:17:51 2010 +++ packages/lyricue/lyricue.spec Mon May 24 15:47:00 2010 @@ -1,17 +1,19 @@ # $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 + Summary: GNU Lyric Display System, client interface Name: lyricue -Version: 2.0.0 -Release: 0.12 +Version: 2.2.1 +Release: 0.1 License: GPL Group: X11/Applications/Graphics -Source0: http://www.adebenham.com/debian/%{name}_%{version}.tar.gz -# Source0-md5: cd0fb1c9b0e6ccadc52cda2601b86be6 -Patch0: %{name}-perlshebang.patch +Source0: http://www.lyricue.org/archive/%{name}_%{version}.tar.gz +# Source0-md5: 6c61420f067e76429908e1b1b2ed0446 URL: http://www.lyricue.org BuildRequires: gettext-devel BuildRequires: rpm-perlprov @@ -22,8 +24,10 @@ Suggests: diatheke Suggests: mysql Suggests: perl-Clutter +Suggests: perl-Clutter-GStreamer +Suggests: perl-DBD-mysql Suggests: perl-DBD-mysql -Suggests: perl-Gnome2-Canvas +Suggests: perl-DBD-SQLite Suggests: perl-Gtk2-Spell Suggests: perl-Gtk2-TrayIcon Suggests: unoconv @@ -40,7 +44,9 @@ Summary: GNU Lyric Display System, server interface Group: X11/Applications/Graphics Suggests: perl-Clutter +Suggests: perl-Clutter-GStreamer Suggests: perl-DBD-mysql +Suggests: perl-DBD-SQLite Suggests: perl-Locale-gettext %description server @@ -55,10 +61,14 @@ %prep %setup -q -%patch0 -p0 -sed -e 's#po/es_ES#po/es#' -i Makefile -mv po/es{_ES,}.po +# Fix perl shebang +%{__sed} -i -e '1s,^#!.*perl,#!%{__perl},' %{name} %{name}_server %{name}_remote + +# Fix Spanish language code +%{__sed} -e 's#po/es_ES#po/es#' -i Makefile + +mv debian/po/es{_ES,}.po %build %{__make} @@ -69,6 +79,7 @@ DESTDIR=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/access.conf{.example,} +rm -r $RPM_BUILD_ROOT%{_datadir}/doc %find_lang %{name} @@ -101,6 +112,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +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, +- Added more Suggests, +- Removed Gnome2-Canvas suggest - support removed upstream, +- Removed doc dir from install to avoid unpackaged files error. + Revision 1.17 2010/05/24 08:17:51 caleb - Added suggests for perl packages used if present ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lyricue/lyricue-perlshebang.patch?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lyricue/lyricue.spec?r1=1.17&r2=1.18&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
