packages: lyricue/lyricue.spec - strict internal deps - no macro in obsolet...

[glen]

Author: glen                         Date: Mon Oct 11 15:24:50 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- strict internal deps
- no macro in obsoletes (adapterize)

---- Files affected:
packages/lyricue:
   lyricue.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: packages/lyricue/lyricue.spec
diff -u packages/lyricue/lyricue.spec:1.25 packages/lyricue/lyricue.spec:1.26
--- packages/lyricue/lyricue.spec:1.25	Mon Oct 11 14:37:57 2010
+++ packages/lyricue/lyricue.spec	Mon Oct 11 17:24:45 2010
@@ -1,7 +1,5 @@
 # $Revision$, $Date$
-
 %include    /usr/lib/rpm/macros.perl
-
 Summary:	GNU Lyric Display System, client interface
 Name:		lyricue
 Version:	3.0.10
@@ -14,14 +12,14 @@
 BuildRequires:	gettext-devel
 BuildRequires:	rpm-perlprov
 BuildRequires:	sed >= 4.0
-Requires:	%{name}-display
-Requires:	%{name}-remote
+Requires:	%{name}-display = %{version}-%{release}
+Requires:	%{name}-remote = %{version}-%{release}
 Requires:	mysql-client
 Requires:	perl-Gtk2 >= 1.220
 Suggests:	diatheke
 Suggests:	mysql
-Suggests:	perl-DBD-mysql
 Suggests:	perl-DBD-SQLite
+Suggests:	perl-DBD-mysql
 Suggests:	perl-Gtk2-Spell
 Suggests:	perl-Gtk2-TrayIcon
 Suggests:	totem
@@ -37,12 +35,12 @@
 %package display
 Summary:	GNU Lyric Display System, display interface
 Group:		X11/Applications/Graphics
-Obsoletes:	%{name}-server
 Requires:	perl-Gtk2 >= 1.220
-Suggests:	perl-DBD-mysql
 Suggests:	perl-DBD-SQLite
+Suggests:	perl-DBD-mysql
 Suggests:	perl-Locale-gettext
 Suggests:	totem
+Obsoletes:	lyricue-server
 
 %description display
 Component to handle action display and projection of slides.
@@ -58,13 +56,15 @@
 %setup -q
 
 # Upstream package is missing ChangeLog file referenced in the Makefile
-cp NEWS ChangeLog
+cp -a NEWS ChangeLog
 
 # Fix perl shebang
 %{__sed} -i -e '1s,^#!.*perl,#!%{__perl},' src/%{name} src/%{name}_remote
 
 %build
-%configure --prefix=%{_prefix}
+%configure \
+	--prefix=%{_prefix}
+
 %{__make}
 
 %install
@@ -102,6 +102,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2010/10/11 15:24:45  glen
+- strict internal deps
+- no macro in obsoletes (adapterize)
+
 Revision 1.25  2010/10/11 12:37:57  caleb
 - Release 1, STBR
 
================================================================

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