From 28c66b0d3d67b2c6f24f4018e514b692190f27e5 Mon Sep 17 00:00:00 2001
From: Karel Volný <kvolny@redhat.com>
Date: Aug 07 2019 14:45:13 +0000
Subject: new version 1.3.3 (#1674198)

see the upstream changelog at http://qmmp.ylsoftware.com/
adds appdata
dropped qmmp-plugins-freeworld conflict
cleaned up desktop file handling
define unversioned plugin dir
drop old musepack support (see bug #1014468; upstream commit r8015)

---

diff --git a/.gitignore b/.gitignore
index 098bf7a..3265ad8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,5 @@ qmmp-0.4.1.tar.bz2
 /qmmp-1.2.2.tar.bz2
 /qmmp-1.2.3.tar.bz2
 /qmmp-1.2.4.tar.bz2
+/qmmp-1.3.0.tar.bz2
+/qmmp-1.3.3.tar.bz2
diff --git a/qmmp.spec b/qmmp.spec
index b209534..f20832c 100644
--- a/qmmp.spec
+++ b/qmmp.spec
@@ -1,10 +1,8 @@
 Name:		qmmp
-Version:	1.2.4
-Release:	3%{?dist}
+Version:	1.3.3
+Release:	1%{?dist}
 Summary:	Qt-based multimedia player
 
-Conflicts:	qmmp-plugins-freeworld < 1.1.6
-
 License:	GPLv2+ and CC-BY-SAv4+
 URL:		http://qmmp.ylsoftware.com/
 Source:		http://qmmp.ylsoftware.com/files/%{name}-%{version}.tar.bz2
@@ -26,7 +24,7 @@ BuildRequires:	libcdio-paranoia-devel
 BuildRequires:	libcurl-devel
 BuildRequires:	libmad-devel
 BuildRequires:	libmodplug-devel
-BuildRequires:	libmpcdec-devel
+#BuildRequires:	libmpcdec-devel
 BuildRequires:	libogg-devel
 BuildRequires:	libprojectM-devel
 BuildRequires:	libshout-devel
@@ -46,6 +44,7 @@ BuildRequires:	wavpack-devel
 BuildRequires:	wildmidi-devel
 
 Recommends:	qmmp-plugin-pack
+# some external tools listed in
 # https://sourceforge.net/p/qmmp-dev/code/HEAD/tree/trunk/qmmp/src/plugins/General/converter/presets.conf
 Recommends:	vorbis-tools
 Recommends:	lame
@@ -105,18 +104,12 @@ QMMP is Qt-based audio player. This package contains its development files.
 	-D QMMP_DEFAULT_OUTPUT=pulse \
 	-D CMAKE_INSTALL_PREFIX=%{_prefix} \
 	-D LIB_DIR=%{_lib} \
+	-D PLUGIN_DIR=%{_lib}/%{name} \
 	./
 make %{?_smp_mflags} VERBOSE=1
 
 %install
 %make_install
-# Install desktop file
-desktop-file-install --delete-original \
-%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
-	--vendor fedora \
-%endif
-	--dir %{buildroot}%{_datadir}/applications \
-	%{buildroot}/%{_datadir}/applications/qmmp.desktop
 # filter out unsupported formats from MimeType
 sed -i -e "s#audio/x-ffmpeg-shorten;##" \
        -e "s#audio/x-ms-wma;##" \
@@ -131,10 +124,10 @@ sed -i -e "s#audio/x-ffmpeg-shorten;##" \
        -e "s#audio/x-aac;##" \
        -e "s#audio/m4a;##" \
        -e "s#audio/x-m4a;##" \
-    %{buildroot}/%{_datadir}/applications/%{name}_enqueue.desktop
-# new files since 0.3.0, using Vendor is deprecated, so just validate
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}_dir.desktop
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}_enqueue.desktop
+    %{buildroot}/%{_datadir}/applications/%{name}-enqueue.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-dir.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-enqueue.desktop
 
 %files
 %doc AUTHORS ChangeLog ChangeLog.rus README README.RUS
@@ -142,15 +135,12 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}_enqueue.desk
 %{_bindir}/qmmp
 %{_libdir}/qmmp
 %{_libdir}/libqmmp*.so.*
-%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
-%{_datadir}/applications/fedora-%{name}.desktop
-%else
 %{_datadir}/applications/%{name}.desktop
-%endif
-%{_datadir}/applications/%{name}_dir.desktop
-%{_datadir}/applications/%{name}_enqueue.desktop
+%{_datadir}/applications/%{name}-dir.desktop
+%{_datadir}/applications/%{name}-enqueue.desktop
 %{_datadir}/icons/hicolor/
 %{_datadir}/%{name}/
+%{_metainfodir}/%{name}.appdata.xml
 
 %files devel
 %{_includedir}/*
@@ -158,6 +148,16 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}_enqueue.desk
 %{_libdir}/libqmmp*.so
 
 %changelog
+* Wed Aug 07 2019 Karel Volný <kvolny@redhat.com> 1.3.3-1
+- new version 1.3.3 (#1674198)
+- see the upstream changelog at http://qmmp.ylsoftware.com/
+- adds appdata
+- dropped qmmp-plugins-freeworld conflict
+- cleaned up desktop file handling
+- define unversioned plugin dir
+# ^ I will NOT support parallel installs
+- drop old musepack support (see bug #1014468; upstream commit r8015)
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 2e37d58..16ec8e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qmmp-1.2.4.tar.bz2) = 086dec09700ffda8aec04c5b3c0f062cb0cde72c47902452751443fd54c8f563fc31d02f4fbf73cc0831d65aa32026c884477397d53a8e761227ab8c46be4874
+SHA512 (qmmp-1.3.3.tar.bz2) = 92deda33ed90d5e802258ae014452e5ce384c6ce0d437675b28ead8a838bcbbb2d0b4242b98b2a0f32cc922e7af69b72479fdf8a7946f1fe041a6803a6934c8c