[qmpdclient] version bump 1.2

[Julian Golderer]

commit afe6391f08522d7896eac8ce7d6da7dd99298b99
Author: Julian Golderer <j.golderer at novij.at>
Date:   Wed Nov 10 00:13:14 2010 +0100

    version bump 1.2

 .gitignore                |    1 +
 qmpdclient-link2X11.patch |   17 +++++++++--------
 qmpdclient.spec           |   22 +++++++++++-----------
 sources                   |    2 +-
 4 files changed, 22 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index da213b9..118cb59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 qmpdclient-1.1.3.tar.bz2
+/qmpdclient-1.2.tar.bz2
diff --git a/qmpdclient-link2X11.patch b/qmpdclient-link2X11.patch
index c99278d..d7ef1ef 100644
--- a/qmpdclient-link2X11.patch
+++ b/qmpdclient-link2X11.patch
@@ -1,10 +1,11 @@
---- CMakeLists.txt.orig	2010-05-10 11:36:02.000000000 +0200
-+++ CMakeLists.txt	2010-06-05 18:19:51.000000000 +0200
-@@ -1,6 +1,6 @@
- cmake_minimum_required(VERSION 2.6)
+--- CMakeLists.txt.orig	2010-11-09 23:19:52.879036321 +0100
++++ CMakeLists.txt	2010-11-09 23:32:04.465605116 +0100
+@@ -276,7 +276,7 @@
  
--find_package(Qt4 4.4.0 COMPONENTS QtCore QtGui QtNetwork QtXml QtXmlPatterns REQUIRED QtDBus)
-+find_package(Qt4 4.4.0 COMPONENTS QtCore QtGui QtNetwork QtXml QtXmlPatterns REQUIRED QtDBus X11)
+ add_executable(qmpdclient ${QMPDClient_srcs} ${QMPDClient_ppd_hdrs} ${QMPDClient_ppd_uis} ${QMPDClient_ppd_res} ${COMPILED_TRANSLATIONS})
  
- SET (QT_USE_QTNETWORK TRUE)
- SET (QT_USE_QTXMLPATTERNS TRUE)
+-target_link_libraries(qmpdclient ${QT_LIBRARIES})
++target_link_libraries(qmpdclient ${QT_LIBRARIES} X11)
+ 
+ install(TARGETS qmpdclient DESTINATION bin)
+ if(UNIX)
diff --git a/qmpdclient.spec b/qmpdclient.spec
index 3fe68f6..2ea2ff3 100644
--- a/qmpdclient.spec
+++ b/qmpdclient.spec
@@ -1,18 +1,17 @@
 Name:		qmpdclient
-Version:	1.1.3
-Release:	3%{?dist}
+Version:	1.2
+Release:	1%{?dist}
 Summary:	Qt4 based MPD client
 
 Group:		Applications/Multimedia
 License:	GPLv2+
 URL:		http://bitcheese.net/wiki/QMPDClient
-#Source0:	http://files.4-web.net/%{name}/%{name}-%{version}.tar.bz2
 Source0:	http://dump.bitcheese.net/files/%{name}-%{version}.tar.bz2
 Source1:	%{name}.desktop
 Patch0:		%{name}-link2X11.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:	qt4-devel
+BuildRequires:	qt4-devel qt4-webkit-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	cmake
 
@@ -31,7 +30,6 @@ Qt4 based MPD client which supports:
 
 %prep
 %setup -q -n %{name}
-#%setup -q -c %{name}-%{version}
 %patch0
 
 
@@ -46,18 +44,13 @@ make install DESTDIR=%{buildroot}
 
 # Add an icon for the menu system
 install -Dpm 644 icons/svg/%{name}.svg %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-install -Dpm 644 icons/%{name}64.png %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
-rm -f %{buildroot}/%{_datadir}/icons/%{name}64.png
+install -Dpm 644 icons/64x64/%{name}.png %{buildroot}/%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
 desktop-file-install					\
 	--dir %{buildroot}/%{_datadir}/applications	\
 	%{SOURCE1}
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
 %defattr(-,root,root,-)
 %dir %{_datadir}/QMPDClient
@@ -66,6 +59,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 
 %doc AUTHORS COPYING THANKSTO README Changelog
 
@@ -98,6 +94,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Nov 09 2010 Julian Golderer <j.golderer at novij.at> 1.2-1
+- Version Bump 1.2
+- Removed %%clean section
+
 * Sat Jun 05 2010 Julian Golderer <j.golderer at novij.at> 1.1.3-3
 - Fixed #599797 - ImplicitDSOLinking
 - Removed Category 'Music' from desktop file
diff --git a/sources b/sources
index c0177a4..7b43d2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56d6b67dfc0747de61c6c8988210f779  qmpdclient-1.1.3.tar.bz2
+0fab7d72ffdc1e85cb0502d6258f6b48  qmpdclient-1.2.tar.bz2