- cleanup patch files

- update source files
This commit is contained in:
Than Ngo 2006-07-18 06:24:30 +00:00
parent 6d0b5b53a8
commit 4869495779
5 changed files with 69 additions and 6 deletions

View File

@ -3,3 +3,6 @@ imake-1.0.1.tar.bz2
lndir-1.0.1.tar.bz2
makedepend-1.0.0.tar.bz2
xorg-cf-files-1.0.1.tar.bz2
imake-1.0.2.tar.bz2
gccmakedep-1.0.2.tar.bz2
xorg-cf-files-1.0.2.tar.bz2

View File

@ -1,7 +1,7 @@
Summary: imake source code configuration and build system
Name: imake
Version: 1.0.2
Release: 2
Release: 3
License: MIT/X11
Group: User Interface/X
URL: http://www.x.org
@ -14,8 +14,8 @@ Source3: ftp://ftp.x.org/pub/individual/util/xorg-cf-files-1.0.2.tar.bz2
Source4: ftp://ftp.x.org/pub/individual/util/lndir-1.0.1.tar.bz2
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
Patch2: xorg-cf-files-1.0.2-redhat.patch
Patch3: xorg-cf-files-1.0.2-xprint.patch
BuildRequires: pkgconfig
BuildRequires: xorg-x11-util-macros
@ -116,6 +116,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xmkmf.1x*
%changelog
* Tue Jul 18 2006 Than Ngo <than@redhat.com> 1.0.2-3
- cleanup patch files
- update source files
* Fri Jul 14 2006 Jesse Keating <jkeating@redhat.com> - 1.0.2-2
- rebuild

View File

@ -1,5 +1,5 @@
f3ff8981f6b0f06a36dca74f19d155f2 gccmakedep-1.0.1.tar.bz2
8c859fdddd57e91132ceab1344bfe728 imake-1.0.1.tar.bz2
e274ea9f55dfd62afa0a7b1e1ab4ba96 lndir-1.0.1.tar.bz2
fa194caa4f059f5621ed2c5a51efb4d0 makedepend-1.0.0.tar.bz2
e3107572a02a344b5f5da57a1eb95732 xorg-cf-files-1.0.1.tar.bz2
02fea5a02ba2857c7d81820c8e8b8e6f imake-1.0.2.tar.bz2
b533c0771dbbaf9b041ff35bb941d3a2 gccmakedep-1.0.2.tar.bz2
5f62dd5545b782c74f6e4e70d0e6552c xorg-cf-files-1.0.2.tar.bz2

View File

@ -0,0 +1,17 @@
--- xorg-cf-files-1.0.2/linux.cf.redhat 2005-10-21 21:10:27.000000000 +0200
+++ xorg-cf-files-1.0.2/linux.cf 2005-12-21 11:27:16.000000000 +0100
@@ -190,7 +190,13 @@
#endif /* LinuxDebian */
#if LinuxDistribution == LinuxRedHat
-#define FSUseSyslog YES
+# define FSUseSyslog YES
+# define BuildRman NO
+# define BuildHtmlManPages NO
+# define ProjectRoot /usr
+# define ManPath /usr/share/man
+# define XAppLoadDir /usr/share/X11/app-defaults
+# define ConfigDir /usr/share/X11/config
#endif
#ifndef HasDevRandom

View File

@ -0,0 +1,39 @@
--- xorg-cf-files-1.0.2/X11.tmpl.xprint 2005-10-01 12:45:48.000000000 -0400
+++ xorg-cf-files-1.0.2/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