rpms/widelands/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 widelands.flagfix.patch, 1.4, 1.5 widelands.spec, 1.10, 1.11
Karol Trzcionka
karlik at fedoraproject.org
Sun Nov 16 18:03:50 UTC 2008
Author: karlik
Update of /cvs/pkgs/rpms/widelands/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6898
Modified Files:
.cvsignore sources widelands.flagfix.patch widelands.spec
Log Message:
- Update to Build13rc
- Add %%{?_smp_mflags}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 9 Apr 2008 18:36:27 -0000 1.4
+++ .cvsignore 16 Nov 2008 18:03:19 -0000 1.5
@@ -1 +1 @@
-widelands-build-12-source.tar.bz2
+widelands-Build13rc-src.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 9 Apr 2008 18:36:27 -0000 1.4
+++ sources 16 Nov 2008 18:03:19 -0000 1.5
@@ -1 +1 @@
-1b551106e0f613f63abd7e6bdc9cebf6 widelands-build-12-source.tar.bz2
+8639ce8e357346daa5b60a7ac905f1d9 widelands-Build13rc-src.tar.bz2
widelands.flagfix.patch:
Index: widelands.flagfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/widelands.flagfix.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- widelands.flagfix.patch 9 Apr 2008 18:36:27 -0000 1.4
+++ widelands.flagfix.patch 16 Nov 2008 18:03:19 -0000 1.5
@@ -1,10 +1,10 @@
diff -up ./build/scons-tools/scons_configure.py.flagfix ./build/scons-tools/scons_configure.py
---- ./build/scons-tools/scons_configure.py.flagfix 2008-04-06 20:39:50.000000000 +0200
-+++ ./build/scons-tools/scons_configure.py 2008-04-06 20:40:32.000000000 +0200
-@@ -440,35 +440,7 @@ def do_configure_compiler_warnings(confi
+--- ./build/scons-tools/scons_configure.py.flagfix 2008-10-05 16:59:26.000000000 +0200
++++ ./build/scons-tools/scons_configure.py 2008-11-06 16:21:27.000000000 +0100
+@@ -435,28 +435,7 @@ def do_configure_compiler_warnings(conf,
#conf.CheckCompilerFlag('-Werror', env)
- def do_configure_compiler_features(config_h_file, conf, env):
+ def do_configure_compiler_features(conf, env):
- conf.CheckCompilerFlag('-fstack-protector-all', env)
- conf.CheckCompilerFlag('-fbounds-check', env)
- conf.CheckCompilerFlag('-pipe', env)
@@ -18,6 +18,7 @@
- conf.CheckCompilerFlag('-O3', env)
- else:
- conf.CheckCompilerFlag('-O0', env)
+- conf.CheckCompilerFlag('-funit-at-a-time', env)
-
- if env.profile:
- conf.CheckCompilerFlag('-pg', env)
@@ -26,23 +27,16 @@
- if env.debug:
- conf.CheckCompilerFlag('-g', env)
- conf.CheckCompilerFlag('-fmessage-length=0', env)
--
--def do_configure_linker_features(config_h_file, conf, env):
-- if env.profile:
-- conf.CheckLinkerFlag('-pg', env)
-- conf.CheckLinkerFlag('-fprofile-arcs', env)
--
-- if env.strip:
-- conf.CheckLinkerFlag('-s', env)
+ conf.CheckCompilerFlag('flagi', env)
- def do_configure(conf, env):
- config_h_file=write_configh_header()
-@@ -480,7 +452,6 @@ def do_configure(conf, env):
+ def do_configure_linker_features(conf, env):
+ if env.profile:
+@@ -474,7 +453,7 @@ def do_configure(conf, env):
+
+ do_configure_compiler_warnings(conf, env)
+ do_configure_compiler_features(conf, env)
+- do_configure_linker_features(conf, env)
++ #do_configure_linker_features(conf, env)
- do_configure_compiler_warnings(config_h_file, conf, env)
- do_configure_compiler_features(config_h_file, conf, env)
-- do_configure_linker_features(config_h_file, conf, env)
+ ################################################################################
- write_configh(config_h_file, env)
- write_configh_footer(config_h_file)
Index: widelands.spec
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/widelands.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- widelands.spec 10 Apr 2008 21:13:55 -0000 1.10
+++ widelands.spec 16 Nov 2008 18:03:19 -0000 1.11
@@ -1,21 +1,19 @@
-%define build_id build-12
+%define build_id Build13rc
Name: widelands
Version: 0
-Release: 0.11.build12%{?dist}
+Release: 0.12.%{build_id}%{?dist}
Summary: Open source realtime-strategy game
Group: Amusements/Games
License: GPLv2+
URL: http://www.widelands.org
-Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{build_id}-source.tar.bz2
+Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{build_id}-src.tar.bz2
Patch0: 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 SDL_gfx-devel
BuildRequires: desktop-file-utils scons gettext libpng-devel zlib-devel ctags boost-devel
-%ifnarch ppc64
BuildRequires: optipng
-%endif
Requires: hicolor-icon-theme
@@ -32,11 +30,11 @@
sed -i 's#flagi#%{optflags}##' build/scons-tools/scons_configure.py
%build
-scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} localedir=%{_datadir}/%{name}/locale build_id=%{build_id}
+scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} localedir=%{_datadir}/%{name}/locale install_prefix= prefer_localdata=0 build_id=%{build_id} %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-scons datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} bindir=$RPM_BUILD_ROOT%{_bindir} localedir=$RPM_BUILD_ROOT%{_datadir}/%{name} build_id=%{build_id} install
+scons datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} bindir=$RPM_BUILD_ROOT%{_bindir} localedir=$RPM_BUILD_ROOT%{_datadir}/%{name}/locale build_id=%{build_id} install
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
@@ -58,7 +56,8 @@
%{name}.desktop
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
+find usr/share/widelands/locale/ -maxdepth 1 -type d -name \*_\* | sed -n 's#\(usr/share/widelands/\(.*\)_.*\)#%lang(\2) /\1#p' > %{_builddir}/%{name}/%{name}.files
+find usr/share/widelands/ -mindepth 1 -maxdepth 1 -type d -not -name locale | sed -n 's#\(usr/share/widelands/*\)#/\1#p' >> %{_builddir}/%{name}/%{name}.files
%clean
rm -rf $RPM_BUILD_ROOT
@@ -105,9 +104,11 @@
%{_datadir}/applications/fedora-%{name}.desktop
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/locale
-%{_datadir}/%{name}/*s*
%changelog
+* Sun Nov 16 2008 Karol Trzcionka <karlikt at gmail.com> - 0-0.12.Build13rc
+- Update to Build13rc
+- Add %%{?_smp_mflags}
* Thu Apr 10 2008 Karol Trzcionka <karlikt at gmail.com> - 0-0.11.build12
- Fix BRs
* Wed Apr 09 2008 Karol Trzcionka <karlikt at gmail.com> - 0-0.10.build12
More information about the fedora-extras-commits
mailing list