rpms/pygame/F-7 pygame-1.7.1-config.patch, 1.1, 1.2 pygame.spec, 1.17, 1.18

[Christopher Stone (xulchris)]

Author: xulchris

Update of /cvs/extras/rpms/pygame/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27527/F-7

Modified Files:
	pygame-1.7.1-config.patch pygame.spec 
Log Message:
bz #447603

pygame-1.7.1-config.patch:

Index: pygame-1.7.1-config.patch
===================================================================
RCS file: /cvs/extras/rpms/pygame/F-7/pygame-1.7.1-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygame-1.7.1-config.patch	21 Apr 2006 00:19:40 -0000	1.1
+++ pygame-1.7.1-config.patch	22 May 2008 17:47:38 -0000	1.2
@@ -1,6 +1,13 @@
---- 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 @@
+--- 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']
+ 
+ 
  
  
  def confirm(message):


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/F-7/pygame.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pygame.spec	16 May 2007 02:32:00 -0000	1.17
+++ pygame.spec	22 May 2008 17:47:38 -0000	1.18
@@ -2,11 +2,11 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        14%{?dist}
+Release:        17%{?dist}
 Summary:        Python modules for writing games
 
 Group:          Development/Languages
-License:        LGPL
+License:        LGPLv2+
 URL:            http://www.pygame.org
 Patch0:         %{name}-%{version}-config.patch
 Patch1:         %{name}-%{version}-64bit.patch
@@ -49,6 +49,9 @@
 
 # rpmlint fixes
 rm -f "examples/.#stars.py.1.7"
+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
+
 
 # These files must be provided by pygame-nonfree(-devel) packages on a
 # repository that does not have restrictions on providing non-free software
@@ -63,6 +66,9 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+# Fix permissions
+chmod 755 $RPM_BUILD_ROOT%{python_sitearch}/%{name}/*.so
+
 
 %check
 # base_test fails in mock, unable to find soundcard
@@ -86,6 +92,7 @@
 %{python_sitearch}/%{name}/*.py
 %{python_sitearch}/%{name}/*.pyc
 %{python_sitearch}/%{name}/*.pyo
+%{python_sitearch}/*egg-info
 
 %files devel
 %defattr(-,root,root,-)
@@ -95,6 +102,17 @@
 
 
 %changelog
+* Thu May 22 2008 Christopher Stone <chris.stone at gmail.com> 1.7.1-17
+- Update config patch (bz #447603)
+
+* Thu Feb 21 2008 Christopher Stone <chris.stone at gmail.com> 1.7.1-16
+- Add egginfo file to %%files
+- Update %%license
+- Fix permissions on .so files
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.7.1-15
+- Autorebuild for GCC 4.3
+
 * Tue May 15 2007 Christopher Stone <chris.stone at gmail.com> 1.7.1-14
 - Add one more bit to 64-bit patch