rpms/pympdtouchgui/devel pympdtouchgui-setup.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 pympdtouchgui.spec, 1.5, 1.6 sources, 1.3, 1.4 pympdtouchgui-fixpath.patch, 1.1, NONE pympdtouchgui.desktop, 1.1, NONE

[Sven Lankes]

Author: slankes

Update of /cvs/pkgs/rpms/pympdtouchgui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15708

Modified Files:
	.cvsignore pympdtouchgui.spec sources 
Added Files:
	pympdtouchgui-setup.patch 
Removed Files:
	pympdtouchgui-fixpath.patch pympdtouchgui.desktop 
Log Message:
* Wed Feb 10 2010 Sven Lankes <sven at lank.es> - 0.325-1
- New upstream release


pympdtouchgui-setup.patch:
 setup.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE pympdtouchgui-setup.patch ---
--- setup.py.orig	2010-02-10 20:23:12.092141489 +0100
+++ setup.py	2010-02-10 20:23:38.555141241 +0100
@@ -43,7 +43,7 @@
                     ('share/pympdtouchgui/themes/default', glob.glob('config/themes/default/*')),
                     ('share/pympdtouchgui/themes/original', glob.glob('config/themes/original/*')),
                     ('share/pympdtouchgui/themes/metal', glob.glob('config/themes/metal/*')),
-                    ('etc/pympdtouchguirc', ['config/config']),
-                    ('/var/lib/pympdtouchgui', ['config/clock-state'])]
+                    ('../etc', ['config/pympdtouchguirc']),
+                    ('../var/lib/pympdtouchgui', ['config/clock-state'])]
         )
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pympdtouchgui/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	19 Jan 2009 21:25:35 -0000	1.3
+++ .cvsignore	10 Feb 2010 21:04:00 -0000	1.4
@@ -1 +1 @@
-pympdtouchgui-0.309.tgz
+pympdtouchgui-0.325.tgz


Index: pympdtouchgui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pympdtouchgui/devel/pympdtouchgui.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pympdtouchgui.spec	26 Jul 2009 19:54:42 -0000	1.5
+++ pympdtouchgui.spec	10 Feb 2010 21:04:00 -0000	1.6
@@ -1,22 +1,22 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:       pympdtouchgui
-Version:    0.309
-Release:    3%{?dist}
-Summary:    PyMPDTouchGUI is a client for MPD that is usable via touchscreen    
+Version:    0.325
+Release:    1%{?dist}
+Summary:    Client for the MPD Music Player Daemon 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.309.tgz
-Source1:    pympdtouchgui.desktop
-Source2:    pympdtouchgui.png
-Patch0:     pympdtouchgui-fixpath.patch
+Source0:    http://www.spida.net/projects/software/pympdtouchgui/pympdtouchgui-0.325.tgz
+Source1:    %{name}.png
+Patch0:     pympdtouchgui-setup.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
 Requires:   pygame
 Requires:   python-imaging
+Requires:   python-twisted
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils
 
@@ -25,28 +25,25 @@ BuildRequires: desktop-file-utils
 will run on embedded-systems without X (but works with X and a mouse,
 too).
 
-
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p0
 
 %build
 %{__python} setup.py build
-
+mv config/config config/pympdtouchguirc
 
 %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} 
+  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
 
-install -p -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.png
+install -p -m 644 -D %{SOURCE1} $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
+# this file is never going to be executed directly
+%{__sed} -i "s|#!/usr/bin/env python||" $RPM_BUILD_ROOT/%{python_sitelib}/libpympdtouchgui/mpdclienttwisted.py
 
 
 %clean
@@ -59,12 +56,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
-/var/lib/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}rc
+%{_var}/lib/%{name}
 %{python_sitelib}/*
-%doc ChangeLog LICENSE README
+%doc %{_docdir}/*
 
 
 %changelog
+* Wed Feb 10 2010 Sven Lankes <sven at lank.es> - 0.325-1
+- New upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.309-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pympdtouchgui/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	19 Jan 2009 21:25:36 -0000	1.3
+++ sources	10 Feb 2010 21:04:00 -0000	1.4
@@ -1 +1 @@
-bcb6f5f1fac1efa8856c7eb86a5ce0e9  pympdtouchgui-0.309.tgz
+63cc03cba6b0dc178165d61297f24951  pympdtouchgui-0.325.tgz


--- pympdtouchgui-fixpath.patch DELETED ---


--- pympdtouchgui.desktop DELETED ---