packages (DEVEL): widelands/widelands.spec, widelands/widelands-locale.patc...

[arvenil]

Author: arvenil                      Date: Sat Apr 17 15:46:01 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to build 15
- added -locale.patch for fix translations
- BR: libjpeg-devel
- BR: libtiff-devel
- rm BR: p7zip
- clean up

---- Files affected:
packages/widelands:
   widelands.spec (1.24.2.2 -> 1.24.2.3) , widelands-locale.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/widelands/widelands.spec
diff -u packages/widelands/widelands.spec:1.24.2.2 packages/widelands/widelands.spec:1.24.2.3
--- packages/widelands/widelands.spec:1.24.2.2	Mon Apr 12 14:20:28 2010
+++ packages/widelands/widelands.spec	Sat Apr 17 17:45:55 2010
@@ -2,20 +2,19 @@
 #
 # TODO:
 # - create bcond for ggz
-# - fix translations
 #
 %define		buildver	15
-%define		_rc		rc2
 Summary:	Game like Settlers II
 Summary(pl.UTF-8):	Remake gry Settlers II
 Name:		widelands
 Version:	0.build%{buildver}
-Release:	0.%{_rc}.1
+Release:	0.1
 License:	GPL v2+
 Group:		X11/Applications/Games
-Source0:	http://launchpad.net/widelands/build%{buildver}/build%{buildver}-%{_rc}/+download/%{name}-build%{buildver}-%{_rc}-src.tar.bz2
-# Source0-md5:	ed10901e3c4e5a45c9d61b4c3682886e
+Source0:	http://launchpad.net/widelands/build%{buildver}/build%{buildver}/+download/%{name}-build%{buildver}-src.tar.bz2
+# Source0-md5:	5b2e2d0913272f66055e424f91360b1d
 Source1:	%{name}.desktop
+Patch0:		%{name}-locale.patch
 URL:		http://widelands.sourceforge.net/
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	OpenGL-devel
@@ -28,9 +27,10 @@
 BuildRequires:	boost-devel >= 1.35
 BuildRequires:	cmake
 BuildRequires:	gettext-devel
+BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	p7zip
+BuildRequires:	libtiff-devel
 Requires:	SDL_image >= 1.2.10
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -56,18 +56,22 @@
 światem, będziesz musiał wyszkolić żołnierzy i walczyć.
 
 %prep
-%setup -q -n %{name}-build%{buildver}-%{_rc}-src
+%setup -q -n %{name}-build%{buildver}-src
+%patch0 -p1
 
 %build
 install -d build
 cd build
-%cmake .. \
+%cmake \
 	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-DWL_INSTALL_BINDIR=bin
+	-DWL_INSTALL_BINDIR=%{_bindir} \
+	-DWL_INSTALL_DATADIR=%{_datadir}/games/%{name} \
+	-DWL_INSTALL_LOCALEDIR=%{_datadir}/games/%{name}/locale \
 %if "%{_lib}" == "lib64"
-	-DLIB_SUFFIX=64
+	-DLIB_SUFFIX=64 \
 %endif
+	..
 
 %{__make}
 
@@ -140,6 +144,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24.2.3  2010/04/17 15:45:55  arvenil
+- up to build 15
+- added -locale.patch for fix translations
+- BR: libjpeg-devel
+- BR: libtiff-devel
+- rm BR: p7zip
+- clean up
+
 Revision 1.24.2.2  2010/04/12 12:20:28  lisu
 - proper rel
 - TODO

================================================================
Index: packages/widelands/widelands-locale.patch
diff -u /dev/null packages/widelands/widelands-locale.patch:1.1
--- /dev/null	Sat Apr 17 17:46:01 2010
+++ packages/widelands/widelands-locale.patch	Sat Apr 17 17:45:55 2010
@@ -0,0 +1,11 @@
+--- widelands-build15-src/CMakeLists.txt	2010-04-16 15:41:22.000000000 +0000
++++ widelands-build15-src/CMakeLists.txt	2010-04-17 14:43:42.000000000 +0000
+@@ -79,7 +79,7 @@
+ 
+ set (WLBUILD_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (WLBUILD_INSTALL_DATADIR ${WL_INSTALL_DATADIR})
+-set (WLBUILD_INSTALL_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${WL_INSTALL_DATADIR}/locale")
++set (WLBUILD_INSTALL_LOCALEDIR ${WL_INSTALL_LOCALEDIR})
+ set (WLBUILD_INSTALL_BINDIR ${WL_INSTALL_BINDIR})
+ 
+ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/widelands/widelands.spec?r1=1.24.2.2&r2=1.24.2.3&f=u