From 5722783376b466a7d182ea8f591bda2ccbde3da0 Mon Sep 17 00:00:00 2001
From: Aurelien Bompard <abompard@fedoraproject.org>
Date: Feb 05 2007 20:33:06 +0000
Subject: version 1.4.5


---

diff --git a/.cvsignore b/.cvsignore
index d245af2..77748c7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amarok-1.4.4.tar.bz2
+amarok-1.4.5.tar.bz2
diff --git a/amarok.spec b/amarok.spec
index 09bc3ea..b7bcd43 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -3,16 +3,14 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.4.4
-Release:    7%{?dist}
+Version:    1.4.5
+Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
 Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
-Patch0:     amarok-1.4.4-lastfm+xine-lib-1.1.3.patch
-Patch1:     amarok-1.4.4-libgpod-0.4.2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -82,15 +80,11 @@ use any of xmms' visualisation plugins with Amarok.
 
 %prep
 %setup -q
-%patch0 -p1 -b .lastfm
-%patch1 -p1 -b .libgpod
 
 
 
 %build
 unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
-# work around an improper ${kdelibsuff}
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure \
      --disable-debug \
      --disable-rpath \
@@ -123,8 +117,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus
 desktop-file-install  --vendor "" \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
         --delete-original \
-        --add-category Application \
-        --add-category X-Fedora \
         $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
 #rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarokapp.desktop
@@ -237,11 +229,14 @@ rm -fr $RPM_BUILD_ROOT
 %files visualisation
 %defattr(-,root,root)
 %{_bindir}/amarok_libvisual
-%{_bindir}/amarok_xmmswrapper2
 
 
 
 %changelog
+* Sat Feb 03 2007 Aurelien Bompard <abompard@fedoraproject.org> 1.4.5-1
+- version 1.4.5
+- drop patch0 and patch1 (merged upstream)
+
 * Thu Jan 25 2007 Aurelien Bompard <abompard@fedoraproject.org> 1.4.4-7
 - add patch to enable building with libgpod >= 0.4.2, thanks go to Todd Zullinger
 
diff --git a/sources b/sources
index 73e03c2..2ec330d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56a9aec42088c338b81252f8e0651781  amarok-1.4.4.tar.bz2
+1dac1cb5ac9c9cdabdab5f69b39e92c8  amarok-1.4.5.tar.bz2