rpms/gcompris/devel .cvsignore, 1.4, 1.5 gcompris.spec, 1.16, 1.17 sources, 1.4, 1.5 gcompris-8.0-fullscreen.patch, 1.1, NONE gcompris-8.0-silence.patch, 1.1, NONE gcompris-8.0-warn.patch, 1.1, NONE gcompris.6, 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-serv30964

Modified Files:
	.cvsignore gcompris.spec sources 
Removed Files:
	gcompris-8.0-fullscreen.patch gcompris-8.0-silence.patch 
	gcompris-8.0-warn.patch gcompris.6 
Log Message:
* Tue Nov  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 8.2-1
- New upstream release 8.2
- Drop most patches (integrated upstream)
- Drop seperate / addon man page (integrated upstream)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Oct 2006 14:41:12 -0000	1.4
+++ .cvsignore	7 Nov 2006 19:10:04 -0000	1.5
@@ -1 +1 @@
-gcompris-8.1.tar.gz
+gcompris-8.2.tar.gz


Index: gcompris.spec
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/gcompris.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gcompris.spec	15 Oct 2006 15:08:23 -0000	1.16
+++ gcompris.spec	7 Nov 2006 19:10:04 -0000	1.17
@@ -1,16 +1,12 @@
 Name:           gcompris
-Version:        8.1
+Version:        8.2
 Release:        1%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gcompris.net
 Source0:        http://download.sf.net/%{name}/%{name}-%{version}.tar.gz
-Source1:        gcompris.6
-Patch0:         gcompris-8.0-warn.patch
-Patch1:         gcompris-8.0-fullscreen.patch
-Patch2:         gcompris-8.0-silence.patch
-Patch3:         gcompris-8.1-icon.patch
+Patch0:         gcompris-8.1-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
@@ -180,6 +176,14 @@
 Voice samples for the GCompris games in Russian.
 
 
+%package sound-so
+Summary:        GCompris voices in Somali
+Group:          Amusements/Games
+
+%description sound-so
+Voice samples for the GCompris games in Somali.
+
+
 %package sound-sv
 Summary:        GCompris voices in Swedish
 Group:          Amusements/Games
@@ -215,9 +219,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 iconv -f ISO-8859-1 -t UTF8 docs/C/gcompris.info > tmp
 mv tmp docs/C/gcompris.info
 
@@ -240,8 +241,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man6
 rm $RPM_BUILD_ROOT%{_libdir}/libgcompris-1.la
 rm $RPM_BUILD_ROOT%{_libdir}/gcompris/lib*.la
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -440,6 +439,13 @@
 %dir %{_datadir}/gcompris/boards/sounds
 %{_datadir}/gcompris/boards/sounds/ru
 
+%files sound-so
+%defattr(-,root,root,-)
+%dir %{_datadir}/gcompris
+%dir %{_datadir}/gcompris/boards
+%dir %{_datadir}/gcompris/boards/sounds
+%{_datadir}/gcompris/boards/sounds/so
+
 %files sound-sv
 %defattr(-,root,root,-)
 %dir %{_datadir}/gcompris
@@ -469,6 +475,11 @@
 
 
 %changelog
+* Tue Nov  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 8.2-1
+- New upstream release 8.2
+- Drop most patches (integrated upstream)
+- Drop seperate / addon man page (integrated upstream)
+
 * Sun Oct 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 8.1-1
 - New upstream release 8.1
 - Drop most patches (integrated upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Oct 2006 14:41:12 -0000	1.4
+++ sources	7 Nov 2006 19:10:04 -0000	1.5
@@ -1 +1 @@
-439b70411ccdbd99c6391d6bfb5e6fb6  gcompris-8.1.tar.gz
+56849e2b09bea6a47eb6f177cc85258f  gcompris-8.2.tar.gz


--- gcompris-8.0-fullscreen.patch DELETED ---


--- gcompris-8.0-silence.patch DELETED ---


--- gcompris-8.0-warn.patch DELETED ---


--- gcompris.6 DELETED ---