[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/widelands/devel widelands.flagfix.patch, NONE, 1.1 widelands.spec, NONE, 1.1 widelands.workfix.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2



Author: karlik

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

Modified Files:
	.cvsignore sources 
Added Files:
	widelands.flagfix.patch widelands.spec widelands.workfix.patch 
Log Message:
Release widelands


widelands.flagfix.patch:

--- NEW FILE widelands.flagfix.patch ---
--- ./build/scons-tools/scons_configure.py.flagfix	2007-03-04 18:25:06.000000000 +0100
+++ ./build/scons-tools/scons_configure.py	2007-04-30 11:41:58.000000000 +0200
@@ -319,57 +319,4 @@
 			print 'Could not find efence, so doing a debug-efence build is impossible !'
 			env.Exit(1)
 
-	conf.CheckCompilerFlag('-fstack-protector-all', env)
-	conf.CheckCompilerFlag('-pipe', env)
-	conf.CheckCompilerFlag('-Wall', env)
-	conf.CheckCompilerFlag('-Wcast-align', env)
-	conf.CheckCompilerFlag('-Wcast-qual', env)
-	conf.CheckCompilerFlag('-Wconversion', env)
-	conf.CheckCompilerFlag('-Wdisabled-optimization', env)
-	conf.CheckCompilerFlag('-Wextra', env)
-	#conf.CheckCompilerFlag('-Wfloat-equal', env)
-	#conf.CheckCompilerFlag('-Wformat=2', env)
-	conf.CheckCompilerFlag('-Winline', env)
-	conf.CheckCompilerFlag('-Winvalid-pch', env)
-	conf.CheckCompilerFlag('-Wmissing-format-attribute', env)
-	conf.CheckCompilerFlag('-Wmissing-include-dirs', env)
-	conf.CheckCompilerFlag('-Wmissing-noreturn', env)
-	conf.CheckCompilerFlag('-Wno-comment', env)
-	conf.CheckCompilerFlag('-Wnormalized=nfc', env)
-	#conf.CheckCompilerFlag('-Wold-style-cast', env)
-	#conf.CheckCompilerFlag('-Wpadded', env)
-	conf.CheckCompilerFlag('-Wpointer-arith', env)
-	conf.CheckCompilerFlag('-Wunsafe-loop-optimizations', env)
-	conf.CheckCompilerFlag('-Wshadow', env)
-	conf.CheckCompilerFlag('-Wstack-protector', env)
-	conf.CheckCompilerFlag('-Wstrict-aliasing=2', env)
-	#conf.CheckCompilerFlag('-Wunreachable-code', env)
-	conf.CheckCompilerFlag('-Wwrite-strings', env)
-
-	#conf.CheckCompilerFlag('-Wno-deprecated-declarations', env)
-	#conf.CheckCompilerFlag('-Wno-unused-variable', env)
-	#conf.CheckCompilerFlag('-Wno-unused-parameter', env)
-	#conf.CheckCompilerFlag('-Werror', env)
-
-	if env.optimize:
-		# !!!! -fomit-frame-pointer breaks execeptions !!!!
-		conf.CheckCompilerFlag('-fexpensive-optimizations', env)
-		conf.CheckCompilerFlag('-finline-functions', env)
-		conf.CheckCompilerFlag('-ffast-math', env)
-		conf.CheckCompilerFlag('-funroll-loops', env)
-		conf.CheckCompilerFlag('-O3', env)
-	else:
-		conf.CheckCompilerFlag('-O0', env)
-
-	if env.profile:
-		conf.CheckCompilerFlag('-pg', env)
-		conf.CheckCompilerFlag('-fprofile-arcs', env)
-		conf.CheckLinkerFlag('-pg', env)
-		conf.CheckLinkerFlag('-fprofile-arcs', env)
-
-	if env.debug:
-		conf.CheckCompilerFlag('-g', env)
-		conf.CheckCompilerFlag('-fmessage-length=0', env)
-
-	if env.strip:
-		conf.CheckLinkerFlag('-s', env)
+	conf.CheckCompilerFlag('flagi', env)


--- NEW FILE widelands.spec ---
%define build_id build10
Name:           widelands
Version:        0
Release:        0.3.%{build_id}%{?dist}
Summary:        Open source realtime-strategy game

Group:          Amusements/Games
License:        GPL
URL:            http://www.widelands.org
Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}-%{build_id}-source.tar.bz2
Patch0:         widelands.workfix.patch
Patch1:         widelands.flagfix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: SDL_mixer-devel SDL_image-devel SDL_net-devel SDL_ttf-devel
BuildRequires: desktop-file-utils scons gettext libpng-devel zlib-devel ctags optipng
Requires:      hicolor-icon-theme

%description
Widelands is an open source (GPLed), realtime-strategy game, using SDL and
other free libraries, which is still under development. Widelands is inspired
by Settlers II (Bluebyte) and is partly similar to it, so if you know it, you
perhaps will have a thought, what Widelands is all about. 


