rpms/amarokFS/FC-6 amarokFS-0.5-fedora_paths.patch, NONE, 1.1 amarokFS-0.5-start_amarok.patch, NONE, 1.1 amarokFS-0.5-theme_howto.patch, NONE, 1.1 amarokFS.spec, 1.1, 1.2 sources, 1.2, 1.3 amarokFS-0.4.2-config_dialog_layout.patch, 1.1, NONE amarokFS-0.4.2-fedora_paths.patch, 1.1, NONE amarokFS-0.4.2-large_cover_images.patch, 1.1, NONE amarokFS-0.4.2-start_amarok.patch, 1.1, NONE amarokFS-0.4.2-theme_howto.patch, 1.1, NONE amarokFS-0.4.2-theme_prev_button.patch, 1.1, NONE

[Francois Aucamp (faucamp)]

Author: faucamp

Update of /cvs/extras/rpms/amarokFS/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2501

Modified Files:
	amarokFS.spec sources 
Added Files:
	amarokFS-0.5-fedora_paths.patch 
	amarokFS-0.5-start_amarok.patch amarokFS-0.5-theme_howto.patch 
Removed Files:
	amarokFS-0.4.2-config_dialog_layout.patch 
	amarokFS-0.4.2-fedora_paths.patch 
	amarokFS-0.4.2-large_cover_images.patch 
	amarokFS-0.4.2-start_amarok.patch 
	amarokFS-0.4.2-theme_howto.patch 
	amarokFS-0.4.2-theme_prev_button.patch 
Log Message:
- Update to version 0.5
- Removed "large_cover_images" patch; included upstream
- Removed "config_dialog_layout" patch; included upstream
- Updated "fedora_paths" patch
- Updated "start_amarok" patch
- Updated "theme_howto" patch
- Updated amarok integration script


amarokFS-0.5-fedora_paths.patch:

--- NEW FILE amarokFS-0.5-fedora_paths.patch ---
diff -uNr amarokFS-0.5/amarokFS-xml.pro amarokFS-0.5-mod/amarokFS-xml.pro
--- amarokFS-0.5/amarokFS-xml.pro	2007-03-19 14:17:58.000000000 +0200
+++ amarokFS-0.5-mod/amarokFS-xml.pro	2007-03-29 10:11:52.000000000 +0200
@@ -4,11 +4,7 @@
 CONFIG		+= qt warn_on release
 
 INCLUDEPATH += /usr/include/kde
-INCLUDEPATH += /usr/local/include/kde
 INCLUDEPATH += /usr/include
-INCLUDEPATH += /opt/kde3/include 
-INCLUDEPATH += /opt/kde/include
-INCLUDEPATH += /usr/kde/3.5/include
 		
 				
 HEADERS	= amfs-xml.h \
@@ -25,11 +21,7 @@
 	label-pixmap.cpp
 
 LIBS += -lkdecore
-LIBS += -L/opt/kde3/lib
-LIBS += -L/usr/local/kde3/lib
-LIBS += -L/usr/lib/qt3
-LIBS += -L/opt/kde/lib
-LIBS += -L/usr/kde/3.5/lib
+LIBS += -L/usr/lib/kde3
 LIBS += -lkio
 		
 images.path = /usr/share/amarokFS/images
@@ -38,23 +30,16 @@
 defaultTheme.path = /usr/share/amarokFS
 defaultTheme.files = theme.xml
 		
-target.path = /usr/local/bin
+target.path = /usr/bin
 		
 icon.files = amarokFS.png
-icon.path = /usr/share/icons/
+icon.path = /usr/share/icons/hicolor/128x128/apps
 		
 desktop.files = amarokFS.desktop
 desktop.path = /usr/share/applications/
 		
-docs.files = README
-docs.files += theme-howto.txt
-docs.path = /usr/share/doc/amarokFS
-
-
 INSTALLS += target
 INSTALLS += images
-INSTALLS += desktop
 INSTALLS += icon
 INSTALLS += defaultTheme
-INSTALLS += docs
 		
diff -uNr amarokFS-0.5/amfs-xml.cpp amarokFS-0.5-mod/amfs-xml.cpp
--- amarokFS-0.5/amfs-xml.cpp	2007-03-19 14:35:38.000000000 +0200
+++ amarokFS-0.5-mod/amfs-xml.cpp	2007-03-29 10:13:36.000000000 +0200
@@ -120,7 +120,7 @@
 
 	contextMenu->insertSeparator();
 	aboutAct = new QAction(tr("&About"), 0, this);
