rpms/xorg-x11-server-utils/devel xorg-x11-server-utils.spec, 1.44, 1.45

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2537

Modified Files:
	xorg-x11-server-utils.spec 
Log Message:
* Thu Jul 02 2009 Adam Jackson <ajax at redhat.com> 7.4-9
- Requires: mcpp instead of cpp, and switch xrdb to use it.



Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- xorg-x11-server-utils.spec	2 Jul 2009 20:20:57 -0000	1.44
+++ xorg-x11-server-utils.spec	2 Jul 2009 21:56:24 -0000	1.45
@@ -5,7 +5,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -61,8 +61,8 @@ BuildRequires: zlib-devel
 # FIXME: check if still needed for X11R7
 Requires(pre): filesystem >= 2.3.7-1
 
-# xrdb requires the C preprocessor to work properly
-Requires: cpp
+# xrdb, sigh
+Requires: mcpp
 
 Requires: libXrandr >= 1.2.0
 
@@ -113,7 +113,7 @@ Utility to perform keystone adjustments 
 	    %configure
 	    ;;
          *)
-            %configure
+            %configure --with-cpp=/usr/bin/mcpp
             ;;
       esac
 
@@ -186,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Jul 02 2009 Adam Jackson <ajax at redhat.com> 7.4-9
+- Requires: mcpp instead of cpp, and switch xrdb to use it.
+
 * Thu Jul 02 2009 Adam Jackson <ajax at redhat.com> 7.4-8
 - Drop xvidtune, move it to -apps to isolate libXaw deps