%prep
%setup -q -n %{name}
%patch0 -p0
%patch1 -p0
sed -i 's#LOCALE_PATH "locale"#LOCALE_PATH "%{_datadir}/%{name}/locale"##' src/constants.h
sed -i 's#flagi#%{optflags}##' build/scons-tools/scons_configure.py
sed -i 's#doc#txts##' txts/SConscript

%build
scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} build_id=%{build_id}
scons locale datadir=%{_datadir}/%{name} bindir=%{_bindir} build_id=%{build_id}

%install
rm -rf $RPM_BUILD_ROOT
scons install datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} bindir=$RPM_BUILD_ROOT%{_bindir} build_id=%{build_id}
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/game_server

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
cp -a pics/wl-logo-64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
cat > widelands.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=Widelands
GenericName=Realtime Strategy Game
Comment=Build a growing settlement and rule the world
Icon=widelands.png
Exec=widelands
Categories=Game;StrategyGame;
EOF

desktop-file-install --vendor="fedora"                \
  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/   \
        %{name}.desktop
#  --delete-original                                        \

cd $RPM_BUILD_ROOT
find usr/share/widelands/locale/ -maxdepth 1 -type d  -name \*_\* | sed -n 's#\(usr/share/widelands/locale/\(.*\)_.*\)#%lang(\2) /\1#p' >  %{_builddir}/%{name}/%{name}.files

%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%files -f %{name}.files
%defattr(-,root,root,-)
%doc ChangeLog COPYING CREDITS
%{_bindir}/%{name}
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%{_datadir}/applications/fedora-%{name}.desktop
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/locale
%{_datadir}/%{name}/*s*

%changelog
* Sun May 06 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.3.build10
- Changes in .desktop and icon-dir
- Changes in %%postun and %%post sections
- Merge -data subpackage with core package
* Tue May 01 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.2.build10
- Return to first method of versioning
- Some changes in summary and GenericName
- Make spec-file more clear
* Mon Apr 30 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.10.1.build10
- Flagfix
- Change versions numerating
* Sat Apr 28 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.1.build10
- Initial Release

widelands.workfix.patch:

--- NEW FILE widelands.workfix.patch ---
Index: build/scons-tools/Distribute.py
===================================================================
--- build/scons-tools/Distribute.py	(revision 2122)
+++ build/scons-tools/Distribute.py	(working copy)
@@ -17,7 +17,7 @@
 	tmpdir=tempfile.mkdtemp(prefix='widelands-dist.')
 	tarbz2file=tarfile.open(str(target[0])+'.tar.bz2','w:bz2')
 
-	for (name, compress) in set(env['DISTFILES']):  #the set is there to ensure uniqueness
+	for (name, compress) in env['DISTFILES']:
 		if compress:
 			head,tail=os.path.split(name)
 			try:
@@ -64,7 +64,7 @@
 def doinst(target, source, env):
 	tmpdir=tempfile.mkdtemp(prefix='widelands-inst.')
 
-	for (name, location, compress, filetype) in set(env['INSTFILES']):  #the set is there to ensure uniqueness
+	for (name, location, compress, filetype) in env['INSTFILES']:
 		if compress:
 			head,tail=os.path.split(name)
 			try:
Index: maps/SConscript
===================================================================
--- maps/SConscript	(revision 2122)
+++ maps/SConscript	(working copy)
@@ -2,7 +2,7 @@
 from Distribute import *
 import glob
 
-instadd(env, 'maps/*.wmf', 'maps', True)
+instadd(env, 'maps/*.wmf', 'maps')
 
 distadd(env, 'maps/SConscript')
-distadd(env, 'maps/*.wmf', True)
+distadd(env, 'maps/*.wmf')
Index: worlds/SConscript
===================================================================
--- worlds/SConscript	(revision 2122)
+++ worlds/SConscript	(working copy)
@@ -2,6 +2,6 @@
 
 from Distribute import distadd, instadd
 
-instadd(env, 'worlds/*', 'worlds', True)
+instadd(env, 'worlds/*', 'worlds')
 
 distadd(env, 'worlds/*')

--- ./campaigns/SConscript.diff	2007-02-19 20:33:47.000000000 +0100
+++ ./campaigns/SConscript	2007-04-27 13:39:43.000000000 +0200
@@ -2,7 +2,7 @@
 
 from Distribute import distadd, instadd
 
-instadd(env, 'campaigns/*.wmf', 'campaigns', True)
+instadd(env, 'campaigns/*.wmf', 'campaigns')
 
 distadd(env, 'campaigns/SConscript')
-distadd(env, 'campaigns/*.wmf', True)
+distadd(env, 'campaigns/*.wmf')


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/widelands/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 May 2007 23:40:52 -0000	1.1
+++ .cvsignore	7 May 2007 09:29:12 -0000	1.2
@@ -0,0 +1 @@
+widelands-build10-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/widelands/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 May 2007 23:40:52 -0000	1.1
+++ sources	7 May 2007 09:29:12 -0000	1.2
@@ -0,0 +1 @@
+9e452baf7b8f22a27b4e371e2150e017  widelands-build10-source.tar.bz2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]