-	aboutAct->setIconSet(QIconSet(QPixmap("/usr/share/icons/amarokFS.png")));
+	aboutAct->setIconSet(QIconSet(QPixmap("/usr/share/icons/hicolor/128x128/apps/amarokFS.png")));
 	aboutAct->setStatusTip(tr("Show About Dialog."));
 	connect(aboutAct, SIGNAL(activated()), this, SLOT(launchAbout()));
 	aboutAct->addTo(contextMenu);

amarokFS-0.5-start_amarok.patch:

--- NEW FILE amarokFS-0.5-start_amarok.patch ---
diff -uNr amarokFS-0.5/amfs-xml.cpp amarokFS-0.5-mod/amfs-xml.cpp
--- amarokFS-0.5/amfs-xml.cpp	2007-03-19 14:35:38.000000000 +0200
+++ amarokFS-0.5-mod/amfs-xml.cpp	2007-03-29 10:26:05.000000000 +0200
@@ -16,6 +16,7 @@
 #include <qmessagebox.h>
 #include <qerrormessage.h>
 #include <qregexp.h>
+#include <qprocess.h>
 
 using namespace std;
 
@@ -23,7 +24,7 @@
 AmfsXML::AmfsXML( QWidget* parent, const char* name, WFlags fl )
     : QWidget( parent, name, fl ) {
 	
-	
+	startedAmarok = false;
 	progressBar = (QProgressBar *) 0;
 	cdcover = (QLabel *) 0;
 	gradient = (QLabel *) 0;
@@ -439,6 +440,20 @@
 	mouseTimer->start( 5000, TRUE );
 	
 	setMouseTracking(TRUE);
+
+	//start Amarok (if necessary)
+	if (!dcopClient->isApplicationRegistered("amarok")) {
+		QProcess *amarokProc = new QProcess(QString("amarok"));
+		if (!amarokProc->launch(QString::null)) {
+			qDebug("error starting Amarok.");
+		} else {
+			while (!dcopClient->isApplicationRegistered("amarok"))
+				qApp->processEvents();
+				usleep(100);
+			startedAmarok = true;
+		}
+		delete amarokProc;
+	}
 	
 	nowPlaying = "";
 	updateTrackLabels();
@@ -472,6 +487,11 @@
 	if(isSetDisScrSvr) restoreScreenSaver();
 	//restore OSD if it was disabled
 	if(isSetDisAmaOSD) restoreAmarokOSD();
+	//stop Amarok (if it was started by AmarokFS)
+	if (startedAmarok) {
+		if (!dcopClient->send("amarok", "MainApplication-Interface", "quit()", (QByteArray) 0))
+			qDebug("there was some error using DCOP.");
+	}
         ce->accept();
         return;
 }
diff -uNr amarokFS-0.5/amfs-xml.h amarokFS-0.5-mod/amfs-xml.h
--- amarokFS-0.5/amfs-xml.h	2007-03-19 13:59:03.000000000 +0200
+++ amarokFS-0.5-mod/amfs-xml.h	2007-03-29 10:27:00.000000000 +0200
@@ -96,6 +96,9 @@
 	
 	AmarokFS_config *configWindow;
 
+	//stores whether Amarok was started by AmarokFS (true) or by the user
+	bool startedAmarok;
+
 
 private slots:
 	void updateTime();

amarokFS-0.5-theme_howto.patch:

--- NEW FILE amarokFS-0.5-theme_howto.patch ---
diff -uNr amarokFS-0.5/theme-howto.txt amarokFS-0.5-mod/theme-howto.txt
--- amarokFS-0.5/theme-howto.txt	2007-03-29 10:31:28.000000000 +0200
+++ amarokFS-0.5-mod/theme-howto.txt	2007-03-29 10:30:08.000000000 +0200
@@ -32,9 +32,9 @@
   i) "align" defines horizontal alignment, values are: 0 for auto, 1 for left, 2 for right, 4 for center and 5 for justify;
   j) "valign" defines vertical alignment, values are: 16 for top, 32 for bottom, 64 for center
 
-4) The "labelInstant" Element defines a text-label similar to trackLabel. The only difference is that it changes every second. It has the same subelements as "labelTrack".
+4) The "labelInstant" Element defines a text-label similar to labelTrack. The only difference is that it changes every second. It has the same subelements as "labelTrack".
 
