rpms/amarok/devel .cvsignore, 1.45, 1.46 amarok.spec, 1.150, 1.151 sources, 1.46, 1.47

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30246

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
* Mon May 18 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.96-2.20090518
- 20090518svn snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	11 May 2009 18:02:32 -0000	1.45
+++ .cvsignore	18 May 2009 16:06:46 -0000	1.46
@@ -1 +1,2 @@
 amarok-2.0.96.tar.bz2
+amarok-20090518svn.patch.gz


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- amarok.spec	11 May 2009 18:02:32 -0000	1.150
+++ amarok.spec	18 May 2009 16:06:46 -0000	1.151
@@ -1,8 +1,10 @@
 
+%define snap 20090518
+
 Name:    amarok
 Summary: Media player
 Version: 2.0.96
-Release: 1%{?dist}
+Release: 2.%{snap}%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -12,6 +14,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
+# svn diff \
+#  svn://anonsvn.kde.org/home/kde/tags/amarok/2.0.96/amarok/  \
+#  svn://anonsvn.kde.org/home/kde/trunk/extragear/multimedia/amarok/ 
+# and manually tweaked a bit to apply
+Patch100: amarok-%{snap}svn.patch.gz
+
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -63,6 +71,7 @@ Obsoletes: amarok-utilities < 2.0.96
 %prep
 %setup -q
 
+%patch100 -p0 -b .svn
 %patch50 -p1 -b .qtscript_not_required
 
 
@@ -145,6 +154,9 @@ fi
 
 
 %changelog
+* Mon May 18 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.96-2.20090518
+- 20090518svn snapshot
+
 * Mon May 11 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.96-1
 - amarok-2.9.96 (2.1 beta2)
 - -utilities -> -utils


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	11 May 2009 18:02:33 -0000	1.46
+++ sources	18 May 2009 16:06:46 -0000	1.47
@@ -1 +1,2 @@
 04239b2fec6e8dd8b2ea89db0779e196  amarok-2.0.96.tar.bz2
+55a55c44af648f6bf3f8db5b561c1c1b  amarok-20090518svn.patch.gz