rpms/fife/F-13 fife-0.3.1-dso.patch, NONE, 1.1 fife-0.3.1-soname.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 fife.spec, 1.12, 1.13 import.log, 1.5, 1.6 sources, 1.6, 1.7 fife-0.3.0-dso.patch, 1.1, NONE fife-0.3.0-optflags.patch, 1.1, NONE fife-0.3.0-soname.patch, 1.1, NONE

Simon Wesp cassmodiah at fedoraproject.org
Thu Apr 8 17:39:52 UTC 2010


Author: cassmodiah

Update of /cvs/pkgs/rpms/fife/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6227/F-13

Modified Files:
	.cvsignore fife.spec import.log sources 
Added Files:
	fife-0.3.1-dso.patch fife-0.3.1-soname.patch 
Removed Files:
	fife-0.3.0-dso.patch fife-0.3.0-optflags.patch 
	fife-0.3.0-soname.patch 
Log Message:
0.3.0->0.3.1


fife-0.3.1-dso.patch:
 linux2-config.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fife-0.3.1-dso.patch ---
--- fife-0.3.1.orig/build/linux2-config.py	2010-02-20 22:41:43.000000000 +0100
+++ fife-0.3.1/build/linux2-config.py	2010-04-07 19:36:32.175332048 +0200
@@ -73,7 +73,7 @@
 			('SDL_image', 'SDL_image.h'),
 			('guichan', 'guichan.hpp'),
 			('guichan_sdl', ''),
-			(('boost_filesystem', 'boost_filesystem-gcc', 'boost_filesystem-gcc41', 'boost_filesystem-mt'), 'boost/filesystem.hpp'),
+			(('boost_system', 'boost_filesystem', 'boost_filesystem-gcc', 'boost_filesystem-gcc41', 'boost_filesystem-mt'), 'boost/filesystem.hpp'),
 			(('boost_regex', 'boost_regex-gcc', 'boost_regex-gcc41', 'boost_regex-mt'), 'boost/regex.hpp'),
 			('png', 'png.h'),
 			('Xcursor', '')]

fife-0.3.1-soname.patch:
 SConscript |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE fife-0.3.1-soname.patch ---
--- fife-0.3.1.orig/engine/SConscript	2010-02-02 22:39:11.000000000 +0100
+++ fife-0.3.1/engine/SConscript	2010-04-08 18:18:56.592335907 +0200
@@ -123,7 +123,8 @@
 								  SHLIBEMITTER = '')
 else:
 	sharedlib = env.SharedLibrary(target = 'fife',
-								  source = compilefiles)
+								  source = compilefiles,
+								  LINKFLAGS=['-Wl,-soname,libfife.so.SONAME'])
 
 #**************************************************************************
 #python library target


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fife/F-13/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	27 Jan 2010 20:42:19 -0000	1.5
+++ .cvsignore	8 Apr 2010 17:39:51 -0000	1.6
@@ -1 +1 @@
-fife-0.3.0.tar.gz
+fife-0.3.1.tar.gz


Index: fife.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fife/F-13/fife.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- fife.spec	9 Mar 2010 22:22:14 -0000	1.12
+++ fife.spec	8 Apr 2010 17:39:51 -0000	1.13
@@ -4,8 +4,8 @@
 
 Name:           fife
 Epoch:          1
-Version:        0.3.0
-Release:        4%{?dist}
+Version:        0.3.1
+Release:        1%{?dist}
 Summary:        Cross platform game creation framework
 
 Group:          Amusements/Games
@@ -18,9 +18,8 @@ URL:            http://www.fifengine.de
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         %{name}-0.3.0-soname.patch
-Patch1:         %{name}-0.3.0-optflags.patch
-Patch2:		%{name}-0.3.0-dso.patch
+Patch0:         %{name}-0.3.1-soname.patch
+Patch1:         %{name}-0.3.1-dso.patch
 
 BuildRequires:  scons
 BuildRequires:  SDL-devel
@@ -83,11 +82,6 @@ Doxygen generated documentation for %{na
 %prep
 %setup -q 
 
-%patch2 -p1
-
-# Honor optflags // diff generated from svn
-%patch1 -p1
-
 # remove usage of ./ext/ (see line 16 for further informations)
 # very dirrty, but it works
 sed -i '21d' \
@@ -116,6 +110,9 @@ sed -i 's|i->leaf()|i->path().leaf()|g' 
 sed -i "s|SONAME|%{soname}|g" \
     engine/SConscript
 
+#DSO for the boostsystem
+%patch1 -p1
+
 
 %build
 scons . \
@@ -204,6 +201,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Apr 07 2010 Simon Wesp <cassmodiah at fedoraproject.org> - 1:0.3.1-1
+- pdate to 0.3.1
+ 
 * Tue Mar 09 2010 Thomas Kowaliczek <linuxdonald at linuxdonald.de> - 1:0.3.0-4
 - Fixed Bug #564752
 - Thanks for the patch Terje


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fife/F-13/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	27 Jan 2010 20:42:19 -0000	1.5
+++ import.log	8 Apr 2010 17:39:51 -0000	1.6
@@ -3,3 +3,4 @@ fife-2009_0-0_24_r3056svn_fc11:HEAD:fife
 fife-2009_0-0_25_r3056svn_fc11:HEAD:fife-2009.0-0.25.r3056svn.fc11.src.rpm:1255026957
 fife-2009_0-0_27_r3111svn_fc12:HEAD:fife-2009.0-0.27.r3111svn.fc12.src.rpm:1261513013
 fife-0_3_0-1_fc12:HEAD:fife-0.3.0-1.fc12.src.rpm:1264624947
+fife-0_3_1-1_fc14:F-13:fife-0.3.1-1.fc14.src.rpm:1270748446


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fife/F-13/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	27 Jan 2010 20:42:19 -0000	1.6
+++ sources	8 Apr 2010 17:39:51 -0000	1.7
@@ -1 +1 @@
-64f8dcd88f013cca02dd3c8b4e7e196f  fife-0.3.0.tar.gz
+2d2bc2273eda8d2fe10a8be44eeef7ba  fife-0.3.1.tar.gz


--- fife-0.3.0-dso.patch DELETED ---


--- fife-0.3.0-optflags.patch DELETED ---


--- fife-0.3.0-soname.patch DELETED ---



More information about the scm-commits mailing list