X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=wesnoth.spec;h=603932c5a0f37a5bbb34812f429c1fa59a9e92d3;hb=2bf53405f2ab920da349a307371b552b61415b47;hp=5351d8715620f3603bbdf5b7aca0726af4c97647;hpb=849d6ccd24a01d6185f6bd16a4cc652def0c2f67;p=packages%2Fwesnoth.git

diff --git a/wesnoth.spec b/wesnoth.spec
index 5351d87..603932c 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -1,50 +1,55 @@
 # TODO
+# - system lua?
 # - unpackaged language files
+#
 # Conditional build
 %bcond_without	server	# without server
 %bcond_without	tools	# without tools
 %bcond_without	fribidi	# without Bidirectional language support
-#
+
 Summary:	Strategy game with a fantasy theme
 Summary(hu.UTF-8):	Fantasy környezetben játszódó stratégiai játék
-Summary(pl.UTF-8):	Strategiczna gra z motywem fantasy
+Summary(pl.UTF-8):	Gra strategiczna z motywem fantasy
 Name:		wesnoth
-Version:	1.6.5
-Release:	2
+Version:	1.10.7
+Release:	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:	3f460a494530d32aa5d5d0f19c95efbd
 Source1:	%{name}d.init
-Patch0:		%{name}-Makefile.patch
+Source2:	%{name}.tmpfiles
+Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-locale_dir.patch
-Patch2:		%{name}-werror.patch
-Patch3:		%{name}-desktop.patch
 URL:		http://www.wesnoth.org/
-BuildRequires:	SDL-devel >= 1.2.7
+BuildRequires:	SDL-devel >= 1.2.14-4
 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:	boost-devel >= 1.33
+BuildRequires:	boost-devel >= 1.36
+BuildRequires:	cmake >= 2.6.0
+BuildRequires:	dbus-devel
+BuildRequires:	fontconfig-devel >= 2.4.1
 %{?with_fribidi:BuildRequires:	fribidi-devel}
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtool >= 2:1.5
-BuildRequires:	libvorbis-devel
-BuildRequires:	p7zip
-BuildRequires:	pkg-config
-BuildRequires:	python-devel
+BuildRequires:	pango-devel >= 1:1.14.8
+BuildRequires:	pkgconfig
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.605
 BuildRequires:	sed >= 4.0
-BuildRequires:	zipios++-devel
-# sr@Latn vs. sr@latin
-Conflicts:	glibc-misc < 6:2.7
+BuildRequires:	xorg-lib-libICE-devel
+BuildRequires:	xorg-lib-libSM-devel
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	zlib-devel
+Requires:	%{name}-data = %{epoch}:%{version}
+Requires:	SDL >= 1.2.14-4
+Requires:	fontconfig >= 2.4.1
+Requires:	pango >= 1:1.14.8
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -80,8 +85,8 @@ Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires:	rc-scripts >= 0.4.0.17
-# sr@Latn vs. sr@latin
-Conflicts:	glibc-misc < 6:2.7
+Provides:	group(wesnothd)
+Provides:	user(wesnothd)
 
 %description server
 Server for playing networked games of Wesnoth.
@@ -108,63 +113,79 @@ Pályaszerkesztők és fordítási eszközök.
 %description tools -l pl.UTF-8
 Edytor map i narzędzia do tłumaczeń.
 
+%package data
+Summary:	Strategy game with a fantasy theme - data files
+Summary(pl.UTF-8):	Gra strategiczna z motywem fantasy - pliki danych
+Group:		Applications/Games
+%if "%{_rpmversion}" >= "4.6"
+BuildArch:	noarch
+%endif
+
+%description data
+This package contains the data files for Wesnoth.
+
+%description data -l pl.UTF-8
+Ten pakiet zawiera pliki danych dla gry Wesnoth.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -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
+
+%{__sed} -i '1s,/usr/bin/env python$,%{__python},' \
+	data/tools/{about_cfg_to_wiki,expand-terrain-macros.py,extractbindings,imgcheck,journeylifter,scoutDefault.py,terrain2wiki.py,trackplacer,wesnoth_addon_manager,wmlflip,wmlindent,wmllint,wmllint_gui,wmlmove,wmlscope,wmlunits,wmlvalidator,wmlxgettext} \
+	data/tools/unit_tree/{TeamColorizer,overview.py} \
+	data/tools/wesnoth/{blacklist.py,wescamp.py,wmldata.py,wmlparser.py,wmlparser2.py}
+
+%{__sed} -i '1s,/usr/bin/python$,%{__python},' data/tools/terrain2wiki.py
 
 %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 \
