From 078160fd4e049d2c61dfa0ce2bc23a0a26c5b752 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <ville.skytta@iki.fi>
Date: Jan 29 2015 15:56:09 +0000
Subject: Ship COPYING as %license


- Clean up no longer needed backwards compatibilities

---

diff --git a/modplugtools-0.5.0-libmodplug087.patch b/modplugtools-0.5.0-libmodplug087.patch
deleted file mode 100644
index fa31304..0000000
--- a/modplugtools-0.5.0-libmodplug087.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up modplugtools-0.5.0/mp123/modplug123.c~ modplugtools-0.5.0/mp123/modplug123.c
---- modplugtools-0.5.0/mp123/modplug123.c~	2010-04-11 10:29:58.000000000 +0300
-+++ modplugtools-0.5.0/mp123/modplug123.c	2010-06-05 23:26:40.353051833 +0300
-@@ -324,8 +324,10 @@ for (song=1; song<argc; song++) {
-     settings.mChannels = 2;
-     settings.mBits = 16;
-     settings.mFrequency = 44100;
-+#if 0
-     settings.mStereoSeparation = 128;
-     settings.mMaxMixChannels = 256;
-+#endif
-     /* insert more setting changes here */
-     ModPlug_SetSettings(&settings);
- 
diff --git a/modplugtools-0.5.0-modplugplay-aoss.patch b/modplugtools-0.5.0-modplugplay-aoss.patch
deleted file mode 100644
index 6ec3d72..0000000
--- a/modplugtools-0.5.0-modplugplay-aoss.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up modplugtools-0.5.0/mpplay/Makefile.am~ modplugtools-0.5.0/mpplay/Makefile.am
---- modplugtools-0.5.0/mpplay/Makefile.am~	2010-04-11 11:23:52.000000000 +0300
-+++ modplugtools-0.5.0/mpplay/Makefile.am	2010-06-05 23:32:55.259052522 +0300
-@@ -4,5 +4,5 @@ INCLUDES = \
-         $(LIBMODPLUG_CFLAGS)
- 
- modplugplay_SOURCES = modplugplay.c
--modplugplay_LDADD = $(LIBMODPLUG_LIBS)
-+modplugplay_LDADD = $(LIBMODPLUG_LIBS) -laoss
- 
-diff -up modplugtools-0.5.0/mpplay/Makefile.in~ modplugtools-0.5.0/mpplay/Makefile.in
---- modplugtools-0.5.0/mpplay/Makefile.in~	2010-04-11 11:33:49.000000000 +0300
-+++ modplugtools-0.5.0/mpplay/Makefile.in	2010-06-05 23:33:10.520052700 +0300
-@@ -109,7 +109,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
- LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBMODPLUG_CFLAGS = @LIBMODPLUG_CFLAGS@
--LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
-+LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@ -laoss
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
diff --git a/modplugtools.spec b/modplugtools.spec
index e946dec..ea265ff 100644
--- a/modplugtools.spec
+++ b/modplugtools.spec
@@ -1,33 +1,16 @@
-%if 0%{?fedora} < 20
-%bcond_without oss
-%else
-%bcond_with oss
-%endif
-
 Name:           modplugtools
 Version:        0.5.3
 Release:        8%{?dist}
 Summary:        Command line mod music players
 
-Group:          Applications/Multimedia
 License:        GPLv3
 URL:            http://modplug-xmms.sourceforge.net/
 Source0:        http://download.sourceforge.net/modplug-xmms/%{name}-%{version}.tar.gz
-# Make modplug123 work with libmodplug < 0.8.8 (not for upstream)
-Patch0:         %{name}-0.5.0-libmodplug087.patch
-# Make modplugplay more likely to work out of the box (not for upstream)
-Patch1:         %{name}-0.5.0-modplugplay-aoss.patch
 # http://sf.net/tracker/?func=detail&aid=3019146&group_id=1275&atid=301275
 Patch2:         0001-Remove-unused-s-from-modplugplay-output-status-forma.patch
-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}.
@@ -35,43 +18,30 @@ Provides:       modplugplay = 1:%{version}-%{release}
 
 %prep
 %setup -q
-if ! pkg-config --atleast-version 0.8.8 libmodplug ; then
-%patch0 -p1
-fi
-%patch1 -p1
 %patch2 -p2
 
 
 %build
 %configure --disable-silent-rules
-make %{?_smp_mflags} \
-%if ! %{with oss}
-    -C mp123
-%endif
+make %{?_smp_mflags} -C mp123
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT \
-%if ! %{with oss}
-    -C mp123
-%endif
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%make_install -C mp123
 
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%license COPYING
+%doc AUTHORS ChangeLog NEWS README TODO
 %{_bindir}/modplug123
-%if %{with oss}
-%{_bindir}/modplugplay
-%endif
 
 
 %changelog
+* Thu Jan 29 2015 Ville Skyttä <ville.skytta@iki.fi> - 0.5.3-8
+- Ship COPYING as %%license
+- Clean up no longer needed backwards compatibilities
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild