- added new macros [BR: rpmbuild(macros) >= 1.125]

- cosmetics/sorting/simplifications/more (B)Rs and so on
- rel. ++

Changed files:
    xmp.spec -> 1.15

diff --git a/xmp.spec b/xmp.spec
index dbfd093c1f43d8916f40b0d94c61e2f70c3fc9c7..706b010a03d6e13e9c8216623fc14d094f8bdae3 100644 (file)
--- a/xmp.spec
+++ b/xmp.spec
@@ -11,7 +11,7 @@ Summary(pl):  Rozszerzony odtwarzacz modu
 Name:          xmp
 Version:       2.0.5
 %define        pver    pre3
-Release:       0.%{pver}.1
+Release:       0.%{pver}.2
 License:       GPL%{?_with_nonfree: with non-commercial additions}
 Group:         Applications/Sound
 Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}%{pver}.tar.bz2
@@ -27,13 +27,10 @@ BuildRequires:      autoconf
 BuildRequires: automake
 %{!?_without_esd:BuildRequires:        esound-devel}
 %{!?_without_nas:BuildRequires:        nas-devel}
+%{!?_without_xmms:BuildRequires:       rpmbuild(macros) >= 1.125}
 %{!?_without_xmms:BuildRequires:       xmms-devel}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%if 0%{!?_without_xmms:1}
-%define                xmmsplugindir   %(xmms-config --input-plugin-dir)
-%endif
-
 %description
 xmp is a multi-format module player for UNIX. In machines with GUS or
 AWE cards xmp takes advantage of the OSS sequencer to play modules
@@ -103,6 +100,7 @@ Summary:    XMMS plugin that uses XMP library to play music modules
 Summary(pl):   Wtyczka XMMS odtwarzaj±ca modu³y d¼wiêkowe z u¿yciem XMP
 Group:         X11/Applications/Sound
 Requires:      %{name}-%{version}
+Requires:      xmms
 
 %description -n xmms-input-xmp
 XMMS plugin that uses XMP library to play music modules.
@@ -185,5 +183,5 @@ rm -rf $RPM_BUILD_ROOT
 %if 0%{!?_without_xmms:1}
 %files -n xmms-input-xmp
 %defattr(644,root,root,755)
-%attr(755,root,root) %{xmmsplugindir}/*.so
+%attr(755,root,root) %{xmms_input_plugindir}/*.so
 %endif