+	.. \
+	-DENABLE_STRICT_COMPILATION="off" \
+	-DBINDIR="%{_bindir}" \
+	-DMANDIR="%{_mandir}" \
+	-DLOCALEDIR="%{_localedir}" \
+	%{!?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"}
+
 %{__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}}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/var/run/wesnothd,/etc/rc.d/init.d} \
+	$RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{_docdir}/%{name}-%{version}}
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# install additional docs
-install changelog README  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-gzip -9nf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/{changelog,README}
-
 %if %{with server}
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/wesnothd
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/wesnothd
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 %endif
 
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{nb_NO,nb}
+# unify
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{ca_ES@valencia,ca@valencia}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{nb_NO,nb}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{fur_IT,fur}
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/{ca_ES@valencia,ca@valencia}
 
 # unsupported(?)
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/ca_ES@valencia
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/fur_IT
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/la
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/racv
-rm -rf $RPM_BUILD_ROOT%{_mandir}/ca_ES@valencia
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ang@latin
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/racv
+%{__rm} -r $RPM_BUILD_ROOT%{_mandir}/sr@ijekavian
+%{__rm} -r $RPM_BUILD_ROOT%{_mandir}/sr@ijekavianlatin
 
 # 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
+%{__rm} -r $RPM_BUILD_ROOT%{_mandir}/en_GB
 
 %find_lang %{name} --all-name
 
@@ -189,34 +210,35 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc %{_docdir}/%{name}-%{version}
+%doc README changelog
+%doc %{_docdir}/%{name}
 %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*
+%lang(es) %{_mandir}/es/man6/wesnoth.6*
 %lang(fi) %{_mandir}/fi/man6/wesnoth.6*
 %lang(fr) %{_mandir}/fr/man6/wesnoth.6*
 %lang(gl) %{_mandir}/gl/man6/wesnoth.6*
 %lang(hu) %{_mandir}/hu/man6/wesnoth.6*
+%lang(id) %{_mandir}/id/man6/wesnoth.6*
 %lang(it) %{_mandir}/it/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) %{_mandir}/pt/man6/wesnoth.6*
+%lang(ru) %{_mandir}/ru/man6/wesnoth.6*
 %lang(sk) %{_mandir}/sk/man6/wesnoth.6*
 %lang(sr) %{_mandir}/sr/man6/wesnoth.6*
 %lang(sr@latin) %{_mandir}/sr@latin/man6/wesnoth.6*
-%lang(sv) %{_mandir}/sv/man6/wesnoth.6*
-%lang(tr) %{_mandir}/tr/man6/wesnoth.6*
+%lang(uk) %{_mandir}/uk/man6/wesnoth.6*
+%lang(vi) %{_mandir}/vi/man6/wesnoth.6*
 %lang(zh_CN) %{_mandir}/zh_CN/man6/wesnoth.6*
 %lang(zh_TW) %{_mandir}/zh_TW/man6/wesnoth.6*
-%{_datadir}/%{name}
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*-icon.png
+%{_desktopdir}/wesnoth.desktop
+%{_desktopdir}/wesnoth_editor.desktop
+%{_pixmapsdir}/wesnoth-icon.png
+%{_pixmapsdir}/wesnoth_editor-icon.png
 
 %if %{with server}
 %files server
@@ -226,27 +248,31 @@ fi
 %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(gl) %{_mandir}/gl/man6/wesnothd.6*
 %lang(hu) %{_mandir}/hu/man6/wesnothd.6*
+%lang(id) %{_mandir}/id/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) %{_mandir}/pt/man6/wesnothd.6*
+%lang(pt_BR) %{_mandir}/pt_BR/man6/wesnothd.6*
+%lang(ru) %{_mandir}/ru/man6/wesnothd.6*
+%lang(sk) %{_mandir}/sk/man6/wesnothd.6*
 %lang(sr) %{_mandir}/sr/man6/wesnothd.6*
 %lang(sr@latin) %{_mandir}/sr@latin/man6/wesnothd.6*
-%lang(sv) %{_mandir}/sv/man6/wesnothd.6*
 %lang(tr) %{_mandir}/tr/man6/wesnothd.6*
+%lang(uk) %{_mandir}/uk/man6/wesnothd.6*
+%lang(vi) %{_mandir}/vi/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
+%{systemdtmpfilesdir}/%{name}.conf
 %endif
 
 %if %{with tools}
@@ -254,10 +280,10 @@ fi
 %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]
+%attr(755,root,root) %{_bindir}/schema_generator
+%attr(755,root,root) %{_bindir}/schema_validator
 %endif
+
+%files data
+%defattr(644,root,root,755)
+%{_datadir}/%{name}