SPECS: normalize.spec - package normalize-{mp3, ogg} normally, not ...

[qboosh]

Author: qboosh                       Date: Tue Mar  4 22:55:48 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- package normalize-{mp3,ogg} normally, not just manual
- cleanup xmms module installation
- GPL v2+

---- Files affected:
SPECS:
   normalize.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: SPECS/normalize.spec
diff -u SPECS/normalize.spec:1.35 SPECS/normalize.spec:1.36
--- SPECS/normalize.spec:1.35	Fri Nov  2 12:40:26 2007
+++ SPECS/normalize.spec	Tue Mar  4 23:55:43 2008
@@ -2,13 +2,13 @@
 #
 # Conditional build:
 %bcond_without	xmms	# disable XMMS support
-
+#
 Summary:	A WAV and MP3 file volume adjuster
 Summary(pl.UTF-8):	Korektor poziomu głośności w plikach WAV i MP3
 Name:		normalize
 Version:	0.7.7
 Release:	1
-License:	GPL
+License:	GPL v2+
 Group:		Applications/Sound
 Source0:	http://savannah.nongnu.org/download/normalize/%{name}-%{version}.tar.bz2
 # Source0-md5:	1749b16fc7a08aa5d0cf9f76eeaa8436
@@ -17,13 +17,9 @@
 BuildRequires:	gettext-devel
 BuildRequires:	libmad-devel
 BuildRequires:	rpmbuild(macros) >= 1.125
-%{?with_xmms:BuildRequires:	xmms-devel}
+%{?with_xmms:BuildRequires:	xmms-devel >= 1.0.0}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%if %{with xmms}
-%define		_libdir		%{xmms_effect_plugindir}
-%endif
-
 %description
 Normalize is an overly complicated tool for adjusting the volume of
 wave files to a standard level.  This is useful for things like
@@ -51,7 +47,7 @@
 Summary:	RVA2 (Relative Volume Adjustment) ID3v2 frame support
 Summary(pl.UTF-8):	Obsługa ramek RVA2 znaczników ID3v2
 Group:		X11/Applications/Sound
-Requires:	xmms
+Requires:	xmms >= 1.0.0
 
 %description -n xmms-effect-rva
 Plugin for XMMS that supports volume adjustment frames (RVA2 ID3v2
@@ -82,7 +78,9 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv -f $RPM_BUILD_ROOT%{_bindir}/normalize-mp3 .
+%if %{with xmms}
+rm -f $RPM_BUILD_ROOT%{xmms_effect_plugindir}/*.la
+%endif
 
 %find_lang %{name}
 
@@ -91,14 +89,17 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README NEWS TODO normalize-mp3
+%doc README NEWS TODO
 %attr(755,root,root) %{_bindir}/normalize
-%{_mandir}/man1/*
+%attr(755,root,root) %{_bindir}/normalize-mp3
+%attr(755,root,root) %{_bindir}/normalize-ogg
+%{_mandir}/man1/normalize.1*
+%{_mandir}/man1/normalize-mp3.1*
 
 %if %{with xmms}
 %files -n xmms-effect-rva
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so
+%attr(755,root,root) %{xmms_effect_plugindir}/librva.so
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -107,6 +108,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2008-03-04 22:55:43  qboosh
+- package normalize-{mp3,ogg} normally, not just manual
+- cleanup xmms module installation
+- GPL v2+
+
 Revision 1.35  2007-11-02 11:40:26  twittner
 - up to 0.7.7
 - updated source & url
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/normalize.spec?r1=1.35&r2=1.36&f=u