[gcompris] New upstream release 11.12 Drop our patches (all upstreamed)

Hans de Goede jwrdegoede at fedoraproject.org
Tue Dec 20 15:35:41 UTC 2011


commit 6f4710f41b116307b8849c3d96e70c5cada4db89
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Tue Dec 20 16:36:28 2011 +0100

    New upstream release 11.12
    Drop our patches (all upstreamed)

 .gitignore                       |    1 +
 gcompris-11.09-deprecated1.patch | 1060 --------------------------------------
 gcompris-11.09-deprecated2.patch |  139 -----
 gcompris-11.09-fixlocks.patch    |  287 ----------
 gcompris.spec                    |   12 +-
 sources                          |    2 +-
 6 files changed, 7 insertions(+), 1494 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a461d75..6a128e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ gcompris-9.3.tar.gz
 /gcompris-9.4.tar.gz
 /gcompris-9.5.tar.gz
 /gcompris-11.09.tar.gz
+/gcompris-11.12.tar.gz
diff --git a/gcompris.spec b/gcompris.spec
index f475b8d..6d7ebe9 100644
--- a/gcompris.spec
+++ b/gcompris.spec
@@ -1,5 +1,5 @@
 Name:           gcompris
-Version:        11.09
+Version:        11.12
 Release:        1%{?dist}
 Summary:        Educational suite for kids 2-10 years old
 Group:          Amusements/Games
@@ -7,9 +7,6 @@ License:        GPLv3+
 URL:            http://gcompris.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         gcompris-9.0-icon.patch
-Patch1:         gcompris-11.09-deprecated1.patch
-Patch2:         gcompris-11.09-fixlocks.patch
-Patch3:         gcompris-11.09-deprecated2.patch
 Buildrequires:  libgnomeui-devel sqlite-devel python-devel gnet2-devel
 Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
 Buildrequires:  gnome-python2 xorg-x11-proto-devel gstreamer-devel
@@ -296,9 +293,6 @@ Voice samples for the GCompris games in Turk.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -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 && \
@@ -525,6 +519,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Dec 20 2011 Hans de Goede <hdegoede at redhat.com> - 11.12-1
+- New upstream release 11.12
+- Drop our patches (all upstreamed)
+
 * Wed Dec 07 2011 Hans de Goede <hdegoede at redhat.com> - 11.09-1
 - New upstream release 11.09
 
diff --git a/sources b/sources
index efd5fda..1704bb0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b0066d5e0bb4e2fbb7380f723b51c598  gcompris-11.09.tar.gz
+454da35df3c521c0f1abbab7aa9afae0  gcompris-11.12.tar.gz


More information about the scm-commits mailing list