packages: stone_soup/stone_soup.spec - tiles bcond (build tiles version by ...

[lisu]

Author: lisu                         Date: Fri Aug 14 08:21:24 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- tiles bcond (build tiles version by default)
- BRs for tiles version: OpenGL-GLU-devel, OpenGL-devel, SDL_image-devel, freetype-devel, libpng-devel
- update patches for tiles version, add tiles.patch

---- Files affected:
packages/stone_soup:
   stone_soup.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: packages/stone_soup/stone_soup.spec
diff -u packages/stone_soup/stone_soup.spec:1.11 packages/stone_soup/stone_soup.spec:1.12
--- packages/stone_soup/stone_soup.spec:1.11	Thu Aug 13 15:08:25 2009
+++ packages/stone_soup/stone_soup.spec	Fri Aug 14 10:21:19 2009
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	tiles		# build tiles version
+#
 Summary:	stone soup :: crawl clone
 Summary(pl.UTF-8):	stone soup :: klon crawla
 Name:		stone_soup
@@ -12,12 +16,20 @@
 Patch1:		%{name}-makefile.patch
 Patch2:		%{name}-systemsqlite3.patch
 Patch3:		%{name}-cflags.patch
+Patch4:		%{name}-tiles.patch
 URL:		http://crawl-ref.sourceforge.net/
+%if %{with tiles}
+BuildRequires:	OpenGL-GLU-devel
+BuildRequires:	OpenGL-devel
+%endif
+%{?with_tiles:BuildRequires:	SDL_image-devel}
 BuildRequires:	bison
 BuildRequires:	byacc
 BuildRequires:	flex
+%{?with_tiles:BuildRequires:	freetype-devel}
+%{?with_tiles:BuildRequires:	libpng-devel}
 BuildRequires:	lua51-devel
-BuildRequires:	ncurses-devel
+%{!?with_tiles:BuildRequires:	ncurses-devel}
 BuildRequires:	sqlite3-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -45,9 +57,13 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%if %{with tiles}
+%patch4 -p1
+%endif
 
 %build
 %{__make} -C source \
+	%{?with_tiles:MAKEFILE=makefile_tiles.unix} \
 	CXX="%{__cxx}" \
 	OPTFLAGS="%{rpmcxxflags}" \
 	LDFLAGS="%{rpmldflags}"
@@ -56,6 +72,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} -C source install \
+	%{?with_tiles:MAKEFILE=makefile_tiles.unix} \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -74,6 +91,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2009/08/14 08:21:19  lisu
+- tiles bcond (build tiles version by default)
+- BRs for tiles version: OpenGL-GLU-devel, OpenGL-devel, SDL_image-devel, freetype-devel, libpng-devel
+- update patches for tiles version, add tiles.patch
+
 Revision 1.11  2009/08/13 13:08:25  lisu
 - typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/stone_soup/stone_soup.spec?r1=1.11&r2=1.12&f=u