Compare commits

...
This repository has been archived on 2026-01-16. You can view files and clone it, but you cannot make any changes to its state, such as pushing and creating new issues, pull requests or comments.

7 commits

Author SHA1 Message Date
Till Maas
e96fcfaa83 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. 2014-06-04 19:24:33 +02:00
Fedora Release Engineering
5d9dbe1a17 dist-git conversion 2010-07-28 09:49:35 +00:00
Bill Nottingham
e172ddcb14 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-25 22:39:32 +00:00
Jesse Keating
1b66f895df - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild 2009-02-24 00:55:35 +00:00
Tom Callaway
df2cde5992 fix license tag 2008-07-14 17:23:09 +00:00
Francois Aucamp
73be681b74 - 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)
2008-02-22 14:02:15 +00:00
Jesse Keating
bf3ef11277 - Autorebuild for GCC 4.3 2008-02-19 02:56:18 +00:00
8 changed files with 1 additions and 295 deletions

View file

@ -1,2 +0,0 @@
52641-amarokFS-0.5.tar.gz
53125-amarokFS-1.1.amarokscript.tar

View file

@ -1,21 +0,0 @@
# Makefile for source rpm: amarokFS
# $Id$
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
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)

View file

@ -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);

View file

@ -1,66 +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 <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();

View file

@ -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:

View file

@ -1,123 +0,0 @@
Name: amarokFS
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-%{version}.tar.gz
# Source1 is an Amarok integration script
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
Requires: amarok
%description
AmarokFS (Amarok Full Screen) is a full screen front-end for Amarok that
provides a simple and nice looking graphical user interface. It is very
suitable for parties and public terminals. The front-end's appearance can be
customized using themes.
This package also contains a script that allows AmarokFS to be launched
from within Amarok itself.
%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
sed -i 's/Application;//' amarokFS.desktop
sed -i 's/\/usr\/share\/icons\/amarokFS.png/amarokFS/' amarokFS.desktop
chmod a-x amarokFS.png
chmod a-x images/*
%build
qmake
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install INSTALL_ROOT=$RPM_BUILD_ROOT
desktop-file-install --vendor="fedora" \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
amarokFS.desktop
# Install Amarok integration script
mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/amarok/scripts
cd $RPM_BUILD_ROOT%{_datadir}/apps/amarok/scripts
tar -xf %{SOURCE1}
# Install a 48x48 icon
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
convert $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/amarokFS.png \
-sample 48x48 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/amarokFS.png
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%files
%defattr(-,root,root,-)
%doc README theme-howto.txt
%{_bindir}/amarokFS
%{_datadir}/amarokFS
%{_datadir}/applications/fedora-amarokFS.desktop
%{_datadir}/icons/hicolor/48x48/apps/amarokFS.png
%{_datadir}/icons/hicolor/128x128/apps/amarokFS.png
%{_datadir}/apps/amarok/scripts/amarokFS
%changelog
* Thu Mar 29 2007 Francois Aucamp <faucamp@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@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
* Wed Feb 14 2007 Francois Aucamp <faucamp@csir.co.za> - 0.4.2-3
- Added BuildRequires: ImageMagick
- Create and install a 48x48 icon
* Tue Feb 13 2007 Francois Aucamp <faucamp@csir.co.za> - 0.4.2-2
- Added BuildRequires: desktop-file-utils
- Fixed source URLs
- Removed "Application" from .desktop file's "Categories" tag
- Install application icon to correct location
- Added KDE/GTK icon cache update scriptlets
- Cleaned up the application's qmake file a bit
* Sun Feb 11 2007 Francois Aucamp <faucamp@csir.co.za> - 0.4.2-1
- Initial RPM build
- Created "fedora_paths" patch to install files to correct directories in Fedora
- Created "config_dialog_layout" patch to fix the layout of the configuration dialog
- Created "large_cover_images" patch to fix filename resolution issues when displaying large CD cover images
- Created "start_amarok" patch to let AmarokFS start Amarok (upon startup) if it is not already running
- Created "theme_howto" patch to fix errors in the "theme howto" documentation file
- Created amarokFS integration script for Asterisk

1
dead.package Normal file
View file

@ -0,0 +1 @@
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.

View file

@ -1,2 +0,0 @@
28b7432fa9abfb0a2211940990b3945a 52641-amarokFS-0.5.tar.gz
03725c25ef10c1e1e6ed07c69aed665c 53125-amarokFS-1.1.amarokscript.tar