[modplugtools] Drop modplugplay for F-20+ (no more alsa-oss).

Ville Skyttä scop at fedoraproject.org
Wed Aug 21 13:46:00 UTC 2013


commit 30ffd43822b40526ffcaa766e35f0c41d2ce27af
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Aug 21 16:45:33 2013 +0300

    Drop modplugplay for F-20+ (no more alsa-oss).

 modplugtools.spec |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/modplugtools.spec b/modplugtools.spec
index 0b49699..0548f86 100644
--- a/modplugtools.spec
+++ b/modplugtools.spec
@@ -1,6 +1,12 @@
+%if 0%{?fedora} < 20
+%bcond_without oss
+%else
+%bcond_with oss
+%endif
+
 Name:           modplugtools
 Version:        0.5.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Command line mod music players
 
 Group:          Applications/Multimedia
@@ -17,9 +23,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libmodplug-devel
 BuildRequires:  libao-devel >= 0.8.0
+%if %{with oss}
 BuildRequires:  alsa-oss-devel
 Obsoletes:      modplugplay < 2.06
 Provides:       modplugplay = 1:%{version}-%{release}
+%endif
 
 %description
 %{summary}.
@@ -36,12 +44,18 @@ fi
 
 %build
 %configure --disable-silent-rules
-make %{?_smp_mflags}
+make %{?_smp_mflags} \
+%if ! %{with oss}
+    -C mp123
+%endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT \
+%if ! %{with oss}
+    -C mp123
+%endif
 
 
 %clean
@@ -52,10 +66,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/modplug123
+%if %{with oss}
 %{_bindir}/modplugplay
+%endif
 
 
 %changelog
+* Wed Aug 21 2013 Ville Skyttä <ville.skytta at iki.fi> - 0.5.3-6
+- Drop modplugplay for F-20+ (no more alsa-oss).
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list