packages: wesnoth/wesnoth.spec - wrong branch, reversed

lisu lisu at pld-linux.org
Thu Aug 20 13:02:09 CEST 2009 

Author: lisu                         Date: Thu Aug 20 11:02:09 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- wrong branch, reversed

---- Files affected:
packages/wesnoth:
   wesnoth.spec (1.114 -> 1.115) 

---- Diffs:

================================================================
Index: packages/wesnoth/wesnoth.spec
diff -u packages/wesnoth/wesnoth.spec:1.114 packages/wesnoth/wesnoth.spec:1.115
--- packages/wesnoth/wesnoth.spec:1.114	Thu Aug 20 12:58:06 2009
+++ packages/wesnoth/wesnoth.spec	Thu Aug 20 13:02:04 2009
@@ -1,8 +1,6 @@
 # $Revision$, $Date$
 # TODO
-# - rename language files sr at latin to sr at Latn and include them
 # - use desktop file included with project (consider which one are better)
-# - dont know what should I do with sr at latin man pages
 # - unpackaged language files
 # Conditional build
 %bcond_without	server	# without server
@@ -13,18 +11,19 @@
 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.7.3
-Release:	0.1
+Version:	1.6.4
+Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		X11/Applications/Games/Strategy
 Source0:	http://dl.sourceforge.net/wesnoth/%{name}-%{version}.tar.bz2
-# Source0-md5:	d641a65106ffbc1da09f47538bcce9e6
+# Source0-md5:	c8bc4c5b2be28e29563dfe3f89eafd51
 Source1:	%{name}.desktop
 Source2:	%{name}_editor.desktop
 Source3:	%{name}d.init
-Patch0:		%{name}-locale_dir.patch
-Patch1:		%{name}-werror.patch
+Patch0:		%{name}-Makefile.patch
+Patch1:		%{name}-locale_dir.patch
+Patch2:		%{name}-werror.patch
 URL:		http://www.wesnoth.org/
 BuildRequires:	SDL-devel >= 1.2.7
 BuildRequires:	SDL_image-devel >= 1.2
@@ -40,13 +39,14 @@
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libvorbis-devel
-BuildRequires:	lua51-devel
 BuildRequires:	pkg-config
 BuildRequires:	python-devel
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 BuildRequires:	zipios++-devel
+# sr at Latn vs. sr at latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -73,6 +73,7 @@
 
 %package server
 Summary:	Network server for Wesnoth
+Summary(hu.UTF-8):	Hálózati szerver Wesnoth-hoz
 Summary(pl.UTF-8):	Sieciowy serwer dla Wesnoth
 Group:		X11/Applications/Games/Strategy
 Requires(post,preun):	/sbin/chkconfig
@@ -81,6 +82,8 @@
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires:	rc-scripts >= 0.4.0.17
+# sr at Latn vs. sr at latin
+Conflicts:	glibc-misc < 6:2.7
 
 %description server
 Server for playing networked games of Wesnoth.
@@ -111,8 +114,8 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %{__sed} -i 's,$PYTHON_PREFIX"/lib/,"%{_libdir}/,g' configure.ac
-%{__sed} -i 's,lua5.1,lua51,' configure.ac
 
 %build
 %{__gettextize}
@@ -196,7 +199,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(fi) %{_mandir}/fi/man6/wesnoth.6*
 %lang(fr) %{_mandir}/fr/man6/wesnoth.6*
 %lang(gl) %{_mandir}/gl/man6/wesnoth.6*
@@ -209,7 +211,8 @@
 #%%lang(ru) %{_mandir}/ru/man6/wesnoth.6*
 %lang(sk) %{_mandir}/sk/man6/wesnoth.6*
 %lang(sr) %{_mandir}/sr/man6/wesnoth.6*
-#%%lang(sv) %{_mandir}/sv/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,7 +231,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*
@@ -240,10 +242,11 @@
 %lang(pl) %{_mandir}/pl/man6/wesnothd.6*
 #%%lang(sk) %{_mandir}/sk/man6/wesnothd.6*
 %lang(sr) %{_mandir}/sr/man6/wesnothd.6*
-#%%lang(sv) %{_mandir}/sv/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*
+%lang(zh_TW) %{_mandir}/zh_TW/man6/wesnothd.6*
 %attr(770,wesnothd,wesnothd) %dir /var/run/wesnothd
 %endif
 
@@ -288,26 +291,30 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.115  2009/08/20 11:02:04  lisu
+- wrong branch, reversed
+
 Revision 1.114  2009/08/20 10:58:06  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.113  2009/07/23 12:36:02  lisu
+- wesnoth and wesnoth-server conflict with glibc-misc < 6:2.7 (sr at Latn vs. sr at latin)
+
+Revision 1.112  2009/07/23 12:18:09  lisu
+- sr at latin is proper locale - included
+
+Revision 1.111  2009/07/08 08:25:12  lisu
+- up to 1.6.4
+- disable Werror flag causing build problems (werror.patch)
+- zh_TW man pages restored
+
+Revision 1.110  2009/07/06 07:29:52  uzsolt
+- up to 1.6.3
+- new TODO item
 
-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.109  2009/06/12 08:42:08  uzsolt
+- missed hu summary added
 
 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.114&r2=1.115&f=u

More information about the pld-cvs-commit mailing list