rpms/imake/devel xorg-cf-files-1.0.1-xprint.patch, NONE, 1.1 imake.spec, 1.20, 1.21

[fedora-cvs-commits at redhat.com]

Author: ajackson

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

Modified Files:
	imake.spec 
Added Files:
	xorg-cf-files-1.0.1-xprint.patch 
Log Message:
- Fix ExtraXawReqs to reflect reality (libXp is unneeded)


xorg-cf-files-1.0.1-xprint.patch:
 X11.tmpl |   18 +++---------------
 1 files changed, 3 insertions(+), 15 deletions(-)

--- NEW FILE xorg-cf-files-1.0.1-xprint.patch ---
--- xorg-cf-files-1.0.1/X11.tmpl.xprint	2005-10-01 12:45:48.000000000 -0400
+++ xorg-cf-files-1.0.1/X11.tmpl	2006-04-25 20:24:02.000000000 -0400
@@ -3920,21 +3920,13 @@
 #endif
 
 #ifndef ExtraXawReqs
-# if BuildXaw
-#  define ExtraXawReqs $(XPLIB)
-# else
-#  define ExtraXawReqs /**/
-# endif
+# define ExtraXawReqs /**/
 #endif
 
 EXTRAXAWREQS = ExtraXawReqs
 
 #ifndef ExtraXawClientDepLibs
-# if BuildXaw
-#  define ExtraXawClientDepLibs $(DEPXPLIB)
-# else
-#  define ExtraXawClientDepLibs /**/
-# endif
+# define ExtraXawClientDepLibs /**/
 #endif
 
 EXTRAXAWCLIENTDEPLIBS = ExtraXawClientDepLibs
@@ -3944,11 +3936,7 @@
 #endif
 
 #ifndef ExtraXawClientLibs
-# if BuildXaw
-#  define ExtraXawClientLibs $(XPLIB)
-# else
-#  define ExtraXawClientLibs /**/
-# endif
+# define ExtraXawClientLibs /**/
 #endif
 
 EXTRAXAWCLIENTLIBS = ExtraXawClientLibs


Index: imake.spec
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/imake.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- imake.spec	7 Mar 2006 00:41:51 -0000	1.20
+++ imake.spec	26 Apr 2006 00:33:48 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: imake source code configuration and build system
 Name: imake
 Version: 1.0.1
-Release: 3
+Release: 4
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -16,6 +16,7 @@
 Patch0: xorg-cf-files-1.0.0-misc.patch
 Patch1: xorg-cf-files-1.0.0-ProjectRoot.patch
 Patch2: xorg-cf-files-1.0.1-redhat.patch
+Patch3: xorg-cf-files-1.0.1-xprint.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
@@ -38,6 +39,7 @@
 #%patch0 -p0 -b .imake
 #%patch1 -p0 -b .ProjectRoot
 %patch2 -p0 -b .redhat
+%patch3 -p0 -b .xprint
 
 %build
 # Build everything
@@ -115,6 +117,9 @@
 %{_mandir}/man1/xmkmf.1x*
 
 %changelog
+* Tue Apr 25 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-4
+- Fix ExtraXawReqs to reflect reality (libXp is unneeded)
+
 * 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)