rpms/mypaint/F-9 import.log, NONE, 1.1 mypaint-mypaint.patch, NONE, 1.1 mypaint.spec, 1.3, 1.4

[Marc Wiriadisastra]

Author: mwiriadi

Update of /cvs/pkgs/rpms/mypaint/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22597/F-9

Modified Files:
	mypaint.spec 
Added Files:
	import.log mypaint-mypaint.patch 
Log Message:
Add new website and download link
Fix mydrawwidget location for F-10
Patch is not clean but it works which is all that matters




--- NEW FILE import.log ---
mypaint-0_5_1-2_fc10:F-9:mypaint-0.5.1-2.fc10.src.rpm:1225798238

mypaint-mypaint.patch:

--- NEW FILE mypaint-mypaint.patch ---
--- mypaint-0.5.1/mypaint	2008-03-09 04:43:38.000000000 +0900
+++ mypaint.orig	2008-11-04 20:28:06.000000000 +0900
@@ -12,6 +12,7 @@
 #psyco.full()
 
 import gtk, sys, os, os.path
+from distutils.sysconfig import get_python_lib
 gdk = gtk.gdk
 
 # autodetect prefix
@@ -19,7 +20,10 @@
 
 #standard values
 data='/share/mypaint'
-lib='/lib/python%d.%d/site-packages/mypaint/' % (sys.version_info[0], sys.version_info[1])
+lib = get_python_lib(1)
+lib = lib.strip('/usr')
+lib = '/'+ lib + 's' + '/mypaint/'
+#lib='/lib/python%d.%d/site-packages/mypaint/' % (sys.version_info[0], sys.version_info[1])
 pwd=os.getcwd()
 curdir=os.path.dirname(sys.argv[0])
 


Index: mypaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mypaint/F-9/mypaint.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mypaint.spec	27 Jul 2008 10:34:30 -0000	1.3
+++ mypaint.spec	4 Nov 2008 11:32:08 -0000	1.4
@@ -1,17 +1,18 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Name:           mypaint
 Version:        0.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple paint program
 
 Group:          Applications/Multimedia
 License:        GPLv2+
-URL:            http://people.ee.ethz.ch/%7Emrenold/mypaint/
-Source0:        http://people.ee.ethz.ch/%7Emrenold/mypaint/%{name}-%{version}.tar.bz2
+URL:            http://mypaint.intilinux.com/
+Source0:        http://ee-staff.ethz.ch/%7Emrenold/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         %{name}-%{name}.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, desktop-file-utils, gtk2-devel, pygtk2-devel
-Requires:       gtk2, pygtk2
+Requires:       gtk2, pygtk2, python
 
 %description
 Mypaint is a fast and easy/simple painter app focused on the painter, 
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 /bin/chmod -x html/generate.py
 
 %build
@@ -42,10 +44,16 @@
 #accessible to other people trying to import it.
 touch $RPM_BUILD_ROOT%{_datadir}/mypaint/python/__init__.py
 
+#rm -f  $RPM_BUILD_ROOT%{python_sitearch}/%{name}/mydrawwidget.so
+#rm -f  $RPM_BUILD_ROOT%{python_sitearch}/%{name}/mydrawwidget.so.0
+#mv $RPM_BUILD_ROOT%{python_sitearch}/%{name}/mydrawwidget.so.0.0.0 \
+#$RPM_BUILD_ROOT%{python_sitearch}/%{name}/mydrawwidget.so
+
 rm -f  $RPM_BUILD_ROOT%{python_sitearch}/%{name}/mydrawwidget.so
 rm -f  $RPM_BUILD_ROOT%{python_sitearch}/%{name}/mydrawwidget.so.0
 mv $RPM_BUILD_ROOT%{python_sitearch}/%{name}/mydrawwidget.so.0.0.0 \
 $RPM_BUILD_ROOT%{python_sitearch}/%{name}/mydrawwidget.so
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -56,10 +64,14 @@
 %{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}*
 %{_datadir}/applications/fedora-%{name}.desktop
-%dir %{python_sitearch}/%{name}/
+%dir %{python_sitearch}/%{name}
 %{python_sitearch}/%{name}/mydrawwidget.so
 
 %changelog
+* Mon Nov 3 2008 Marc Wiriadisastra <marc at mwiriadi.id.au> - 0.5.1-2
+- Add new website and download link
+- Fix mydrawwidget location for F-10
+
 * Sun Jul 27 2008 Marc Wiriadisastra <marc at mwiriadi.id.au> - 0.5.1-1
 - New version