From 1b66f895df2976d23820885d70f20dd121c46b6c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 00:55:35 +0000 Subject: [PATCH 1/4] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- amarokFS.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amarokFS.spec b/amarokFS.spec index 9c1c847..3df5070 100644 --- a/amarokFS.spec +++ b/amarokFS.spec @@ -1,6 +1,6 @@ Name: amarokFS Version: 0.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple, nice looking full screen front-end for Amarok Group: Applications/Multimedia @@ -88,6 +88,9 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 0.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Jul 14 2008 Tom "spot" Callaway - 0.5-4 - fix license tag From e172ddcb14c3737393ca271ad81b10422cf6e8ff Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:32 +0000 Subject: [PATCH 2/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0f0b2dd..4491f0f 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: amarokFS -# $Id$ +# $Id: Makefile,v 1.1 2007/02/19 20:59:58 wtogami Exp $ NAME := amarokFS SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 5d9dbe1a1754110012b63853da2286e1fb3e332b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:49:35 +0000 Subject: [PATCH 3/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 4491f0f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: amarokFS -# $Id: Makefile,v 1.1 2007/02/19 20:59:58 wtogami Exp $ -NAME := amarokFS -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From e96fcfaa83b8240d8c980ac17a80bb0c2dad2fbc Mon Sep 17 00:00:00 2001 From: Till Maas Date: Wed, 4 Jun 2014 19:24:33 +0200 Subject: [PATCH 4/4] 2014-06-04 - This package was already retired in pkgdb/blocked in koji, but no dead.package file existed. The original retirement reason is unclear. --- .gitignore | 2 - amarokFS-0.5-fedora_paths.patch | 66 ------------- amarokFS-0.5-start_amarok.patch | 67 ------------- amarokFS-0.5-theme_howto.patch | 15 --- amarokFS-0.5-theme_prev_button.patch | 12 --- amarokFS.spec | 137 --------------------------- dead.package | 1 + sources | 2 - 8 files changed, 1 insertion(+), 301 deletions(-) delete mode 100644 .gitignore delete mode 100644 amarokFS-0.5-fedora_paths.patch delete mode 100644 amarokFS-0.5-start_amarok.patch delete mode 100644 amarokFS-0.5-theme_howto.patch delete mode 100644 amarokFS-0.5-theme_prev_button.patch delete mode 100644 amarokFS.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 8acf002..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -52641-amarokFS-0.5.tar.gz -53125-amarokFS-1.1.amarokscript.tar diff --git a/amarokFS-0.5-fedora_paths.patch b/amarokFS-0.5-fedora_paths.patch deleted file mode 100644 index 7560b83..0000000 --- a/amarokFS-0.5-fedora_paths.patch +++ /dev/null @@ -1,66 +0,0 @@ -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); diff --git a/amarokFS-0.5-start_amarok.patch b/amarokFS-0.5-start_amarok.patch deleted file mode 100644 index d001b8e..0000000 --- a/amarokFS-0.5-start_amarok.patch +++ /dev/null @@ -1,67 +0,0 @@ -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 - #include - #include -+#include - - 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,21 @@ - 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(200); -+ usleep(200); -+ 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(); diff --git a/amarokFS-0.5-theme_howto.patch b/amarokFS-0.5-theme_howto.patch deleted file mode 100644 index 7acf321..0000000 --- a/amarokFS-0.5-theme_howto.patch +++ /dev/null @@ -1,15 +0,0 @@ -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: diff --git a/amarokFS-0.5-theme_prev_button.patch b/amarokFS-0.5-theme_prev_button.patch deleted file mode 100644 index c3ba338..0000000 --- a/amarokFS-0.5-theme_prev_button.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 @@ - -