rpms/amarok/devel .cvsignore, 1.28, 1.29 amarok.spec, 1.72, 1.73 sources, 1.28, 1.29

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20219

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
version 1.4.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	31 Oct 2006 11:01:45 -0000	1.28
+++ .cvsignore	5 Feb 2007 20:33:06 -0000	1.29
@@ -1 +1 @@
-amarok-1.4.4.tar.bz2
+amarok-1.4.5.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- amarok.spec	25 Jan 2007 19:12:30 -0000	1.72
+++ amarok.spec	5 Feb 2007 20:33:06 -0000	1.73
@@ -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 @@
 
 %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 @@
 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 @@
 %files visualisation
 %defattr(-,root,root)
 %{_bindir}/amarok_libvisual
-%{_bindir}/amarok_xmmswrapper2
 
 
 
 %changelog
+* Sat Feb 03 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.5-1
+- version 1.4.5
+- drop patch0 and patch1 (merged upstream)
+
 * Thu Jan 25 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.4-7
 - add patch to enable building with libgpod >= 0.4.2, thanks go to Todd Zullinger
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	31 Oct 2006 11:01:45 -0000	1.28
+++ sources	5 Feb 2007 20:33:06 -0000	1.29
@@ -1 +1 @@
-56a9aec42088c338b81252f8e0651781  amarok-1.4.4.tar.bz2
+1dac1cb5ac9c9cdabdab5f69b39e92c8  amarok-1.4.5.tar.bz2