Author: caleb Date: Mon Oct 11 12:21:24 2010 GMT Module: packages Tag: HEAD ---- Log message: - Up to 3.0.10 - Server subpackage renamed to display to match upstream - Removed Clutter dependencies, no longer used upstream - Build is now architecture dependent, display component is C instead of perl
---- Files affected: packages/lyricue: lyricue.spec (1.23 -> 1.24) ---- Diffs: ================================================================ Index: packages/lyricue/lyricue.spec diff -u packages/lyricue/lyricue.spec:1.23 packages/lyricue/lyricue.spec:1.24 --- packages/lyricue/lyricue.spec:1.23 Mon Jul 12 18:14:21 2010 +++ packages/lyricue/lyricue.spec Mon Oct 11 14:21:19 2010 @@ -4,33 +4,28 @@ Summary: GNU Lyric Display System, client interface Name: lyricue -Version: 2.3.0 -Release: 1 +Version: 3.0.10 +Release: 0.1 License: GPL Group: X11/Applications/Graphics Source0: http://www.lyricue.org/archive/%{name}_%{version}.tar.gz -# Source0-md5: 30fe4d6c32c8082addc2e50c12363425 +# Source0-md5: 8544bb12dddef9f2176926a752e6e9df URL: http://www.lyricue.org BuildRequires: gettext-devel BuildRequires: rpm-perlprov BuildRequires: sed >= 4.0 -Requires: %{name}-remote -Requires: %{name}-server Requires: mysql-client +Requires: %{name}-display +Requires: %{name}-remote Requires: perl-Gtk2 >= 1.220 Suggests: diatheke Suggests: mysql -Suggests: perl-Clutter -Suggests: perl-Clutter-GStreamer -Suggests: perl-DBD-mysql Suggests: perl-DBD-mysql Suggests: perl-DBD-SQLite -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) %description @@ -39,19 +34,17 @@ designed for use at live events such as church services, concerts and seminars. -%package server -Summary: GNU Lyric Display System, server interface +%package display +Summary: GNU Lyric Display System, display interface Group: X11/Applications/Graphics +Obsoletes: %{name}-server 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 +%description display Component to handle action display and projection of slides. %package remote @@ -59,22 +52,19 @@ Group: Libraries %description remote -Remote control CLI to control the projection server from any shell. +Remote control CLI to control the projection display from any shell. %prep %setup -q -# Fix perl shebang -%{__sed} -i -e '1s,^#!.*perl,#!%{__perl},' %{name} %{name}_server %{name}_remote +# Upstream package is missing ChangeLog file referenced in the Makefile +cp NEWS ChangeLog -# 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 +# Fix perl shebang +%{__sed} -i -e '1s,^#!.*perl,#!%{__perl},' src/%{name} src/%{name}_remote %build +%configure --prefix=%{_prefix} %{__make} %install @@ -82,8 +72,7 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -mv $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/access.conf{.example,} -rm -r $RPM_BUILD_ROOT%{_datadir}/doc +#rm -r $RPM_BUILD_ROOT%{_datadir}/doc %find_lang %{name} @@ -92,19 +81,18 @@ %files -f %{name}.lang %defattr(644,root,root,755) -%doc docs/* +%doc %{_docdir}/%{name} %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/*.conf %attr(755,root,root) %{_bindir}/%{name} -%attr(755,root,root) %{_bindir}/import_media %dir %{_datadir}/%{name} %{_datadir}/%{name}/* %{_desktopdir}/%{name}.desktop -%files server +%files display %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/%{name}_server -%{_desktopdir}/%{name}_server.desktop +%attr(755,root,root) %{_bindir}/%{name}_display +%{_desktopdir}/%{name}_display.desktop %files remote %defattr(644,root,root,755) @@ -116,6 +104,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.24 2010/10/11 12:21:19 caleb +- Up to 3.0.10 +- Server subpackage renamed to display to match upstream +- Removed Clutter dependencies, no longer used upstream +- Build is now architecture dependent, display component is C instead of perl + Revision 1.23 2010/07/12 16:14:21 caleb - Up to 2.3.0 - Removed patch applied upstream ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lyricue/lyricue.spec?r1=1.23&r2=1.24&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
