rpms/pychess/devel pychess, NONE, 1.1 pychess-0.8.2-datadir.patch, NONE, 1.1 pychess-0.8.2-gobject.patch, NONE, 1.1 pychess-0.8.2-icons.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 pychess.spec, 1.10, 1.11 sources, 1.6, 1.7 pychess-0.8-sitelib.patch, 1.2, NONE pychess-0.8b1-gtksourceview.patch, 1.1, NONE pychess-0.8b1-sitelib.patch, 1.1, NONE

[Michel Alexandre Salim]

Author: salimma

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

Modified Files:
	.cvsignore pychess.spec sources 
Added Files:
	pychess pychess-0.8.2-datadir.patch 
	pychess-0.8.2-gobject.patch pychess-0.8.2-icons.patch 
Removed Files:
	pychess-0.8-sitelib.patch pychess-0.8b1-gtksourceview.patch 
	pychess-0.8b1-sitelib.patch 
Log Message:
* Tue Aug 26 2008 Michel Salim <salimma at fedoraproject.org> - 0.8.2-1
- Update to 0.8.2



--- NEW FILE pychess ---
#!/bin/sh

# Run gnome-settings-daemon if it's not already running
CMD=/usr/libexec/gnome-settings-daemon
[ $(ps -ewwo args | grep $CMD | grep -v grep | wc -l) == 1 ] \
  || nohup $CMD >/dev/null
exec pychess.real $@

pychess-0.8.2-datadir.patch:

--- NEW FILE pychess-0.8.2-datadir.patch ---
--- pychess-0.8.2/setup.py.datadir	2008-02-29 13:53:11.000000000 -0500
+++ pychess-0.8.2/setup.py	2008-08-26 19:06:02.000000000 -0400
@@ -36,19 +36,19 @@
 
 os.chdir(os.path.abspath(os.path.dirname(__file__)))
 
