rpms/amarokFS/devel amarokFS-0.5-theme_prev_button.patch, NONE, 1.1 amarokFS-0.5-start_amarok.patch, 1.1, 1.2 amarokFS.spec, 1.3, 1.4

[Francois Aucamp (faucamp)]

Author: faucamp

Update of /cvs/pkgs/rpms/amarokFS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17117

Modified Files:
	amarokFS-0.5-start_amarok.patch amarokFS.spec 
Added Files:
	amarokFS-0.5-theme_prev_button.patch 
Log Message:
- Changed kdelibs-devel build dependency to kdelibs3-devel (RHBZ #434093)
- Fixed animation of "prev" button in default theme
- Modified "start_amarok" patch to slow down dcop calls to amarok when starting (RHBZ #247712)


amarokFS-0.5-theme_prev_button.patch:

--- NEW FILE amarokFS-0.5-theme_prev_button.patch ---
diff -uNr amarokFS-0.5/theme.xml amarokFS-0.5-mod/theme.xml
--- amarokFS-0.5/theme.xml	2007-05-02 22:51:07.000000000 +0200
+++ amarokFS-0.5-mod/theme.xml	2008-02-22 15:16:04.000000000 +0200
@@ -2,7 +2,7 @@
 
 	<button>
 		<path>images/player_start.png</path>
-		<clicked>images/player_start.png</clicked>
+		<clicked>images/player_start2.png</clicked>
 		<command>prev()</command>
 		<x>920</x>
 		<y>100</y>

amarokFS-0.5-start_amarok.patch:

Index: amarokFS-0.5-start_amarok.patch
===================================================================
RCS file: /cvs/pkgs/rpms/amarokFS/devel/amarokFS-0.5-start_amarok.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amarokFS-0.5-start_amarok.patch	29 Mar 2007 10:47:50 -0000	1.1
+++ amarokFS-0.5-start_amarok.patch	22 Feb 2008 14:02:15 -0000	1.2
@@ -18,7 +18,7 @@
  	progressBar = (QProgressBar *) 0;
  	cdcover = (QLabel *) 0;
  	gradient = (QLabel *) 0;
-@@ -439,6 +440,20 @@
+@@ -439,6 +440,21 @@
  	mouseTimer->start( 5000, TRUE );
  	
  	setMouseTracking(TRUE);
@@ -31,7 +31,8 @@
 +		} else {
 +			while (!dcopClient->isApplicationRegistered("amarok"))
 +				qApp->processEvents();
-+				usleep(100);
++				usleep(200);
++                       usleep(200);
 +			startedAmarok = true;
 +		}
 +		delete amarokProc;


Index: amarokFS.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarokFS/devel/amarokFS.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- amarokFS.spec	19 Feb 2008 02:56:18 -0000	1.3
+++ amarokFS.spec	22 Feb 2008 14:02:15 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           amarokFS
 Version:        0.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple, nice looking full screen front-end for Amarok
 
 Group:          Applications/Multimedia
@@ -12,9 +12,10 @@
 Patch0:         amarokFS-0.5-fedora_paths.patch
 Patch1:         amarokFS-0.5-start_amarok.patch
 Patch2:         amarokFS-0.5-theme_howto.patch
+Patch3:         amarokFS-0.5-theme_prev_button.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs-devel desktop-file-utils ImageMagick
+BuildRequires:  kdelibs3-devel desktop-file-utils ImageMagick
 Requires:       amarok
 
 %description
@@ -30,11 +31,9 @@
 %prep
 %setup -q
 %patch0 -p1 -b .fedora_paths
-#%patch1 -p1 -b .config_dialog_layout
-#%patch2 -p1 -b .large_cover_images
 %patch1 -p1 -b .start_amarok
 %patch2 -p1 -b .theme_howto
-#%patch5 -p1 -b .theme_prev_button
+%patch3 -p1 -b .theme_prev_button
 sed -i 's/Application;//' amarokFS.desktop
 sed -i 's/\/usr\/share\/icons\/amarokFS.png/amarokFS/' amarokFS.desktop
 chmod a-x amarokFS.png
@@ -88,6 +87,11 @@
 
 
 %changelog
+* Fri Feb 22 2008 Francois Aucamp <faucamp at fedoraproject.org> - 0.5-3
+- Changed kdelibs-devel build dependency to kdelibs3-devel (RHBZ #434093)
+- Fixed animation of "prev" button in default theme
+- Modified "start_amarok" patch to slow down dcop calls to amarok when starting (RHBZ #247712)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5-2
 - Autorebuild for GCC 4.3