packages: wesnoth/wesnoth.spec - start update to 1.10 - some changes merged...

lisu lisu at pld-linux.org
Mon Jan 30 11:49:33 CET 2012 

Author: lisu                         Date: Mon Jan 30 10:49:33 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- start update to 1.10
- some changes merged from DEVEL
- nfy

---- Files affected:
packages/wesnoth:
   wesnoth.spec (1.150 -> 1.151) 

---- Diffs:

================================================================
Index: packages/wesnoth/wesnoth.spec
diff -u packages/wesnoth/wesnoth.spec:1.150 packages/wesnoth/wesnoth.spec:1.151
--- packages/wesnoth/wesnoth.spec:1.150	Tue Dec 20 20:36:31 2011
+++ packages/wesnoth/wesnoth.spec	Mon Jan 30 11:49:28 2012
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 # TODO
 # - unpackaged language files
+#
 # Conditional build
 %bcond_without	server	# without server
 %bcond_without	tools	# without tools
@@ -10,17 +11,16 @@
 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.8.6
-Release:	2
+Version:	1.10
+Release:	0.1
 Epoch:		1
 License:	GPL v2+
 Group:		X11/Applications/Games/Strategy
 Source0:	http://downloads.sourceforge.net/wesnoth/%{name}-%{version}.tar.bz2
-# Source0-md5:	f1c3179869b01b61e253e74aeb241034
+# Source0-md5:	707daa13e2f5b3976d9b169aab62dc29
 Source1:	%{name}d.init
-Patch0:		%{name}-libpng.patch
-Patch1:		%{name}-desktop.patch
-Patch2:		%{name}-locale_dir.patch
+Patch0:		%{name}-desktop.patch
+Patch1:		%{name}-locale_dir.patch
 URL:		http://www.wesnoth.org/
 BuildRequires:	SDL-devel >= 1.2.14-4
 BuildRequires:	SDL_image-devel >= 1.2
@@ -40,7 +40,7 @@
 BuildRequires:	pango-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.600
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
 Requires:	SDL >= 1.2.14-4
@@ -97,7 +97,7 @@
 
 %package tools
 Summary:	Tools for Wesnoth
-Summary(hu.UTF-8):	Eszközök a Wesnoth-hoz
+Summary(hu.UTF.8):	Eszközök a Wesnoth-hoz
 Summary(pl.UTF-8):	Narzędzia dla Wesnoth
 Group:		X11/Applications/Games/Strategy
 Requires:	%{name} = %{epoch}:%{version}-%{release}
@@ -115,32 +115,24 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # don't install locales in %{_datadir}/%{name}
-%{__sed} -i 's,${DATADIR}/${LOCALEDIR},${DATAROOTDIR}/${LOCALEDIR},' CMakeLists.txt
-
-# link using libpng instead of libpng12
-%{__sed} -i 's,png12,png,' src/CMakeLists.txt
+%{__sed} -i 's,${DATADIR}/${LOCALEDIR},${LOCALEDIR},' CMakeLists.txt
 
 %build
 install -d build
 cd build
-%cmake .. \
-	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+%cmake \
+	.. \
 	-DENABLE_STRICT_COMPILATION="off" \
 	-DBINDIR="%{_bindir}" \
 	-DMANDIR="%{_mandir}" \
-	-DLOCALEDIR="locale" \
+	-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
+	%{!?with_fribidi:-DENABLE_FRIBIDI="off"}
 
 %{__make}
 
@@ -159,16 +151,17 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/wesnothd
 %endif
 
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{ca_ES,ca}@valencia
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/nb{_NO,}
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/fur{_IT,}
-mv -f $RPM_BUILD_ROOT%{_mandir}/{ca_ES,ca}@valencia
 
-# not supported by glibc (as of 2.13-3)
-# what is racv?
+# unsupported(?)
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ca_ES at valencia
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/la
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/racv
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/en at shaw
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/sr at ijekavian
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/sr at ijekavianlatin
+%{__rm} -r $RPM_BUILD_ROOT%{_mandir}/ca_ES at valencia
 
 # the same as manuals from %{_mandir}/man?
 %{__rm} -r $RPM_BUILD_ROOT%{_mandir}/en_GB
@@ -201,24 +194,16 @@
 %{_mandir}/man6/wesnoth.6*
 %lang(cs) %{_mandir}/cs/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*
 %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(pl) %{_mandir}/pl/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(tr) %{_mandir}/tr/man6/wesnoth.6*
-%lang(zh_CN) %{_mandir}/zh_CN/man6/wesnoth.6*
-%lang(zh_TW) %{_mandir}/zh_TW/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
@@ -245,11 +230,11 @@
 %lang(pl) %{_mandir}/pl/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(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(sr) %{_mandir}/sr/man6/wesnothd.6*
+#%%lang(sr at latin) %{_mandir}/sr at latin/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
 
@@ -266,6 +251,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.151  2012/01/30 10:49:28  lisu
+- start update to 1.10
+- some changes merged from DEVEL
+- nfy
+
 Revision 1.150  2011/12/20 19:36:31  arekm
 - release 2
 
@@ -303,6 +293,49 @@
 Revision 1.140  2010/09/25 14:04:02  lisu
 - up to 1.8.5
 - add Indonesian man pages
+
+Revision 1.139.2.13  2012/01/12 09:46:43  lisu
+- updated to 1.10-rc1 (1.9.14)
+
+Revision 1.139.2.12  2011/12/28 10:47:41  lisu
+- comment out inexistent man pages
+
+Revision 1.139.2.11  2011/12/28 09:23:44  lisu
+- updated to 1.9.13 (1.10-beta4)
+
+Revision 1.139.2.10  2011/11/02 07:53:57  lisu
+- dropped nonexistent man pages
+
+Revision 1.139.2.9  2011/10/31 09:03:47  lisu
+- updated to 1.9.9
+
+Revision 1.139.2.8  2011/07/29 20:55:53  lisu
+- updated to 1.9.8
+
+Revision 1.139.2.7  2011/06/27 09:58:14  lisu
+- updated to 1.9.7
+
+Revision 1.139.2.6  2011/01/19 16:03:36  lisu
+- up to 1.9.4
+- comment out es and tr man pages
+
+Revision 1.139.2.5  2011/01/05 11:00:04  lisu
+- rpm-build-macros >= 1.577 (for dropped cmake options)
+
+Revision 1.139.2.4  2011/01/05 10:58:20  lisu
+- updated to 1.9.3
+- drop unneeded sed hack
+
+Revision 1.139.2.3  2010/11/10 11:45:17  lisu
+- up to 1.9.2
+- add id locales
+
+Revision 1.139.2.2  2010/09/16 09:14:26  lisu
+- 1.9.1
+
+Revision 1.139.2.1  2010/08/19 08:20:44  lisu
+- up to 1.9.0
+- drop obsoleted -libpng.patch
 
 Revision 1.139  2010/08/09 11:35:20  lisu
 - up to 1.8.4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wesnoth/wesnoth.spec?r1=1.150&r2=1.151&f=u

More information about the pld-cvs-commit mailing list