rpms/pygame/devel .cvsignore, 1.2, 1.3 pygame.spec, 1.19, 1.20 sources, 1.2, 1.3 pygame-1.7.1-64bit.patch, 1.2, NONE

[Christopher Stone (xulchris)]

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18779/devel

Modified Files:
	.cvsignore pygame.spec sources 
Removed Files:
	pygame-1.7.1-64bit.patch 
Log Message:
upstream sync


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/.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	22 May 2008 16:58:38 -0000	1.3
@@ -1 +1 @@
-pygame-1.7.1release.tar.gz
+pygame-1.8.0release.tar.gz


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pygame.spec	22 Feb 2008 07:16:39 -0000	1.19
+++ pygame.spec	22 May 2008 16:58:38 -0000	1.20
@@ -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:        16%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 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 SDL_mixer-devel
+BuildRequires:  libpng-devel libjpeg-devel libX11-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}
 
 %description
 Pygame is a set of Python modules designed for writing games. It is
@@ -34,8 +30,6 @@
 Requires:       %{name} = %{version}-%{release}
 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,15 @@
 
 
 %changelog
+* Thu May 22 2008 Christopher Stone <chris.stone at gmail.com> 1.8.0-1
+- Upstream sync
+- Remove Obsolets/Provides (been around since FC-4)
+- Remove no longer needed 64bit patch
+- Remove %%{version} macro from Patch0 definition
+- Add png, jpeg, and X11 libraries to BuildRequires
+- Simplify %%files section
+- Fix up some rpmlint warnings
+
 * Thu Feb 21 2008 Christopher Stone <chris.stone at gmail.com> 1.7.1-16
 - Add egginfo file to %%files
 - Update %%license


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/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	22 May 2008 16:58:38 -0000	1.3
@@ -1 +1 @@
-05d86d1af446f79411359400951053b7  pygame-1.7.1release.tar.gz
+8d9cca47d356db2ada07865aa066dceb  pygame-1.8.0release.tar.gz


--- pygame-1.7.1-64bit.patch DELETED ---