rpms/pympdtouchgui/devel import.log, NONE, 1.1 pympdtouchgui-setuppy.patch, NONE, 1.1 pympdtouchgui.desktop, NONE, 1.1 pympdtouchgui.png, NONE, 1.1 pympdtouchgui.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Sven Lankes
slankes at fedoraproject.org
Wed Nov 5 23:51:17 UTC 2008
Author: slankes
Update of /cvs/pkgs/rpms/pympdtouchgui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19454/devel
Modified Files:
.cvsignore sources
Added Files:
import.log pympdtouchgui-setuppy.patch pympdtouchgui.desktop
pympdtouchgui.png pympdtouchgui.spec
Log Message:
initial import
--- NEW FILE import.log ---
pympdtouchgui-0_302-5_fc10:HEAD:pympdtouchgui-0.302-5.fc10.src.rpm:1225928988
pympdtouchgui-setuppy.patch:
--- NEW FILE pympdtouchgui-setuppy.patch ---
diff --git a/config/config b/config/config
index 9870f22..892525b 100644
--- a/config/config
+++ b/config/config
@@ -4,7 +4,7 @@ password = music
port = 6600
[other]
-themedir = /usr/share/mpdtouchgui/themes/default
+themedir = /usr/share/pympdtouchgui/themes/default
allowquit = True
onscreenkeyboard = True
lircrc = ~/.lircrc
diff --git a/libpympdtouchgui/__init__.py b/libpympdtouchgui/__init__.py
index 3c5c96e..b4f13e6 100644
--- a/libpympdtouchgui/__init__.py
+++ b/libpympdtouchgui/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# coding=utf-8
#*********************************************************************
# $Id: __init__.py 296 2008-10-19 20:29:19Z timo $
@@ -17,4 +16,5 @@
#
#*********************************************************************
-pass
+__VERSION__ = '0.302'
+
diff --git a/libpympdtouchgui/gui.py b/libpympdtouchgui/gui.py
index f61391a..abefedf 100644
--- a/libpympdtouchgui/gui.py
+++ b/libpympdtouchgui/gui.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# coding=utf-8
#*********************************************************************
# $Id: gui.py 296 2008-10-19 20:29:19Z timo $
diff --git a/pympdtouchgui b/pympdtouchgui
index 13fc7ad..21a4eb9 100755
--- a/pympdtouchgui
+++ b/pympdtouchgui
@@ -819,7 +819,7 @@ class Config:
self.Sizes = None
self.Theme = None
self.AlarmClock = None
- self.ClockStateFile = "/var/lib/mpdtouchgui/clock-state"
+ self.ClockStateFile = "/var/lib/pympdtouchgui/clock-state"
# Defaults for ServerOptions
self.ConnectHost = "127.0.0.1"
@@ -833,7 +833,7 @@ class Config:
self.AmazonID = "0MR5G85VBCCM2KS8RK82"
# Defaults for MiscOptions
- self.ThemeDir = os.path.expanduser("/usr/share/mpdtouchgui/themes/default")
+ self.ThemeDir = os.path.expanduser("/usr/share/pympdtouchgui/themes/default")
self.CommandlineConfigFile = ""
self.AllowQuit = True
self.PowerOffTimeoutEnabled = False
diff --git a/setup.py b/setup.py
index 7f62350..f47ad55 100644
--- a/setup.py
+++ b/setup.py
@@ -19,9 +19,11 @@
from distutils.core import setup, Extension
+import glob
+import libpympdtouchgui
setup(name='mpdtouchgui',
- version='0.302',
+ version = libpympdtouchgui.__VERSION__,
description='SDL client for the Music Player Daemon (MPD).',
author='Timo Boettcher',
author_email='pympdtouchgui at spida.net',
@@ -35,11 +37,11 @@ setup(name='mpdtouchgui',
'Programming Language :: Python',
'Topic :: Multimedia :: Sound :: Players',
],
- packages = ['libpympdtouchgui'],
- scripts = ['pympdtouchgui'],
- data_files=[('share/doc/pympdtouchgui', ['README', 'ChangeLog', 'LICENSE']),
- ('share/pympdtouchgui/themes/default', ['config/themes/default/Alarm.png', 'config/themes/default/ButtonAdd.png', 'config/themes/default/ButtonAlarmClockMarked.png', 'config/themes/default/ButtonAlarmClock.png', 'config/themes/default/ButtonBackspace.png', 'config/themes/default/ButtonBrowseMarked.png', 'config/themes/default/ButtonBrowse.png', 'config/themes/default/ButtonCheckBoxCheckedMarked.png', 'config/themes/default/ButtonCheckBoxChecked.png', 'config/themes/default/ButtonCheckBoxEmptyMarked.png', 'config/themes/default/ButtonCheckBoxEmpty.png', 'config/themes/default/ButtonDecrementMarked.png', 'config/themes/default/ButtonDecrement.png', 'config/themes/default/ButtonDel.png', 'config/themes/default/ButtonEnter.png', 'config/themes/default/ButtonFirstSlider.png', 'config/themes/default/ButtonIncrementMarked.png', 'config/themes/default/ButtonIncrement.png', 'config/themes/default/ButtonKeyboard.png', 'config/themes/default/ButtonKey.png', 'config/
themes/default/ButtonListMarked.png', 'config/themes/default/ButtonList.png', 'config/themes/default/ButtonMenu.png', 'config/themes/default/ButtonMiddleSlider.png', 'config/themes/default/ButtonMute.png', 'config/themes/default/ButtonNext.png', 'config/themes/default/ButtonNoRandomNoRepeat.png', 'config/themes/default/ButtonNoRandomRepeat.png', 'config/themes/default/ButtonPause.png', 'config/themes/default/ButtonPlay.png', 'config/themes/default/ButtonPrevious.png', 'config/themes/default/ButtonQuitMarked.png', 'config/themes/default/ButtonQuit.png', 'config/themes/default/ButtonRandomNoRepeat.png', 'config/themes/default/ButtonRandomRepeat.png', 'config/themes/default/ButtonScrollDown.png', 'config/themes/default/ButtonScrollUp.png', 'config/themes/default/ButtonSearchMarked.png', 'config/themes/default/ButtonSearch.png', 'config/themes/default/ButtonSecondSlider.png', 'config/themes/default/ButtonSleepClockMarked.png', 'config/themes/default/ButtonSleepClock.png', 'confi
g/themes/default/ButtonStatusMarked.png', 'config/themes/default/ButtonStatus.png', 'config/themes/default/ButtonStop.png', 'config/themes/default/ButtonTemplate.png', 'config/themes/default/ButtonUpdateMarked.png', 'config/themes/default/ButtonUpdate.png', 'config/themes/default/ButtonVolumeDown.png', 'config/themes/default/ButtonVolumeUp.png', 'config/themes/default/Sleep.png' , 'config/themes/default/themeconfig']),
- ('share/pympdtouchgui', ['config/config']),
+ packages = ['libpympdtouchgui',],
+ scripts = ['pympdtouchgui',],
+ data_files=[('/usr/share/doc/pympdtouchgui', ['README', 'ChangeLog', 'LICENSE']),
+ ('/usr/share/pympdtouchgui/themes/default', glob.glob('config/themes/default/*')),
+ ('/usr/share/pympdtouchgui', ['config/config']),
('/var/lib/pympdtouchgui', ['config/clock-state'])]
)
--- NEW FILE pympdtouchgui.desktop ---
[Desktop Entry]
Name=PyMPDTouchGUI
GenericName=Touchscreen optimized MPD Client
Exec=pympdtouchgui
Icon=pympdtouchgui
Terminal=false
Type=Application
Categories=AudioVideo;Player;
--- NEW FILE pympdtouchgui.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: pympdtouchgui
Version: 0.302
Release: 5%{?dist}
Summary: PyMPDTouchGUI is a client for MPD that is usable via touchscreen
Group: Applications/Multimedia
License: GPLv2
URL: http://www.spida.net/projects/pympdtouchgui/
Source0: http://www.spida.net/projects/pympdtouchgui/pympdtouchgui-0.302.tgz
Source1: pympdtouchgui.desktop
Source2: pympdtouchgui.png
Patch0: pympdtouchgui-setuppy.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: pygame
Requires: python-imaging
BuildRequires: python-devel
BuildRequires: desktop-file-utils
%description
%{name} is a client for MPD that is usable via touchscreen and
will run on embedded-systems without X (but works with X and a mouse,
too).
%prep
%setup -q
%patch0 -p1
%build
%{__python} setup.py build
%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
desktop-file-install --vendor="" \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
install -p -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.png
# those files are never going to be executed directly
%{__sed} -i "s|#!/usr/bin/env python||" $RPM_BUILD_ROOT/%{python_sitelib}/libpympdtouchgui/__init__.py
%{__sed} -i "s|#!/usr/bin/env python||" $RPM_BUILD_ROOT/%{python_sitelib}/libpympdtouchgui/gui.py
rm -rf $RPM_BUILD_ROOT/usr/share/doc
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
/var/lib/%{name}
%{python_sitelib}/*
%doc ChangeLog LICENSE README
%changelog
* Mon Nov 03 2008 Sven Lankes <sven at lank.es> - 0.302-5
- add Icon
* Mon Nov 03 2008 Sven Lankes <sven at lank.es> - 0.302-4
- rename patch
- add .desktop-file
* Sun Nov 02 2008 Sven Lankes <sven at lank.es> - 0.302-3
- update patch to also change wrong paths (upstream is aware of the issues addressed by the patch and they should be fixed there soon)
- update patch to fix wrong theme-destination dir
* Sun Nov 02 2008 Sven Lankes <sven at lank.es> - 0.302-2
- change handline of doc-files
* Sun Nov 02 2008 Sven Lankes <sven at lank.es> - 0.302-1
- initial package
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pympdtouchgui/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 5 Nov 2008 22:35:57 -0000 1.1
+++ .cvsignore 5 Nov 2008 23:50:46 -0000 1.2
@@ -0,0 +1 @@
+pympdtouchgui-0.302.tgz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pympdtouchgui/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 5 Nov 2008 22:35:57 -0000 1.1
+++ sources 5 Nov 2008 23:50:47 -0000 1.2
@@ -0,0 +1 @@
+8193912ed9ed7d70f7764adeecf7eca0 pympdtouchgui-0.302.tgz
More information about the fedora-extras-commits
mailing list