rpms/gcompris/devel gcompris-9.0-icon.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 gcompris.spec, 1.47, 1.48 sources, 1.22, 1.23 gcompris-8.3.2-tuxpaint-fullscreen.patch, 1.1, NONE gcompris-8.4.13-icon.patch, 1.1, NONE

[Johan Cwiklinski]

Author: trasher

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

Modified Files:
	.cvsignore gcompris.spec sources 
Added Files:
	gcompris-9.0-icon.patch 
Removed Files:
	gcompris-8.3.2-tuxpaint-fullscreen.patch 
	gcompris-8.4.13-icon.patch 
Log Message:
New upstream release

gcompris-9.0-icon.patch:
 gcompris.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gcompris-9.0-icon.patch ---
diff -up gcompris-9.0/src/gcompris/gcompris.c.patch gcompris-9.0/src/gcompris/gcompris.c
--- gcompris-9.0/src/gcompris/gcompris.c.patch	2010-01-04 08:10:32.000000000 +0100
+++ gcompris-9.0/src/gcompris/gcompris.c	2010-01-04 08:11:02.000000000 +0100
@@ -747,7 +747,7 @@ static void setup_window ()
   {
     GdkPixbuf *icon_pixbuf = NULL;
     gchar *iconfile = gc_file_find_absolute("%s/%s",
-					    properties->system_icon_dir, "gcompris.png",
+					    "/usr/share/icons/hicolor/48x48/apps", "gcompris.png",
 					    NULL);
     if(iconfile)
       {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcompris/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	24 Oct 2009 08:47:11 -0000	1.19
+++ .cvsignore	6 Jan 2010 12:22:54 -0000	1.20
@@ -1 +1 @@
-gcompris-8.4.13.tar.gz
+gcompris-9.0.tar.gz


Index: gcompris.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- gcompris.spec	24 Oct 2009 08:47:12 -0000	1.47
+++ gcompris.spec	6 Jan 2010 12:22:54 -0000	1.48
@@ -1,13 +1,12 @@
 Name:           gcompris
-Version:        8.4.13
+Version:        9.0
 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-8.4.13-icon.patch
-Patch1:         gcompris-8.3.2-tuxpaint-fullscreen.patch
+Patch0:         gcompris-9.0-icon.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
@@ -15,13 +14,14 @@ 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 python-sqlite2
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 # note we do not provide these, they no longer exist
 Obsoletes:      %{name}-libs < %{version}-%{release}
-Obsoletes:      %{name}-devel < %{version}-%{release}
 # the flags are no longer in a separate sub-package
 Obsoletes:      %{name}-flags < %{version}-%{release}
 Provides:       %{name}-flags = %{version}-%{release}
@@ -268,25 +268,29 @@ BuildArch:      noarch
 Voice samples for the GCompris games in Turk.
 
 
-%package flags
-Summary:        Country flags for use with GCompris (60x40 PNG)
-Group:          Amusements/Games
-BuildArch:      noarch
+%package devel
+Group:          Development/Libraries
+Summary:        Development files for GCompris
+Requires:       %{name} = %{version}-%{release}
 
-%description flags
-Country flags for use with GCompris (60x40 PNG).
+%description devel
+GCompris development files
 
 
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-iconv -f ISO-8859-1 -t UTF8 docs/C/%{name}.info > tmp
-mv tmp docs/C/%{name}.info
-iconv -f ISO-8859-1 -t UTF8 AUTHORS > tmp
-mv tmp AUTHORS
-iconv -f ISO-8859-1 -t UTF8 ChangeLog > tmp
-mv tmp ChangeLog
+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 && \
+    mv $file.new $file
+done
+#iconv -f ISO-8859-1 -t UTF8 docs/C/%{name}.info > tmp
+#mv tmp docs/C/%{name}.info
+#iconv -f ISO-8859-1 -t UTF8 AUTHORS > tmp
+#mv tmp AUTHORS
+#iconv -f ISO-8859-1 -t UTF8 ChangeLog > tmp
+#mv tmp ChangeLog
 
 
 %build
@@ -361,8 +365,10 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/%{name}
+%exclude %{_libdir}/%{name}/libgoocanvas.so
 %{_libdir}/%{name}
 %{_datadir}/%{name}
+%{_datadir}/gnome/help/%{name}
 %exclude %{_datadir}/%{name}/boards/voices
 %{_datadir}/icons/hicolor/48x48/apps/%{name}*.png
 %{_datadir}/applications/fedora-%{name}*.desktop
@@ -531,8 +537,15 @@ fi
 %dir %{_datadir}/%{name}/boards/voices
 %{_datadir}/%{name}/boards/voices/tr
 
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/libgoocanvas.so
+
 
 %changelog
+* Mon Jan 04 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 9.0-1
+- New GCompris 9.0
+
 * Sat Oct 24 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 8.4.13-1
 - New upstream bugfix release 8.4.13
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcompris/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	24 Oct 2009 08:47:12 -0000	1.22
+++ sources	6 Jan 2010 12:22:54 -0000	1.23
@@ -1 +1 @@
-d4768c2c471da4f1eb12a82d37f54dc1  gcompris-8.4.13.tar.gz
+d39b0fc879b8c3689140360e32eed711  gcompris-9.0.tar.gz


--- gcompris-8.3.2-tuxpaint-fullscreen.patch DELETED ---


--- gcompris-8.4.13-icon.patch DELETED ---