-5) The "labelStatic" Element defines a text-label similar to trackLabel. The only difference is that it never changes. It has the same subelements as "labelTrack" except:
+5) The "labelStatic" Element defines a text-label similar to labelTrack. The only difference is that it never changes. It has the same subelements as "labelTrack" except:
   a) "text" determines the content (and "command" is ignored)
 		
 6) The "labelPixmap" Element defines an picture element, it is something between "button" and "labelStatic" - it uses a picture but does nothing and doesn't change:


Index: amarokFS.spec
===================================================================
RCS file: /cvs/extras/rpms/amarokFS/FC-6/amarokFS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amarokFS.spec	19 Feb 2007 21:20:12 -0000	1.1
+++ amarokFS.spec	29 Mar 2007 10:55:49 -0000	1.2
@@ -1,20 +1,17 @@
 Name:           amarokFS
-Version:        0.4.2
-Release:        4%{?dist}
+Version:        0.5
+Release:        1%{?dist}
 Summary:        Simple, nice looking full screen front-end for Amarok
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.kde-apps.org/content/show.php?content=52641
-Source0:        http://www.kde-apps.org/CONTENT/content-files/52641-amarokFS-qt3-%{version}.tar.gz
+Source0:        http://www.kde-apps.org/CONTENT/content-files/52641-amarokFS-%{version}.tar.gz
 # Source1 is an Amarok integration script
-Source1:        http://www.kde-apps.org/CONTENT/content-files/53125-amarokFS.amarokscript.tar
-Patch0:         amarokFS-0.4.2-fedora_paths.patch
-Patch1:         amarokFS-0.4.2-config_dialog_layout.patch
-Patch2:         amarokFS-0.4.2-large_cover_images.patch
-Patch3:         amarokFS-0.4.2-start_amarok.patch
-Patch4:         amarokFS-0.4.2-theme_howto.patch
-Patch5:         amarokFS-0.4.2-theme_prev_button.patch
+Source1:        http://www.kde-apps.org/CONTENT/content-files/53125-amarokFS-1.1.amarokscript.tar
+Patch0:         amarokFS-0.5-fedora_paths.patch
+Patch1:         amarokFS-0.5-start_amarok.patch
+Patch2:         amarokFS-0.5-theme_howto.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel desktop-file-utils ImageMagick
@@ -31,13 +28,13 @@
 
 
 %prep
-%setup -q -n %{name}-qt3-%{version}
+%setup -q
 %patch0 -p1 -b .fedora_paths
-%patch1 -p1 -b .config_dialog_layout
-%patch2 -p1 -b .large_cover_images
-%patch3 -p1 -b .start_amarok
-%patch4 -p1 -b .theme_howto
-%patch5 -p1 -b .theme_prev_button
+#%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
 sed -i 's/Application;//' amarokFS.desktop
 sed -i 's/\/usr\/share\/icons\/amarokFS.png/amarokFS/' amarokFS.desktop
 chmod a-x amarokFS.png
@@ -91,6 +88,15 @@
 
 
 %changelog
+* Thu Mar 29 2007 Francois Aucamp <faucamp at csir.co.za> - 0.5-1
+- Update to version 0.5
+- Removed "large_cover_images" patch; included upstream
+- Removed "config_dialog_layout" patch; included upstream
+- Updated "fedora_paths" patch
+- Updated "start_amarok" patch
+- Updated "theme_howto" patch
+- Updated amarok integration script
+
 * Mon Feb 19 2007 Francois Aucamp <faucamp at csir.co.za> - 0.4.2-4
 - Created "theme_prev_button" patch to fix default theme's "previous" button
 - Fixed file permissions of image files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarokFS/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Feb 2007 21:20:12 -0000	1.2
+++ sources	29 Mar 2007 10:55:49 -0000	1.3
@@ -1,2 +1,2 @@
-94d955be8f7a0454d341ae8501d00318  52641-amarokFS-qt3-0.4.2.tar.gz
-c6984db590fdb083dffc98d2a3bc8821  53125-amarokFS.amarokscript.tar
+28b7432fa9abfb0a2211940990b3945a  52641-amarokFS-0.5.tar.gz
+03725c25ef10c1e1e6ed07c69aed665c  53125-amarokFS-1.1.amarokscript.tar


--- amarokFS-0.4.2-config_dialog_layout.patch DELETED ---


--- amarokFS-0.4.2-fedora_paths.patch DELETED ---


--- amarokFS-0.4.2-large_cover_images.patch DELETED ---


--- amarokFS-0.4.2-start_amarok.patch DELETED ---


--- amarokFS-0.4.2-theme_howto.patch DELETED ---


--- amarokFS-0.4.2-theme_prev_button.patch DELETED ---