[musique: 1/2] Updated to new upstream version 1.2.1

[Germán A. Racca]

commit b06418b172039d9b4465029eac0831b092e2b8bf
Author: Germán A. Racca <skytux at fedoraproject.org>
Date:   Fri Apr 12 16:42:47 2013 -0300

    Updated to new upstream version 1.2.1

 musique-1.2.1-fix-include.patch |   10 ++++++++++
 musique-1.2.1-qtsingleapp.patch |   12 ++++++++++++
 musique-fix-include.patch       |   27 ---------------------------
 musique-qtsingleapp.patch       |   12 ------------
 musique.spec                    |   14 +++++++++-----
 sources                         |    2 +-
 6 files changed, 32 insertions(+), 45 deletions(-)
---
diff --git a/musique-1.2.1-fix-include.patch b/musique-1.2.1-fix-include.patch
new file mode 100644
index 0000000..8e97858
--- /dev/null
+++ b/musique-1.2.1-fix-include.patch
@@ -0,0 +1,10 @@
+--- musique/src/lastfm.cpp.orig	2013-04-12 15:49:17.724120025 -0300
++++ musique/src/lastfm.cpp	2013-04-12 15:50:11.963881733 -0300
+@@ -1,6 +1,6 @@
+ #include "lastfm.h"
+ #include "datautils.h"
+-#include "../networkaccess.h"
++#include "networkaccess.h"
+ #include "lastfmlogindialog.h"
+ #include "mainwindow.h"
+ #include "constants.h"
diff --git a/musique-1.2.1-qtsingleapp.patch b/musique-1.2.1-qtsingleapp.patch
new file mode 100644
index 0000000..32eb1cb
--- /dev/null
+++ b/musique-1.2.1-qtsingleapp.patch
@@ -0,0 +1,12 @@
+--- musique/musique.pro.orig	2013-04-12 15:44:38.898076411 -0300
++++ musique/musique.pro	2013-04-12 15:46:16.926670867 -0300
+@@ -19,7 +19,8 @@
+ TARGET = $${APP_UNIX_NAME}
+ LIBS += -ltag
+ QT += network xml phonon sql
+-include(src/qtsingleapplication/qtsingleapplication.pri)
++#include(src/qtsingleapplication/qtsingleapplication.pri)
++CONFIG += qtsingleapplication
+ 
+ HEADERS += src/mainwindow.h \
+     src/aboutview.h \
diff --git a/musique.spec b/musique.spec
index 3915be1..689491e 100644
--- a/musique.spec
+++ b/musique.spec
@@ -1,5 +1,5 @@
 Name:           musique
-Version:        1.2
+Version:        1.2.1
 Release:        1%{?dist}
 Provides:       minitunes%{?_isa} = %{version}-%{release}
 Obsoletes:      minitunes < 1.0-7
@@ -11,8 +11,8 @@ Group:          Applications/Multimedia
 License:        GPLv3+ and LGPLv2+
 URL:            http://flavio.tordini.org/musique
 Source0:        http://flavio.tordini.org/files/%{name}/%{name}.tar.gz
-Patch0:         %{name}-qtsingleapp.patch
-Patch1:         %{name}-fix-include.patch
+Patch0:         %{name}-1.2.1-qtsingleapp.patch
+Patch1:         %{name}-1.2.1-fix-include.patch
 
 BuildRequires:  qt-devel
 BuildRequires:  taglib-devel
@@ -45,8 +45,8 @@ rm -rf src/qtsingleapplication
 # Use qtsingleapplication from Fedora
 %patch0 -p1 -b .orig
 
-# Fix include in src/lastfm.cpp and src/mediaview.cpp
-%patch1 -p0 -b .orig
+# Fix include in src/lastfm.cpp
+%patch1 -p1 -b .orig
 
 %build
 %{_qt4_qmake} PREFIX=%{_prefix}
@@ -92,6 +92,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %dir %{_datadir}/%{name}/locale
 
 %changelog
+* Fri Apr 12 2013 Germán A. Racca <skytux at fedoraproject.org> - 1.2.1-1
+- Updated to new upstream version
+- Patches re-created and re-named
+
 * Tue Oct 30 2012 Germán A. Racca <skytux at fedoraproject.org> - 1.2-1
 - Updated to new upstream version
 
diff --git a/sources b/sources
index c2d8a26..01020e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d9b2aa0ce30a9200e9868e552d46185  musique.tar.gz
+f070693e7e828a79a62cf40dcd883fba  musique.tar.gz