rpms/imake/devel imake.spec, 1.11, 1.12 xorg-cf-files-1.0.0-redhat.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: than

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

Modified Files:
	imake.spec xorg-cf-files-1.0.0-redhat.patch 
Log Message:
- add more macros for fedora



Index: imake.spec
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/imake.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- imake.spec	20 Dec 2005 18:02:29 -0000	1.11
+++ imake.spec	20 Dec 2005 19:14:40 -0000	1.12
@@ -141,6 +141,7 @@
 %changelog
 * Tue Dec 20 2005 Than Ngo <than at redhat.com> 1.0.0-3
 - add correct XAppLoadDir #173593
+- add more macros for fedora
 
 * Mon Dec 19 2005 Than Ngo <than at redhat.com> 1.0.0-2
 - add some macros to fix problem in building of manpages

xorg-cf-files-1.0.0-redhat.patch:
 linux.cf |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

Index: xorg-cf-files-1.0.0-redhat.patch
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/xorg-cf-files-1.0.0-redhat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-cf-files-1.0.0-redhat.patch	20 Dec 2005 18:02:47 -0000	1.1
+++ xorg-cf-files-1.0.0-redhat.patch	20 Dec 2005 19:14:40 -0000	1.2
@@ -1,12 +1,51 @@
 --- xorg-cf-files-1.0.0/linux.cf.redhat	2005-10-21 21:10:27.000000000 +0200
-+++ xorg-cf-files-1.0.0/linux.cf	2005-12-20 18:56:20.000000000 +0100
-@@ -191,6 +191,9 @@
++++ xorg-cf-files-1.0.0/linux.cf	2005-12-20 20:12:08.000000000 +0100
+@@ -94,6 +94,14 @@
+ XCOMM libc:	(LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
+ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
+ 
++#ifndef HaveLib64
++# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture)
++#  define HaveLib64  YES
++# else
++#  define HaveLib64  NO
++# endif
++#endif
++
+ #if LinuxDistribution == LinuxDebian
+ # if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
+ #  define SystemManDirectory	/usr/share/man
+@@ -190,7 +198,17 @@
+ #endif /* LinuxDebian */
  
  #if LinuxDistribution == LinuxRedHat
- #define FSUseSyslog		YES
-+#define BuildRman		NO
-+#define BuildHtmlManPages	NO
-+#define XAppLoadDir		/usr/share/X11/app-defaults
+-#define FSUseSyslog		YES
++# define FSUseSyslog		YES
++# define BuildRman		NO
++# define BuildHtmlManPages	NO
++# define XAppLoadDir	/usr/share/X11/app-defaults
++# define BinDir	/usr/bin
++# if HaveLib64
++#  define LibDir	/usr/lib64/X11
++# else
++#  define LibDir	/usr/lib/X11
++# endif
++# define LibexecDir	/usr/libexec
  #endif
  
  #ifndef HasDevRandom
+@@ -577,14 +595,6 @@
+ 
+ #define MkdirHierCmd		mkdir -p
+ 
+-#ifndef HaveLib64
+-# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture)
+-#  define HaveLib64	YES
+-# else
+-#  define HaveLib64	NO
+-# endif
+-#endif
+-
+ #if UseElfFormat
+ # ifndef DoLoadableServer
+ #  if defined(MipsArchitecture) || defined(SuperHArchitecture)