[packages/xorg-app-xrdb] - added mcpp bcond

qboosh qboosh at pld-linux.org
Wed Sep 11 19:30:55 CEST 2013


commit f1379a776da07ca46659209ebe5321f168622867
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Sep 11 19:30:57 2013 +0200

    - added mcpp bcond

 xorg-app-xrdb.spec | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
---
diff --git a/xorg-app-xrdb.spec b/xorg-app-xrdb.spec
index a2ca085..8fdab0b 100644
--- a/xorg-app-xrdb.spec
+++ b/xorg-app-xrdb.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_without	mcpp	# gcc's cpp instead of mcpp
+#
 Summary:	xrdb application - X server resource database utility
 Summary(pl.UTF-8):	Aplikacja xrdb - narzędzie do bazy danych zasobów serwera X
 Name:		xorg-app-xrdb
@@ -13,7 +17,11 @@ BuildRequires:	pkgconfig >= 1:0.19
 BuildRequires:	xorg-lib-libXmu-devel
 BuildRequires:	xorg-proto-xproto-devel >= 7.0.17
 BuildRequires:	xorg-util-util-macros >= 1.8
+%if %{with mcpp}
 Requires:	mcpp
+%else
+Requires:	cpp
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,7 +42,7 @@ razem. Zwykle używa się tego programu z poziomu skryptu startowego X.
 
 %build
 %configure \
-	--with-cpp=/usr/bin/mcpp
+	--with-cpp=/usr/bin/%{?with_mcpp:m}cpp
 
 %{__make}
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-app-xrdb.git/commitdiff/f1379a776da07ca46659209ebe5321f168622867



More information about the pld-cvs-commit mailing list