rpms/imake/devel imake-0.99.2-ProjectRoot.patch, NONE, 1.1 imake.spec, 1.6, 1.7

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/imake/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26048

Modified Files:
	imake.spec 
Added Files:
	imake-0.99.2-ProjectRoot.patch 
Log Message:
add correct ProjectRoot for modular X


imake-0.99.2-ProjectRoot.patch:
 X11.tmpl |    2 +-
 site.def |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE imake-0.99.2-ProjectRoot.patch ---
--- imake-0.99.2/xorg-cf-files-0.99.2/site.def.orig	2005-11-28 12:18:47.000000000 +0100
+++ imake-0.99.2/xorg-cf-files-0.99.2/site.def	2005-11-28 12:21:06.000000000 +0100
@@ -72,7 +72,7 @@
 #ifdef AfterVendorCF
 
 #ifndef ProjectRoot
-#define ProjectRoot /usr/X11R6
+#define ProjectRoot /usr
 #endif
 
 /*
--- imake-0.99.2/xorg-cf-files-0.99.2/X11.tmpl.orig	2005-11-28 12:19:03.000000000 +0100
+++ imake-0.99.2/xorg-cf-files-0.99.2/X11.tmpl	2005-11-28 12:31:56.000000000 +0100
@@ -3386,7 +3386,7 @@
 #if HasMotif
 
 #ifndef MotifDir
-#define MotifDir /usr/X11R6
+#define MotifDir /usr
 #endif
 #ifndef MotifDirStandard
 #define MotifDirStandard NO


Index: imake.spec
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/imake.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- imake.spec	16 Nov 2005 18:53:27 -0000	1.6
+++ imake.spec	28 Nov 2005 11:38:26 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: imake source code configuration and build system
 Name: imake
 Version: 0.99.2
-Release: 4
+Release: 5
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -11,6 +11,7 @@
 Source2: %{xorgurl}/xorg-cf-files-%{version}.tar.bz2
 Source3: %{xorgurl}/makedepend-%{version}.tar.bz2
 Patch0: imake-0.99.2-misc.patch
+Patch1: imake-0.99.2-ProjectRoot.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -55,6 +56,7 @@
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3
 %patch0 -p1 -b .imake
+%patch1 -p1 -b .ProjectRoot
 
 %build
 # Build everything
@@ -116,6 +118,9 @@
 %{_mandir}/man1x/makedepend.1x*
 
 %changelog
+* Mon Nov 28 2005 Than Ngo <than at redhat.com> 0.99.2-5
+- add correct ProjectRoot for modular X
+
 * Wed Nov 16 2005 Than Ngo <than at redhat.com> 0.99.2-4 
 - add missing host.conf