rpms/gcompris/F-12 .cvsignore, 1.20, 1.21 gcompris.spec, 1.50, 1.51 sources, 1.23, 1.24 gcompris-9.0-photohunter.patch, 1.1, NONE gcompris-9.0-smallnumbers_overlap.patch, 1.1, NONE

[Johan Cwiklinski]

Author: trasher

Update of /cvs/pkgs/rpms/gcompris/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24491

Modified Files:
	.cvsignore gcompris.spec sources 
Removed Files:
	gcompris-9.0-photohunter.patch 
	gcompris-9.0-smallnumbers_overlap.patch 
Log Message:
New 9.1 bugfix release, remove upstream applied patches


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcompris/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	7 Jan 2010 18:51:31 -0000	1.20
+++ .cvsignore	25 Jan 2010 11:35:34 -0000	1.21
@@ -1 +1 @@
-gcompris-9.0.tar.gz
+gcompris-9.1.tar.gz


Index: gcompris.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcompris/F-12/gcompris.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- gcompris.spec	17 Jan 2010 14:00:55 -0000	1.50
+++ gcompris.spec	25 Jan 2010 11:35:34 -0000	1.51
@@ -1,17 +1,12 @@
 Name:           gcompris
-Version:        9.0
-Release:        3%{?dist}
+Version:        9.1
+Release:        1%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPLv3+
 URL:            http://gcompris.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         gcompris-9.0-icon.patch
-#Fix for photohunter activity in fullscreen from upstream
-#see: http://git.gnome.org/browse/gcompris/commit/?h=gcomprixogoo&id=ad197b7b81e25ef3376bced99b384c18bee39efb
-Patch1:         gcompris-9.0-photohunter.patch
-#Fix for orvelaping dice in smallnumbers activity (https://bugzilla.gnome.org/show_bug.cgi?id=607176)
-Patch2:         gcompris-9.0-smallnumbers_overlap.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
@@ -19,11 +14,9 @@ Buildrequires:  gnome-python2 xorg-x11-p
 Buildrequires:  python-sqlite2 texi2html texinfo
 Buildrequires:  perl(XML::Parser) gettext desktop-file-utils gnuchess
 BuildRequires:  intltool
-#As of 9.0
 BuildRequires:  librsvg2-devel
 Requires:       gnuchess gnucap tuxpaint hicolor-icon-theme
 Requires:       pygtk2
-#As of 9.0
 Requires:       gnome-python2-rsvg
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -287,8 +280,6 @@ GCompris development files
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 for file in docs/C/%{name}.info AUTHORS ChangeLog; do
     iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
     touch -r $file $file.new && \
@@ -546,6 +537,9 @@ fi
 
 
 %changelog
+* Mon Jan 25 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 9.1-1
+- 9.1
+
 * Sun Jan 17 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 9.0-3
 - Remove python-sqlite2 requires (part of python since 2.5, bug #480426)
 - Fix overlaping dice in smallnumber activity


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcompris/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	7 Jan 2010 18:51:31 -0000	1.23
+++ sources	25 Jan 2010 11:35:34 -0000	1.24
@@ -1 +1 @@
-d39b0fc879b8c3689140360e32eed711  gcompris-9.0.tar.gz
+490cc6ee81847e4441a878dc6e16f301  gcompris-9.1.tar.gz


--- gcompris-9.0-photohunter.patch DELETED ---


--- gcompris-9.0-smallnumbers_overlap.patch DELETED ---