PLD-doc: BuildRequires.txt - use preamble macros in a way which allows to c...

qboosh qboosh at pld-linux.org
Sun Aug 29 07:32:17 CEST 2010


Author: qboosh                       Date: Sun Aug 29 05:32:17 2010 GMT
Module: PLD-doc                       Tag: HEAD
---- Log message:
- use preamble macros in a way which allows to check rpm-build-macros BR, not just emit syntax error

---- Files affected:
PLD-doc:
   BuildRequires.txt (1.144 -> 1.145) 

---- Diffs:

================================================================
Index: PLD-doc/BuildRequires.txt
diff -u PLD-doc/BuildRequires.txt:1.144 PLD-doc/BuildRequires.txt:1.145
--- PLD-doc/BuildRequires.txt:1.144	Fri Jul  9 08:17:29 2010
+++ PLD-doc/BuildRequires.txt	Sun Aug 29 07:32:11 2010
@@ -382,7 +382,7 @@
 # Directory provided by jpackage-utils >= 1.7.5-2
 
 %required_jdk
-%buildrequires_jdk
+%{?buildrequires_jdk}
 BuildRequires:	rpmbuild(macros) >= 1.556
 
 %_tomcatconfdir
@@ -432,10 +432,10 @@
 %xorg_xserver_xinput_abi
 BuildRequires: rpmbuild(macros) >= 1.392
 
-%requires_xorg_xserver_extension
-%requires_xorg_xserver_xinput
-%requires_xorg_xserver_font
-%requires_xorg_xserver_videodrv
+%{?requires_xorg_xserver_extension}
+%{?requires_xorg_xserver_xinput}
+%{?requires_xorg_xserver_font}
+%{?requires_xorg_xserver_videodrv}
 BuildRequires: rpmbuild(macros) >= 1.389
 
 # nagios nrpe triggers
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/PLD-doc/BuildRequires.txt?r1=1.144&r2=1.145&f=u



More information about the pld-cvs-commit mailing list