packages: wesnoth/wesnoth.spec - updated to 1.8 - merges from DEVEL - add s...
lisu
lisu at pld-linux.org
Fri Mar 26 11:04:20 CET 2010
Author: lisu Date: Fri Mar 26 10:04:20 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.8
- merges from DEVEL
- add sk man pages
---- Files affected:
packages/wesnoth:
wesnoth.spec (1.127 -> 1.128)
---- Diffs:
================================================================
Index: packages/wesnoth/wesnoth.spec
diff -u packages/wesnoth/wesnoth.spec:1.127 packages/wesnoth/wesnoth.spec:1.128
--- packages/wesnoth/wesnoth.spec:1.127 Tue Feb 16 20:07:37 2010
+++ packages/wesnoth/wesnoth.spec Fri Mar 26 11:04:11 2010
@@ -1,6 +1,8 @@
# $Revision$, $Date$
# TODO
+# - use desktop file included with project (consider which one are better)
# - unpackaged language files
+# - fix lacales (seems broken)
# Conditional build
%bcond_without server # without server
%bcond_without tools # without tools
@@ -10,40 +12,36 @@
Summary(hu.UTF-8): Fantasy környezetben játszódó stratégiai játék
Summary(pl.UTF-8): Strategiczna gra z motywem fantasy
Name: wesnoth
-Version: 1.6.5
-Release: 3
+Version: 1.8
+Release: 0.1
Epoch: 1
License: GPL v2+
Group: X11/Applications/Games/Strategy
-Source0: http://dl.sourceforge.net/wesnoth/%{name}-%{version}.tar.bz2
-# Source0-md5: 493826bbd9ba355930765a7e8fe3749a
+Source0: http://downloads.sourceforge.net/wesnoth/%{name}-%{version}.tar.bz2
+# Source0-md5: 07e4b97512e307c54dcfd86659a61e41
Source1: %{name}d.init
-Patch0: %{name}-Makefile.patch
-Patch1: %{name}-locale_dir.patch
-Patch2: %{name}-werror.patch
-Patch3: %{name}-desktop.patch
-Patch4: %{name}-libpng.patch
+Patch0: %{name}-libpng.patch
+Patch1: %{name}-desktop.patch
URL: http://www.wesnoth.org/
BuildRequires: SDL-devel >= 1.2.7
BuildRequires: SDL_image-devel >= 1.2
BuildRequires: SDL_mixer-devel >= 1.2
BuildRequires: SDL_net-devel >= 1.2
BuildRequires: SDL_ttf-devel >= 2.0.8
-BuildRequires: autoconf >= 2.59
-BuildRequires: automake >= 1:1.9
+BuildRequires: asciidoc
BuildRequires: boost-devel >= 1.33
+BuildRequires: cmake >= 2.4
%{?with_fribidi:BuildRequires: fribidi-devel}
BuildRequires: gettext-devel
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
-BuildRequires: libtool >= 2:1.5
BuildRequires: libvorbis-devel
+BuildRequires: lua51-devel
BuildRequires: pango-devel
-BuildRequires: pkgconfig
-BuildRequires: python-devel
-BuildRequires: rpm-pythonprov
+BuildRequires: pkg-config
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: sed >= 4.0
+BuildRequires: zlib-devel
# sr at Latn vs. sr at latin
Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -113,35 +111,36 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%{__sed} -i 's,$PYTHON_PREFIX"/lib/,"%{_libdir}/,g' configure.ac
+
+# don't install locales in %{_datadir}/%{name}
+%{__sed} -i 's,${DATADIR}/${LOCALEDIR},${LOCALEDIR},' CMakeLists.txt
%build
-%{__gettextize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- PYTHON_VERSION=%{py_ver} \
- %{?with_server:--enable-server} \
- %{?with_server:--enable-campaign-server} \
- --enable-python-install \
- %{?with_tools:--enable-editor} \
- %{?with_tools:--enable-tools} \
- --with%{!?with_fribidi:out}-fribidi \
- --docdir=%{_docdir}/%{name}-%{version} \
- --with-icondir=%{_pixmapsdir} \
- --with-zipios
+install -d build
+cd build
+%cmake .. \
+ -DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
+ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DENABLE_STRICT_COMPILATION="off" \
+ -DBINDIR="%{_bindir}" \
+ -DMANDIR="%{_mandir}" \
+ -DLOCALEDIR="%{_datadir}/locale" \
+ %{!?with_server:-DENABLE_SERVER="off"} \
+ %{?with_server:-DENABLE_CAMPAIGN_SERVER="on"} \
+ %{!?with_tools:-DENABLE_EDITOR="off"} \
+ %{?with_tools:-DENABLE_TOOLS="on"} \
+ %{!?with_fribidi:-DENABLE_FRIBIDI="off"} \
+%if "%{_lib}" == "lib64"
+ -DLIB_SUFFIX=64
+%endif
+
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/var/run/wesnothd,/etc/rc.d/init.d,%{_docdir}/%{name}-%{version}}
-%{__make} install \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
# install additional docs
@@ -159,15 +158,13 @@
rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/ca_ES at valencia
rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/la
rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/racv
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/en at shaw
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/sr at ijekavian
rm -rf $RPM_BUILD_ROOT%{_mandir}/ca_ES at valencia
# the same as manuals from %{_mandir}/man?
rm -rf $RPM_BUILD_ROOT%{_mandir}/en_GB
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-%py_postclean
-
%find_lang %{name} --all-name
%clean
@@ -195,7 +192,6 @@
%attr(755,root,root) %{_bindir}/wesnoth
%{_mandir}/man6/wesnoth.6*
%lang(cs) %{_mandir}/cs/man6/wesnoth.6*
-#%%lang(da) %{_mandir}/da/man6/wesnoth.6*
%lang(de) %{_mandir}/de/man6/wesnoth.6*
%lang(es) %{_mandir}/es/man6/wesnoth.6*
%lang(et) %{_mandir}/et/man6/wesnoth.6*
@@ -204,15 +200,13 @@
%lang(gl) %{_mandir}/gl/man6/wesnoth.6*
%lang(hu) %{_mandir}/hu/man6/wesnoth.6*
%lang(it) %{_mandir}/it/man6/wesnoth.6*
-#%%lang(ja) %{_mandir}/ja/man6/wesnoth.6*
+%lang(ja) %{_mandir}/ja/man6/wesnoth.6*
%lang(lt) %{_mandir}/lt/man6/wesnoth.6*
-#%%lang(nl) %{_mandir}/nl/man6/wesnoth.6*
%lang(pl) %{_mandir}/pl/man6/wesnoth.6*
-#%%lang(ru) %{_mandir}/ru/man6/wesnoth.6*
+%lang(pt_BR) %{_mandir}/pt_BR/man6/wesnoth.6*
%lang(sk) %{_mandir}/sk/man6/wesnoth.6*
%lang(sr) %{_mandir}/sr/man6/wesnoth.6*
%lang(sr at latin) %{_mandir}/sr at latin/man6/wesnoth.6*
-%lang(sv) %{_mandir}/sv/man6/wesnoth.6*
%lang(tr) %{_mandir}/tr/man6/wesnoth.6*
%lang(zh_CN) %{_mandir}/zh_CN/man6/wesnoth.6*
%lang(zh_TW) %{_mandir}/zh_TW/man6/wesnoth.6*
@@ -228,26 +222,22 @@
%attr(754,root,root) /etc/rc.d/init.d/wesnothd
%{_mandir}/man6/wesnothd.6*
%lang(cs) %{_mandir}/cs/man6/wesnothd.6*
-#%%lang(da) %{_mandir}/da/man6/wesnothd.6*
%lang(de) %{_mandir}/de/man6/wesnothd.6*
%lang(es) %{_mandir}/es/man6/wesnothd.6*
%lang(et) %{_mandir}/et/man6/wesnothd.6*
%lang(fi) %{_mandir}/fi/man6/wesnothd.6*
%lang(fr) %{_mandir}/fr/man6/wesnothd.6*
-#%%lang(gl) %{_mandir}/gl/man6/wesnothd.6*
%lang(hu) %{_mandir}/hu/man6/wesnothd.6*
%lang(it) %{_mandir}/it/man6/wesnothd.6*
-#%lang(ja) %{_mandir}/ja/man6/wesnothd.6*
+%lang(ja) %{_mandir}/ja/man6/wesnothd.6*
%lang(lt) %{_mandir}/lt/man6/wesnothd.6*
-#%%lang(nl) %{_mandir}/nl/man6/wesnothd.6*
%lang(pl) %{_mandir}/pl/man6/wesnothd.6*
-#%%lang(sk) %{_mandir}/sk/man6/wesnothd.6*
+%lang(pt_BR) %{_mandir}/pt_BR/man6/wesnothd.6*
+%lang(sk) %{_mandir}/sk/man6/wesnothd.6*
%lang(sr) %{_mandir}/sr/man6/wesnothd.6*
%lang(sr at latin) %{_mandir}/sr at latin/man6/wesnothd.6*
-%lang(sv) %{_mandir}/sv/man6/wesnothd.6*
%lang(tr) %{_mandir}/tr/man6/wesnothd.6*
%lang(zh_CN) %{_mandir}/zh_CN/man6/wesnothd.6*
-%lang(zh_TW) %{_mandir}/zh_TW/man6/wesnothd.6*
%attr(770,wesnothd,wesnothd) %dir /var/run/wesnothd
%endif
@@ -256,12 +246,6 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/cutter
%attr(755,root,root) %{_bindir}/exploder
-%attr(755,root,root) %{_bindir}/wesnoth_addon_manager
-%attr(755,root,root) %{_bindir}/wmlindent
-%attr(755,root,root) %{_bindir}/wmllint
-%attr(755,root,root) %{_bindir}/wmlscope
-%dir %{py_sitedir}/%{name}
-%{py_sitedir}/%{name}/*.py[co]
%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -270,6 +254,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.128 2010/03/26 10:04:11 lisu
+- updated to 1.8
+- merges from DEVEL
+- add sk man pages
+
Revision 1.127 2010/02/16 19:07:37 ankry
- cleaning
@@ -335,6 +324,80 @@
Revision 1.109 2009/06/12 08:42:08 uzsolt
- missed hu summary added
+
+Revision 1.108.2.18 2010/03/15 13:11:09 lisu
+- updated to 1.7.15
+- don't install editor's desktop and icon with -tools packages (editor is now embedded into gamie binary)
+
+Revision 1.108.2.17 2010/03/12 08:00:23 lisu
+- BR: zlib-devel
+
+Revision 1.108.2.16 2010/03/12 07:56:41 lisu
+- updated to 1.7.14
+- switch to scons build system (autotools are going to be deprecated)
+ - proper BRs
+ - some patches are no longer needed
+ - scons styled build options
+- no python stuff build supported
+- files clean up (some merges from HEAD)
+- TODO: fix languages
+
+Revision 1.108.2.15 2010/02/11 15:05:33 lisu
+- up to 1.7.13 (still problems with static libs)
+- add -libpng.patch (merged from HEAD)
+
+Revision 1.108.2.14 2010/02/01 13:16:35 lisu
+- start update to 1.7.12
+- libtoolize, fix confgiure.ac by changing obsolete AC_PROG_RANLIB to LT_INIT
+- errors (TODO)
+
+Revision 1.108.2.13 2009/12/22 11:47:23 lisu
+- updated to 1.7.10
+
+Revision 1.108.2.12 2009/12/03 10:40:00 lisu
+- up to 1.7.9
+- include pt_BR and sr at latin man pages
+- remove unsupported en at shaw locale
+
+Revision 1.108.2.11 2009/11/12 12:00:26 lisu
+- up to 1.7.8
+fixes [CVE-2007-2383] [CVE-2008-7720]
+
+Revision 1.108.2.10 2009/10/26 09:54:17 lisu
+- up to 1.7.7
+
+Revision 1.108.2.9 2009/10/05 08:02:05 lisu
+- up to 1.7.6
+
+Revision 1.108.2.8 2009/09/14 10:04:24 lisu
+- up to 1.7.5
+
+Revision 1.108.2.7 2009/09/02 09:20:47 lisu
+- up to 1.7.4
+
+Revision 1.108.2.6 2009/08/20 11:05:04 lisu
+- remove bogus commit log
+
+Revision 1.108.2.5 2009/08/20 11:04:25 lisu
+- up to 1.7.3
+- estonian translation
+
+Revision 1.108.2.4 2009/07/23 08:02:09 lisu
+- updated to 1.7.2
+
+Revision 1.108.2.3 2009/07/08 10:10:55 lisu
+- up to 1.7.1
+- disable -Werror (use patch from HEAD)
+
+Revision 1.108.2.2 2009/06/05 13:59:06 lisu
+- notice patch removal in previous log
+
+Revision 1.108.2.1 2009/06/05 13:54:02 lisu
+- up to 1.7.0
+- search for lua51 instead od lua5.1 (sed)
+- BR: lua51-devel
+- changes in files (man pages)
+- -Makefile.patch is now outdated
Revision 1.108 2009/06/05 08:55:28 lisu
- up to 1.6.2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wesnoth/wesnoth.spec?r1=1.127&r2=1.128&f=u
More information about the pld-cvs-commit
mailing list