- up to 0.18.6

- remove cdio patch (fixed upstream)

diff --git a/mpd-cdio.patch b/mpd-cdio.patch
deleted file mode 100644 (file)
index 066cac4..0000000
--- a/mpd-cdio.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- mpd-0.17.2/src/input/CdioParanoiaInputPlugin.cxx~  2012-09-30 12:22:57.000000000 +0200
-+++ mpd-0.17.2/src/input/CdioParanoiaInputPlugin.cxx   2013-02-03 22:28:42.169606736 +0100
-@@ -35,7 +35,12 @@
- #include <glib.h>
- #include <assert.h>
- 
-+#include <cdio/cdio.h> 
-+#if LIBCDIO_VERSION_NUM <= 83
- #include <cdio/paranoia.h>
-+#else
-+#include <cdio/paranoia/paranoia.h>
-+#endif
- #include <cdio/cd_types.h>
- 
- struct input_cdio_paranoia {

diff --git a/mpd.spec b/mpd.spec
index 0bb89595ff7e8610d300d96a80067e84e814e51e..48093bd658e43ca3a9a296d5d27ba015102a8a6e 100644 (file)
--- a/mpd.spec
+++ b/mpd.spec
@@ -10,18 +10,17 @@ Summary:    Music Player Daemon
 Summary(hu.UTF-8):     Music Player Daemon
 Summary(pl.UTF-8):     Music Player Daemon - demon odtwarzający muzykę
 Name:          mpd
-Version:       0.18.5
-Release:       2
+Version:       0.18.6
+Release:       1
 License:       GPL v2+
 Group:         Applications/Multimedia
 Source0:       http://www.musicpd.org/download/mpd/0.18/%{name}-%{version}.tar.xz
-# Source0-md5: 63bcf6ce338caa2ae2cd6dc8e9710d5c
+# Source0-md5: 85834ce4750eb20d7d8bfa2f85a52a63
 Source1:       %{name}.conf
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 Source4:       %{name}.tmpfiles
-Patch0:                %{name}-cdio.patch
-Patch1:                %{name}-mpcsv8.patch
+Patch0:                %{name}-mpcsv8.patch
 URL:           http://www.musicpd.org/
 BuildRequires: OpenAL-devel
 BuildRequires: adplug-devel
@@ -129,7 +128,6 @@ Dokumentacja do Music Player Daemon (MPD).
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__aclocal} -I m4