[packages/freeciv] added bcond for modpack

sls sls at pld-linux.org
Thu Jan 8 16:45:23 CET 2015


commit 1508b7a4921e06f4cf2efc085348240e1cdfd3ef
Author: Szymon Siwek <sls at pld-linux.org>
Date:   Thu Jan 8 10:36:56 2015 +0100

    added bcond for modpack

 freeciv.spec | 5 +++++
 1 file changed, 5 insertions(+)
---
diff --git a/freeciv.spec b/freeciv.spec
index 24888d6..9892431 100644
--- a/freeciv.spec
+++ b/freeciv.spec
@@ -4,6 +4,7 @@
 #		GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the same process is not supported
 #	- work on authentication and Freeciv database support (fcdb)
 #	- patch all packaged desktop files
+#	- modpack requires gtk2 or gtk3
 #
 # Conditional build:
 %bcond_without  ggz_client	# build without ggz client
@@ -15,6 +16,7 @@
 %bcond_without	sdl		# build without sdl client
 %bcond_without	xaw		# build without xaw client
 %bcond_with	qt		# build with qt client (broken)
+%bcond_without	modpack		# build without modpack installer
 #
 Summary:	FREE CIVilization clone
 Summary(es.UTF-8):	Clon del juego Civilization
@@ -198,6 +200,7 @@ Ten pakiet zawiera server gry Freeciv.
 	--disable-silent-rules \
 	--enable-client=stub,%{?with_gtk2:gtk2},%{?with_gtk3:gtk3},%{?with_qt:qt},%{?with_sdl:sdl},%{?with_xaw:xaw} \
 	--enable-mapimg=%{?with_magickwand:magickwand}%{!?with_magickwand:no} \
+	%{!?with_modpack:--enable-fcmp=no} \
 	%{?with_system_lua:--enable-sys-lua} \
 	%{!?with_ggz_client:--without-ggz-client} \
 	%{!?with_ggz_server:--without-ggz-server}
@@ -307,6 +310,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/trident
 %{_datadir}/%{name}/wonders
 
+%if %{with modpack}
 %files client-modpack
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/freeciv-modpack
@@ -315,6 +319,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_iconsdir}/hicolor/*/apps/freeciv-modpack.png
 %{_pixmapsdir}/freeciv-modpack.png
 %{_mandir}/man6/freeciv-modpack.6*
+%endif
 
 %if %{with gtk2}
 %files client
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/freeciv.git/commitdiff/6d8e39a0a8ca273845209ce4595134ed108c9198



More information about the pld-cvs-commit mailing list