rpms/imake/devel imake.spec, 1.19, 1.20 xorg-cf-files-1.0.1-redhat.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: mharris

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

Modified Files:
	imake.spec xorg-cf-files-1.0.1-redhat.patch 
Log Message:
* Mon Mar 06 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
- Updated xorg-cf-files-1.0.1-redhat.patch with fix for (#178177)



Index: imake.spec
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/imake.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- imake.spec	1 Mar 2006 15:34:21 -0000	1.19
+++ imake.spec	7 Mar 2006 00:41:51 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: imake source code configuration and build system
 Name: imake
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -18,31 +18,9 @@
 Patch2: xorg-cf-files-1.0.1-redhat.patch
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-util-macros xorg-x11-proto-devel
+BuildRequires: xorg-x11-util-macros
+BuildRequires: xorg-x11-proto-devel
 
-# libxkbfile-devel needed for setxkbmap, xkbcomp, xkbevd, xkbprint
-#BuildRequires: libxkbfile-devel
-# libX11-devel needed for setxkbmap, xkbcomp, xkbevd, xkbprint
-#BuildRequires: libX11-devel
-# libXaw-devel needed for xkbutils
-#BuildRequires: libXaw-devel
-# libXt-devel needed for xkbutils
-#BuildRequires: libXt-devel
-# FIXME: xkbvleds requires libXext, but autotools doesn't check/require it:
-# gcc  -O2 -g -march=i386 -mcpu=i686   -o xkbvleds  xkbvleds-xkbvleds.o
-# xkbvleds-LED.o xkbvleds-utils.o -lXaw7 -lXmu -lXt -lSM -lICE -lXext -lXpm -lX11 -ldl
-# /usr/bin/ld: cannot find -lXext
-# libXext-devel needed for xkbutils (from above error)
-#BuildRequires: libXext-devel
-# FIXME: xkbvleds requires libXext, but autotools doesn't check/require it:
-# gcc  -O2 -g -march=i386 -mcpu=i686   -o xkbvleds  xkbvleds-xkbvleds.o
-# xkbvleds-LED.o xkbvleds-utils.o -lXaw7 -lXmu -lXt -lSM -lICE -lXext -lXpm -lX11 -ldl
-# /usr/bin/ld: cannot find -lXpm
-# libXpm-devel needed for xkbutils (from above error)
-#BuildRequires: libXpm-devel
-
-# FIXME:
-# Obsoletes: <each package the following commands used to be present in>
 Provides: ccmakedep cleanlinks gccmakedep imake lndir makedepend makeg
 Provides: mergelib mkdirhier mkhtmlindex revpath xmkmf
 
@@ -137,6 +115,9 @@
 %{_mandir}/man1/xmkmf.1x*
 
 %changelog
+* Mon Mar 06 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+- Updated xorg-cf-files-1.0.1-redhat.patch with fix for (#178177)
+
 * Wed Mar 01 2006 Karsten Hopp <karsten at redhat.de> 1.0.1-2
 - Buildrequires: xorg-x11-proto-devel
 

xorg-cf-files-1.0.1-redhat.patch:
 linux.cf |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

Index: xorg-cf-files-1.0.1-redhat.patch
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/xorg-cf-files-1.0.1-redhat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-cf-files-1.0.1-redhat.patch	31 Jan 2006 17:06:05 -0000	1.1
+++ xorg-cf-files-1.0.1-redhat.patch	7 Mar 2006 00:41:51 -0000	1.2
@@ -1,6 +1,6 @@
 --- xorg-cf-files-1.0.0/linux.cf.redhat	2005-10-21 21:10:27.000000000 +0200
 +++ xorg-cf-files-1.0.1/linux.cf	2005-12-21 11:27:16.000000000 +0100
-@@ -190,7 +190,12 @@
+@@ -190,7 +190,13 @@
  #endif /* LinuxDebian */
  
  #if LinuxDistribution == LinuxRedHat
@@ -10,7 +10,8 @@
 +# define BuildHtmlManPages	NO
 +# define ProjectRoot		/usr
 +# define ManPath		/usr/share/man
-+# define XAppLoadDir	/usr/share/X11/app-defaults
++# define XAppLoadDir		/usr/share/X11/app-defaults
++# define ConfigDir		/usr/share/X11/config
  #endif
  
  #ifndef HasDevRandom