rpms/pygame/OLPC-3 .cvsignore, 1.2, 1.3 pygame-1.7.1-config.patch, 1.2, 1.3 pygame.spec, 1.21, 1.22 sources, 1.2, 1.3
Daniel Drake (dsd)
fedora-extras-commits at redhat.com
Wed Aug 6 21:21:13 UTC 2008
Author: dsd
Update of /cvs/pkgs/rpms/pygame/OLPC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32033
Modified Files:
.cvsignore pygame-1.7.1-config.patch pygame.spec sources
Log Message:
v1.8.0, require numpy, readd sdl-mixer dep
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygame/OLPC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 21 Apr 2006 00:19:40 -0000 1.2
+++ .cvsignore 6 Aug 2008 21:20:43 -0000 1.3
@@ -1 +1 @@
-pygame-1.7.1release.tar.gz
+pygame-1.8.0release.tar.gz
pygame-1.7.1-config.patch:
Index: pygame-1.7.1-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pygame/OLPC-3/pygame-1.7.1-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pygame-1.7.1-config.patch 22 May 2008 16:58:19 -0000 1.2
+++ pygame-1.7.1-config.patch 6 Aug 2008 21:20:43 -0000 1.3
@@ -1,13 +1,6 @@
---- config_unix.py~ 2008-05-22 09:55:26.000000000 -0700
-+++ config_unix.py 2008-05-22 09:55:43.000000000 -0700
-@@ -11,12 +11,13 @@
- #these get prefixes with '/usr' and '/usr/local' or the $LOCALBASE
- origincdirs = ['/include', '/include/SDL', '/include/SDL11',
- '/include/smpeg' ]
--origlibdirs = ['/lib']
-+origlibdirs = ['/lib','/lib64']
-
-
+--- config_unix.py.orig 2006-04-18 12:39:02.000000000 -0700
++++ config_unix.py 2006-04-18 12:38:25.000000000 -0700
+@@ -17,6 +17,7 @@
def confirm(message):
Index: pygame.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygame/OLPC-3/pygame.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pygame.spec 26 Jun 2008 22:20:00 -0000 1.21
+++ pygame.spec 6 Aug 2008 21:20:43 -0000 1.22
@@ -1,25 +1,21 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: pygame
-Version: 1.7.1
-Release: 17%{?dist}.1
+Version: 1.8.0
+Release: 1%{?dist}.2
Summary: Python modules for writing games
Group: Development/Languages
License: LGPLv2+
URL: http://www.pygame.org
-Patch0: %{name}-%{version}-config.patch
-Patch1: %{name}-%{version}-64bit.patch
+Patch0: %{name}-1.7.1-config.patch
Source0: http://pygame.org/ftp/%{name}-%{version}release.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python-devel python-numeric
-BuildRequires: SDL_ttf-devel SDL_image-devel
-Requires: python-numeric
-Obsoletes: python-pygame < 1.7.1
-Obsoletes: python-pygame-doc < 1.7.1
-Provides: python-pygame = %{version}-%{release}
-Provides: python-pygame-doc = %{version}-%{release}
+BuildRequires: python-devel numpy
+BuildRequires: SDL_ttf-devel SDL_image-devel SDL_mixer-devel
+BuildRequires: libpng-devel libjpeg-devel libX11-devel
+Requires: numpy
%description
Pygame is a set of Python modules designed for writing games. It is
@@ -32,10 +28,8 @@
Summary: Files needed for developing programs which use pygame
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: SDL_ttf-devel
+Requires: SDL_ttf-devel SDL_mixer-devel
Requires: python-devel
-Obsoletes: python-pygame-devel < 1.7.1
-Provides: python-pygame-devel = %{version}-%{release}
%description devel
This package contains headers required to build applications that use
@@ -45,10 +39,9 @@
%prep
%setup -qn %{name}-%{version}release
%patch0 -p0 -b .config~
-%patch1 -p1 -b .64bit~
# rpmlint fixes
-rm -f "examples/.#stars.py.1.7"
+chmod -x examples/*py
iconv -f iso8859-1 -t utf-8 WHATSNEW > WHATSNEW.conv && mv -f WHATSNEW.conv WHATSNEW
iconv -f iso8859-1 -t utf-8 readme.txt > readme.txt.conv && mv -f readme.txt.conv readme.txt
@@ -85,14 +78,7 @@
%defattr(-,root,root,-)
%doc docs/ readme.txt WHATSNEW
%dir %{python_sitearch}/%{name}
-%{python_sitearch}/%{name}/freesansbold.ttf
-%{python_sitearch}/%{name}/pygame.ico
-%{python_sitearch}/%{name}/pygame_icon.*
-%{python_sitearch}/%{name}/*.so*
-%{python_sitearch}/%{name}/*.py
-%{python_sitearch}/%{name}/*.pyc
-%{python_sitearch}/%{name}/*.pyo
-%{python_sitearch}/*egg-info
+%{python_sitearch}/%{name}*
%files devel
%defattr(-,root,root,-)
@@ -102,6 +88,11 @@
%changelog
+* Wed Aug 6 2008 Daniel Drake <dsd at laptop.org> 1.8.0-1.2
+- Sync with devel for version 1.8.0
+- Require numpy rather than numeric
+- Readd SDL_mixer requires, dlo#7603
+
* Thu Jun 26 2008 Dennis Gilmore <dennis at ausil.us> 1.7.1-17.1
- Drop BR on SDL_mixer for OLPC
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygame/OLPC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 21 Apr 2006 00:19:40 -0000 1.2
+++ sources 6 Aug 2008 21:20:43 -0000 1.3
@@ -1 +1 @@
-05d86d1af446f79411359400951053b7 pygame-1.7.1release.tar.gz
+8d9cca47d356db2ada07865aa066dceb pygame-1.8.0release.tar.gz
More information about the fedora-extras-commits
mailing list