rpms/gcompris/devel .cvsignore, 1.8, 1.9 gcompris.spec, 1.23, 1.24 sources, 1.8, 1.9 gcompris-8.3.2-anim-missing-icon.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10816

Modified Files:
	.cvsignore gcompris.spec sources 
Removed Files:
	gcompris-8.3.2-anim-missing-icon.patch 
Log Message:
* Mon Jul 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.3.2-2
- Rebase to upstream 8.3.2-2 tarbal "respin" <grrr>
- Add a patch to stop unnecessary monitor resolution switching when starting
  tuxpaint in fullscreen mode.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	19 Jun 2007 11:33:25 -0000	1.8
+++ .cvsignore	16 Jul 2007 12:12:39 -0000	1.9
@@ -1 +1 @@
-gcompris-8.3.2.tar.gz
+gcompris-8.3.2-2.tar.gz


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gcompris.spec	13 Jul 2007 12:01:52 -0000	1.23
+++ gcompris.spec	16 Jul 2007 12:12:39 -0000	1.24
@@ -5,10 +5,9 @@
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gcompris.net
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-2.tar.gz
 Patch0:         gcompris-8.1-icon.patch
-Patch1:         gcompris-8.3.2-anim-missing-icon.patch
-Patch2:         gcompris-8.3.2-tuxpaint-fullscreen.patch
+Patch1:         gcompris-8.3.2-tuxpaint-fullscreen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
@@ -253,7 +252,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp
 mv tmp docs/C/gcompris.info
 
@@ -308,12 +306,16 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 if [ $1 = 0 ]; then
     /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
@@ -536,6 +538,11 @@
 
 
 %changelog
+* Mon Jul 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.3.2-2
+- Rebase to upstream 8.3.2-2 tarbal "respin" <grrr>
+- Add a patch to stop unnecessary monitor resolution switching when starting
+  tuxpaint in fullscreen mode.
+
 * Tue Jun 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 8.3.2-1
 - New upstream release 8.3.2
 - Drop upstreamed patches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	19 Jun 2007 11:33:25 -0000	1.8
+++ sources	16 Jul 2007 12:12:39 -0000	1.9
@@ -1 +1 @@
-26723284e2f819eda53a763005027db0  gcompris-8.3.2.tar.gz
+608c726595cf5f6966dc51ed200d206e  gcompris-8.3.2-2.tar.gz


--- gcompris-8.3.2-anim-missing-icon.patch DELETED ---