From 59bdb415ce2223bf11d72281dea4a94b6e48f798 Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Jun 12 2016 14:58:00 +0000
Subject: New upstream version with fixes


---

diff --git a/.gitignore b/.gitignore
index 0ffcc33..6c8745f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 adplug-2.1.tar.bz2
 adplugdb-2006-07-07.tar.gz
+/adplug-2.2.1.tar.gz
+/adplug-2.2.1.tar.bz2
diff --git a/adplug.spec b/adplug.spec
index e809968..127bb87 100644
--- a/adplug.spec
+++ b/adplug.spec
@@ -3,34 +3,28 @@
 
 %define adplugdbver 2006-07-07
 Name:		adplug
-Version:	2.1
-Release:	21%{?dist}
+Version:	2.2.1
+Release:	1%{?dist}
 Summary:	A software library for AdLib (OPL2) emulation
 URL:		http://adplug.sourceforge.net/
 Group:		Applications/Multimedia
 Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:	http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz
-Patch0:		adplug-1.5.1-texinfo.patch
-# Lifted from the debian patchset
-# http://ftp.de.debian.org/debian/pool/main/a/adplug/adplug_2.0.1-6.diff.gz
-Patch1:		adplug-2.1-include.patch
-# fix build with GCC 6 (#1307307)
-Patch2:		adplug-2.1-gcc6.patch
 License:	LGPLv2+
 BuildRequires:	libbinio-devel >= 1.4
 BuildRequires:	pkgconfig
 BuildRequires:	texinfo
-# This is to resolve the endless disputes of the shared data for this 
+# This is to resolve the endless disputes of the shared data for this
 # package. Whenever _sharedstatedir contains something acceptable to
 # Fedora that can be used instead.
 %define shareddata %{_localstatedir}/lib
 
 %description
-AdPlug is a free software, cross-platform, hardware independent AdLib 
-sound player library, mainly written in C++ and released under the 
-LGPL. AdPlug plays sound data, originally created for the AdLib (OPL2) 
-audio board, directly from its original format on top of an OPL2 
-emulator or by using the real hardware. No OPL chip is required for 
+AdPlug is a free software, cross-platform, hardware independent AdLib
+sound player library, mainly written in C++ and released under the
+LGPL. AdPlug plays sound data, originally created for the AdLib (OPL2)
+audio board, directly from its original format on top of an OPL2
+emulator or by using the real hardware. No OPL chip is required for
 playback. It supports various audio formats from MS-DOS AdLib trackers.
 
 %package devel
@@ -47,16 +41,21 @@ This package contains development files for the AdPlug AdLib
 
 %prep
 %setup -q
-# This removes the version.texi dependency
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 tar xvfz %{SOURCE1}
 # Include these by different name
 mv %{adplugdbver}/README README.adplugdb
 mv %{adplugdbver}/NEWS NEWS.adplugdb
 
 %build
+rm -f ltmain.sh config.guess config.sub
+libtoolize --copy --force || fail
+rm -f aclocal.m4
+aclocal $ACLOCAL_FLAGS || fail
+rm -f depcomp install-sh missing
+touch config.rpath
+automake --add-missing --gnu || fail
+rm -f configure
+autoconf
 %configure --disable-static --sharedstatedir=%{shareddata} --disable-rpath
 make %{?_smp_mflags}
 
@@ -97,6 +96,12 @@ fi
 %{_infodir}/*.gz
 
 %changelog
+* Sun Jun 12 2016 Linus Walleij <triad@df.lth.se> - 2.2.1-1
+- New upstream version
+- Run libtoolize, aclocal, automake and autoconf on build to avoid
+  rpath problems
+- Builds without patches
+
 * Tue Mar 08 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 2.1-21
 - Fix FTBFS with GCC 6 (#1307307)
 
diff --git a/sources b/sources
index 318ee1a..3a8cf58 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-bc75cf9d1d2241e287e2eb80b84bd2cd  adplug-2.1.tar.bz2
+8f815fd5d254de0fe5df818df9d1d8af  adplug-2.2.1.tar.bz2
 40a1cc1222c7318172ee3740c4269df3  adplugdb-2006-07-07.tar.gz