-DATA_FILES = [("share/games/pychess",
+DATA_FILES = [("share/pychess",
     ["README", "AUTHORS", "LICENSE", "open.db"])]
 
 # UI
-DATA_FILES += [("share/games/pychess/glade", glob('glade/*.glade'))]
-DATA_FILES += [("share/games/pychess/glade", glob('glade/*.png'))]
-DATA_FILES += [("share/games/pychess/flags", glob('flags/*.png'))]
+DATA_FILES += [("share/pychess/glade", glob('glade/*.glade'))]
+DATA_FILES += [("share/pychess/glade", glob('glade/*.png'))]
+DATA_FILES += [("share/pychess/flags", glob('flags/*.png'))]
 
 # Sidepanel (not a package)
-DATA_FILES += [("share/games/pychess/sidepanel", glob('sidepanel/*.glade'))]
-DATA_FILES += [("share/games/pychess/sidepanel", glob('sidepanel/*.py'))]
-DATA_FILES += [("share/games/pychess/sidepanel", glob('sidepanel/*.pyc'))]
-DATA_FILES += [("share/games/pychess/sidepanel", glob('sidepanel/*.pyo'))]
+DATA_FILES += [("share/pychess/sidepanel", glob('sidepanel/*.glade'))]
+DATA_FILES += [("share/pychess/sidepanel", glob('sidepanel/*.py'))]
+DATA_FILES += [("share/pychess/sidepanel", glob('sidepanel/*.pyc'))]
+DATA_FILES += [("share/pychess/sidepanel", glob('sidepanel/*.pyo'))]
 
 # Data
 DATA_FILES += [('share/applications', ['pychess.desktop'])]

pychess-0.8.2-gobject.patch:

--- NEW FILE pychess-0.8.2-gobject.patch ---
--- pychess-0.8.2/lib/pychess/widgets/newGameDialog.py.gobject	2008-02-29 13:53:06.000000000 -0500
+++ pychess-0.8.2/lib/pychess/widgets/newGameDialog.py	2008-08-26 18:49:36.000000000 -0400
@@ -3,6 +3,7 @@
 from cStringIO import StringIO
 
 import gtk
+import gobject
 from cairo import ImageSurface
 
 try:

pychess-0.8.2-icons.patch:

--- NEW FILE pychess-0.8.2-icons.patch ---
--- pychess-0.8.2/glade/newInOut.glade.icons	2008-02-29 13:53:10.000000000 -0500
+++ pychess-0.8.2/glade/newInOut.glade	2008-08-26 18:59:56.000000000 -0400
@@ -357,7 +357,7 @@
 			      <property name="width_request">58</property>
 			      <property name="visible">True</property>
 			      <property name="icon_size">5</property>
-			      <property name="icon_name">stock_weather-storm</property>
+			      <property name="icon_name">weather-storm</property>
 			      <property name="xalign">0.5</property>
 			      <property name="yalign">0</property>
 			      <property name="xpad">5</property>
--- pychess-0.8.2/lib/pychess/ic/ICLounge.py.icons	2008-04-30 18:22:35.000000000 -0400
+++ pychess-0.8.2/lib/pychess/ic/ICLounge.py	2008-08-26 18:51:50.000000000 -0400
@@ -513,9 +513,9 @@
     l = gtk.ICON_LOOKUP_USE_BUILTIN
     peoplepix = icons.load_icon("stock_people", 15, l)
     bookpix = icons.load_icon("stock_book_blue", 15, l)
-    easypix = icons.load_icon("stock_weather-few-clouds", 15, l)
-    advpix = icons.load_icon("stock_weather-cloudy", 15, l)
-    exppix = icons.load_icon("stock_weather-storm", 15, l)
+    easypix = icons.load_icon("weather-few-clouds", 15, l)
+    advpix = icons.load_icon("weather-overcast", 15, l)
+    exppix = icons.load_icon("weather-storm", 15, l)
     cmppix = icons.load_icon("stock_notebook", 15, l)
     
     def __init__ (self, widgets, connection):
--- pychess-0.8.2/lib/pychess/widgets/Background.py.icons	2008-03-23 16:19:38.000000000 -0400
+++ pychess-0.8.2/lib/pychess/widgets/Background.py	2008-08-26 18:52:57.000000000 -0400
@@ -214,7 +214,7 @@
     def __init__ (self):
         gtk.HBox.__init__(self)
         # Sun
-        pix = it.load_icon("stock_weather-sunny", 48, gtk.ICON_LOOKUP_USE_BUILTIN)
+        pix = it.load_icon("weather-clear", 48, gtk.ICON_LOOKUP_USE_BUILTIN)
         image = gtk.Image()
         image.set_from_pixbuf(pix)
         image.set_size_request(75, -1)
--- pychess-0.8.2/lib/pychess/widgets/gamewidget.py.icons	2008-02-29 13:53:06.000000000 -0500
+++ pychess-0.8.2/lib/pychess/widgets/gamewidget.py	2008-08-26 18:47:39.000000000 -0400
@@ -71,10 +71,10 @@
 gtk_close = icons.load_icon("gtk-close", 16, ICON_LOOKUP_USE_BUILTIN)
 gtk_close20 = icons.load_icon("gtk-close", 20, ICON_LOOKUP_USE_BUILTIN)
 
-media_previous = icons.load_icon("stock_media-prev", 16, ICON_LOOKUP_USE_BUILTIN)
-media_rewind = icons.load_icon("stock_media-rew", 16, ICON_LOOKUP_USE_BUILTIN)
-media_forward = icons.load_icon("stock_media-fwd", 16, ICON_LOOKUP_USE_BUILTIN)
-media_next = icons.load_icon("stock_media-next", 16, ICON_LOOKUP_USE_BUILTIN)
+media_previous = icons.load_icon("gtk-media-previous-ltr", 16, ICON_LOOKUP_USE_BUILTIN)
+media_rewind = icons.load_icon("gtk-media-rewind-ltr", 16, ICON_LOOKUP_USE_BUILTIN)
+media_forward = icons.load_icon("gtk-media-forward-ltr", 16, ICON_LOOKUP_USE_BUILTIN)
+media_next = icons.load_icon("gtk-media-next-ltr", 16, ICON_LOOKUP_USE_BUILTIN)
 
 GAME_MENU_ITEMS = ("save_game1", "save_game_as1", "properties1", "close1")
 ACTION_MENU_ITEMS = ("draw", "pause1", "resume1", "undo1",


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pychess/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Feb 2008 17:54:14 -0000	1.6
+++ .cvsignore	27 Aug 2008 00:39:51 -0000	1.7
@@ -1 +1 @@
-pychess-0.8.tar.gz
+pychess-0.8.2.tar.gz


Index: pychess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pychess/devel/pychess.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pychess.spec	17 Mar 2008 13:48:46 -0000	1.10
+++ pychess.spec	27 Aug 2008 00:39:51 -0000	1.11
@@ -1,16 +1,18 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pychess
-Version:        0.8
-Release:        2%{?dist}
+Version:        0.8.2
+Release:        1%{?dist}
 Summary:        Chess game for GNOME
 
 Group:          Amusements/Games
 License:        GPLv2
 URL:            http://pychess.googlepages.com/home
 Source0:        http://pychess.googlecode.com/files/%{name}-%{version}.tar.gz
-#Patch0:         pychess-0.8-sitelib.patch
-#Patch1:         pychess-0.8b1-gtksourceview.patch
+Source1:        pychess
+Patch0:         pychess-0.8.2-datadir.patch
+Patch1:         pychess-0.8.2-gobject.patch
+Patch2:         pychess-0.8.2-icons.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
    
 BuildArch:      noarch
@@ -18,6 +20,7 @@
 BuildRequires:  desktop-file-utils, gettext
 
 Requires:       pygtk2-libglade, python-sqlite2, pygtksourceview
+Requires:       gnome-icon-theme gnome-settings-daemon
 
 %description
 PyChess is a GTK+ chess game for Linux. It is designed to at the same time
@@ -27,8 +30,22 @@
 
 %prep
 %setup -q
-#%patch0 -p1 -b .sitelib
-#%patch1 -p1 -b .gtksourceview
+%patch0 -p1 -b .datadir
+%patch1 -p1 -b .gobject
+%patch2 -p1 -b .icons
+
+# Fix text files
+for i in AUTHORS README; do
+    sed -i 's|\r||' "$i"
+done
+
+iconv -f ISO88591 -t UTF8 AUTHORS -o AUTHORS
+
+# strip shebang from files not meant to be run
+cd lib/pychess
+for i in Utils/Move.py Players/PyChess.py; do
+    sed -i '1d' "$i"
+done
 
 
 %build
@@ -37,13 +54,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# Fix line terminators
-sed -ie 's/.$//g' AUTHORS
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-#change permissions
-%{__chmod} +x $RPM_BUILD_ROOT%{python_sitelib}/%{name}/Utils/Move.py
-%{__chmod} +x $RPM_BUILD_ROOT%{python_sitelib}/%{name}/Players/PyChess.py
+# move binary to make place for our wrapper
+mv $RPM_BUILD_ROOT%{_bindir}/pychess $RPM_BUILD_ROOT%{_bindir}/pychess.real
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
 
 desktop-file-install --vendor fedora --delete-original  \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
@@ -61,7 +76,7 @@
 %doc README LICENSE AUTHORS 
 %{python_sitelib}/*
 %{_bindir}/*
-%{_datadir}/games/*
+%{_datadir}/pychess
 %{_datadir}/gtksourceview-1.0/language-specs/pgn.lang
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/apps/*
@@ -69,11 +84,15 @@
 %{_mandir}/man?/*
 
 %changelog
+* Tue Aug 26 2008 Michel Salim <salimma at fedoraproject.org> - 0.8.2-1
+- Update to 0.8.2
+
 * Mon Mar 17 2008 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 0.8-2
 - Bump release
 
 * Tue Feb 21 2008 Sindre Pedersen Bjordal <foolish at guezz.net> - 0.8-1
 - Final 0.8 release
+
 * Mon Dec  3 2007 Michel Salim <michel.sylvan at gmail.com> - 0.8-0.1.beta2
 - Update to 0.8beta2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pychess/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Feb 2008 17:54:14 -0000	1.6
+++ sources	27 Aug 2008 00:39:51 -0000	1.7
@@ -1 +1 @@
-1eb2f85388b7372f940f0ab60ffa7ab5  pychess-0.8.tar.gz
+3faf48b9704d29bc7fc508c9e63b7d1a  pychess-0.8.2.tar.gz


--- pychess-0.8-sitelib.patch DELETED ---


--- pychess-0.8b1-gtksourceview.patch DELETED ---


--- pychess-0.8b1-sitelib.patch DELETED ---