Rebuild with fixed binutils

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>

.cvsignore

@@ -1,5 +0,0 @@
-gccmakedep-1.0.2.tar.bz2
-imake-1.0.2.tar.bz2
-lndir-1.0.1.tar.bz2
-xorg-cf-files-1.0.2.tar.bz2
-makedepend-1.0.1.tar.bz2

.gitignore

@@ -0,0 +1,20 @@
+gccmakedep-1.0.2.tar.bz2
+imake-1.0.2.tar.bz2
+lndir-1.0.1.tar.bz2
+xorg-cf-files-1.0.2.tar.bz2
+makedepend-1.0.1.tar.bz2
+makedepend-1.0.2.tar.bz2
+xorg-cf-files-1.0.3.tar.bz2
+/gccmakedep-1.0.2.tar.bz2
+/imake-1.0.4.tar.bz2
+/lndir-1.0.2.tar.bz2
+/makedepend-1.0.3.tar.bz2
+/xorg-cf-files-1.0.3.tar.bz2
+/xorg-cf-files-1.0.4.tar.bz2
+/imake-1.0.5.tar.bz2
+/lndir-1.0.3.tar.bz2
+/makedepend-1.0.4.tar.bz2
+/imake-1.0.6.tar.bz2
+/imake-1.0.7.tar.bz2
+/gccmakedep-1.0.3.tar.bz2
+/xorg-cf-files-1.0.6.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: imake
-# $Id: Makefile,v 1.1 2005/11/11 02:18:56 mharris Exp $
-NAME := imake
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

imake-1.0.2-abort.patch

@@ -0,0 +1,18 @@
+diff -up imake-1.0.2/imake.c.jx imake-1.0.2/imake.c
+--- imake-1.0.2/imake.c.jx	2006-05-15 16:28:14.000000000 -0400
++++ imake-1.0.2/imake.c	2010-10-25 17:14:37.000000000 -0400
+@@ -1030,8 +1030,12 @@ get_libc_version(FILE *inFile)
+ 
+   len = pclose (fp);
+   remove (aout);
+-  if (len)
+-    abort ();
++  if (len) {
++      /* handwave furiously */
++      printf("#define DefaultLinuxCLibMajorVersion 6\n");
++      printf("#define DefaultLinuxCLibMinorVersion 12\n");
++      printf("#define DefaultLinuxCLibTeenyVersion 0\n");
++  }
+ }
+ #endif
+ 

imake-backport-aarch64-1.patch

@@ -0,0 +1,74 @@
+From 0d1be73c26f3636e024637d12c3befd8a9956cfc Mon Sep 17 00:00:00 2001
+From: Riku Voipio <riku.voipio@linaro.org>
+Date: Mon, 22 Apr 2013 11:24:13 +0000
+Subject: Add Aarch64 support
+
+This patch is based on follow patch by Dirk Müller <dirk@dmllr.de> :
+
+https://build.opensuse.org/package/view_file?expand=1&file=aarch64-support.diff&package=xorg-cf-files&project=devel%3AARM%3AAArch64%3A12.3
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/Imake.cf b/Imake.cf
+index d8a58e2..1ff3c8c 100644
+--- a/Imake.cf
++++ b/Imake.cf
+@@ -1022,6 +1022,10 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
+ #   define AMD64Architecture
+ #  endif
+ # endif
++# if defined(__aarch64__)
++#   define AArch64Architecture
++#   undef __aarch64__
++# endif
+ #endif /* linux || __GLIBC__ */
+ 
+ #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
+diff --git a/linux.cf b/linux.cf
+index af73c29..316dad3 100644
+--- a/linux.cf
++++ b/linux.cf
+@@ -578,7 +578,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
+ #define MkdirHierCmd		mkdir -p
+ 
+ #ifndef HaveLib64
+-# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture)
++# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture)
+ #  define HaveLib64	YES
+ # else
+ #  define HaveLib64	NO
+@@ -976,6 +976,15 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
+ # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+ #endif /* AMD64Architecture */
+ 
++#ifdef AArch64Architecture
++# ifndef OptimizedCDebugFlags
++#  define OptimizedCDebugFlags DefaultGcc2AArch64Opt
++# endif
++# define LinuxMachineDefines   -D__aarch64__
++# define ServerOSDefines   XFree86ServerOSDefines -DDDXTIME
++# define ServerExtraDefines    -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
++#endif /* AArch64Architecture */
++
+ #ifndef StandardDefines
+ # ifdef __linux__
+ #  define StandardDefines	-Dlinux LinuxMachineDefines LinuxSourceDefines
+diff --git a/xfree86.cf b/xfree86.cf
+index f7c151c..0f538e0 100644
+--- a/xfree86.cf
++++ b/xfree86.cf
+@@ -2022,6 +2022,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
+ # endif
+ #endif
+ 
++#if HasGcc2 && defined(AArch64Architecture)
++# ifndef DefaultGcc2AArch64Opt
++#  define DefaultGcc2AArch64Opt -O2 GccAliasingArgs
++# endif
++#endif
++
+ #if HasGcc2 && defined(AlphaArchitecture)
+ # ifndef DefaultGcc2AxpOpt
+ #  define DefaultGcc2AxpOpt -O2 GccAliasingArgs
+--
+cgit v0.9.0.2-2-gbebe

imake-backport-aarch64-2.patch

@@ -0,0 +1,26 @@
+From 2d586d8c0fe5190a6ab0958ee586e9a8c0a02d72 Mon Sep 17 00:00:00 2001
+From: Riku Voipio <riku.voipio@linaro.org>
+Date: Fri, 06 Dec 2013 23:37:36 +0000
+Subject: add DefaultGcc2AArch64Opt to xorg.cf
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/xorg.cf b/xorg.cf
+index 81e78df..8ea5715 100644
+--- a/xorg.cf
++++ b/xorg.cf
+@@ -1561,6 +1561,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
+ # endif
+ #endif
+ 
++#if HasGcc2 && defined(AArch64Architecture)
++# ifndef DefaultGcc2AArch64Opt
++#  define DefaultGcc2AArch64Opt -O2 GccAliasingArgs
++# endif
++#endif
++
+ #if HasGcc2 && defined(AMD64Architecture)
+ # ifndef DefaultGcc2AMD64Opt
+ #  define DefaultGcc2AMD64Opt -O2 -fno-strength-reduce GccAliasingArgs
+--
+cgit v0.9.0.2-2-gbebe

imake.spec

@@ -1,27 +1,28 @@
 Summary: imake source code configuration and build system
 Name: imake
-Version: 1.0.2
-Release: 7%{?dist}
+Version: 1.0.7
+Release: 15%{?dist}
 License: MIT
-Group: User Interface/X
 URL: http://www.x.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: ftp://ftp.x.org/pub/individual/util/imake-1.0.2.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/util/makedepend-1.0.1.tar.bz2
-Source2: ftp://ftp.x.org/pub/individual/util/gccmakedep-1.0.2.tar.bz2
-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
+Source0: https://www.x.org/pub/individual/util/imake-1.0.7.tar.bz2
+Source1: https://www.x.org/pub/individual/util/makedepend-1.0.4.tar.bz2
+Source2: https://www.x.org/pub/individual/util/gccmakedep-1.0.3.tar.bz2
+Source3: https://www.x.org/pub/individual/util/xorg-cf-files-1.0.6.tar.bz2
+Source4: https://www.x.org/pub/individual/util/lndir-1.0.3.tar.bz2
+# this has been merged post 1.0.6
 Patch2: xorg-cf-files-1.0.2-redhat.patch
-Patch3: xorg-cf-files-1.0.2-xprint.patch
+Patch11: imake-1.0.2-abort.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
+BuildRequires: gcc
+BuildRequires: gcc-c++
+# imake is not functional without cc
+Requires:      gcc
 
-Provides: ccmakedep cleanlinks gccmakedep imake lndir makedepend makeg
+Provides: ccmakedep cleanlinks gccmakedep lndir makedepend makeg
 Provides: mergelib mkdirhier mkhtmlindex revpath xmkmf
 
 %description
@@ -35,10 +36,12 @@ migrate software to the GNU autotools system.
 
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
-#%patch0 -p0 -b .imake
-#%patch1 -p0 -b .ProjectRoot
 %patch2 -p0 -b .redhat
-%patch3 -p0 -b .xprint
+
+# imake patches
+pushd %{name}-%{version}
+%patch11 -p1 -b .abort
+popd
 
 %build
 # Build everything
@@ -59,30 +62,16 @@ migrate software to the GNU autotools system.
 }
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # Install everything
 {
    for pkg in imake makedepend gccmakedep lndir xorg-cf-files ; do
       pushd $pkg-*
-      case $pkg in
-#         xorg-cf-files)
-#            make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_datadir}
-#            ;;
-         *)
-            make install DESTDIR=$RPM_BUILD_ROOT
-            ;;
-      esac
+      make install DESTDIR=$RPM_BUILD_ROOT
       popd
    done
 }
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
-%doc
 %{_bindir}/ccmakedep
 %{_bindir}/cleanlinks
 %{_bindir}/gccmakedep
@@ -95,108 +84,93 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/mkhtmlindex
 %{_bindir}/revpath
 %{_bindir}/xmkmf
-%dir %{_datadir}/X11
 %dir %{_datadir}/X11/config
 %{_datadir}/X11/config/*.cf
 %{_datadir}/X11/config/*.def
 %{_datadir}/X11/config/*.rules
 %{_datadir}/X11/config/*.tmpl
-#%dir %{_mandir}/man1x
-%{_mandir}/man1/ccmakedep.1x*
-%{_mandir}/man1/cleanlinks.1x*
-%{_mandir}/man1/gccmakedep.1x*
-%{_mandir}/man1/imake.1x*
-%{_mandir}/man1/lndir.1x*
+#%%dir %%{_mandir}/man1x
+%{_mandir}/man1/ccmakedep.1*
+%{_mandir}/man1/cleanlinks.1*
+%{_mandir}/man1/gccmakedep.1*
+%{_mandir}/man1/imake.1*
+%{_mandir}/man1/lndir.1*
 %{_mandir}/man1/makedepend.1*
-%{_mandir}/man1/makeg.1x*
-%{_mandir}/man1/mergelib.1x*
-%{_mandir}/man1/mkdirhier.1x*
-%{_mandir}/man1/mkhtmlindex.1x*
-%{_mandir}/man1/revpath.1x*
-%{_mandir}/man1/xmkmf.1x*
+%{_mandir}/man1/makeg.1*
+%{_mandir}/man1/mergelib.1*
+%{_mandir}/man1/mkdirhier.1*
+%{_mandir}/man1/mkhtmlindex.1*
+%{_mandir}/man1/revpath.1*
+%{_mandir}/man1/xmkmf.1*
 
 %changelog
-* Tue Jul 15 2008 Adam Jackson <ajax@redhat.com> 1.0.2-7
-- Fix license tag.
+* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 1.0.7-15
+- Rebuild with fixed binutils
 
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.0.2-6
-- Autorebuild for GCC 4.3
+* Sat Jul 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.7-14
+- Requires: gcc
 
-* Tue Aug 21 2007 Adam Jackson <ajax@redhat.com> - 1.0.2-5
-- Rebuild for build id
+* Tue Jul 24 2018 Tom Callaway <spot@fedoraproject.org> - 1.0.7-13
+- add BuildRequires: gcc and gcc-c++ to ensure proper build
 
-* Mon Mar 26 2007 Adam Jackson <ajax@redhat.com> 1.0.2-4
-- makedepend 1.0.1
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
-* Tue Jul 18 2006 Than Ngo <than@redhat.com> 1.0.2-3
-- cleanup patch files
-- update source files
+* Thu Jul 05 2018 Adam Jackson <ajax@redhat.com> - 1.0.7-11
+- xorg-cf-files 1.0.6
+- Drop pointless %%defattr
+- HTTPS URLs
 
-* Fri Jul 14 2006 Jesse Keating <jkeating@redhat.com> - 1.0.2-2
-- rebuild
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
-* Wed Jun 21 2006 Mike A. Harris <mharris@redhat.com> 1.0.2-1
-- Update to imake-1.0.2, gccmakedep-1.0.2, xorg-cf-files-1.0.2
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
-* Tue Apr 25 2006 Adam Jackson <ajackson@redhat.com> 1.0.1-4
-- Fix ExtraXawReqs to reflect reality (libXp is unneeded)
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
-* Mon Mar 06 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-3
-- Updated xorg-cf-files-1.0.1-redhat.patch with fix for (#178177)
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
-* Wed Mar 01 2006 Karsten Hopp <karsten@redhat.de> 1.0.1-2
-- Buildrequires: xorg-x11-proto-devel
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 1.0.1-1.2
-- bump again for double-long bug on ppc(64)
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> 1.0.1-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
+* Wed Oct 01 2014 Adam Jackson <ajax@redhat.com> 1.0.7-4
+- imake 1.0.7
+- gccmakedep 1.0.3
 
-* Wed Jan 18 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-1
-- Updated all packages to version 1.0.1 from X11R7.0
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-* Wed Dec 21 2005 Than Ngo <than@redhat.com> 1.0.0-4
-- final fix for #173593
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-* Tue Dec 20 2005 Than Ngo <than@redhat.com> 1.0.0-3
-- add correct XAppLoadDir #173593
-- add more macros for fedora
+* Mon Mar 17 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1.0.6-2
+- Backport AArch64 support
 
-* Mon Dec 19 2005 Than Ngo <than@redhat.com> 1.0.0-2
-- add some macros to fix problem in building of manpages
+* Mon Jan 20 2014 Adam Jackson <ajax@redhat.com> 1.0.6-1
+- imake 1.0.6
 
-* Sat Dec 17 2005 Mike A. Harris <mharris@redhat.com> 1.0.0-1
-- Updated all packages to version 1.0.0 from X11R7 RC4
-- Added new lndir, gccmakedep tarballs.  (#173478)
-- Changed manpage dirs from man1x to man1 to match upstream RC4 default.
-- Removed all previous 'misc' patch, as we now pass --with-config-dir to
-  configure to specify the location of the Imake config files.
-- Renamed imake patch to xorg-cf-files-1.0.0-ProjectRoot.patch as it did not
-  patch imake at all.  This should probably be changed to be a custom Red Hat
-  host.def file that is added as a source line instead of randomly patching
-  various files.
+* Mon Dec 09 2013 Adam Jackson <ajax@redhat.com> 1.0.5-8
+- Fix imake build with -Werror=format-security (#1037129)
 
-* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com> 0.99.2-5.1
-- rebuilt
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.5-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
-* Mon Nov 28 2005 Than Ngo <than@redhat.com> 0.99.2-5
-- add correct ProjectRoot for modular X
+* Thu Feb 07 2013 Jon Ciesla <limburgher@gmail.com> 1.0.5-7
+- Merge review fixes, BZ 225898.
 
-* Wed Nov 16 2005 Than Ngo <than@redhat.com> 0.99.2-4 
-- add missing host.conf
+* Thu Jan 03 2013 Adam Jackson <ajax@redhat.com> 1.0.5-6
+- Drop unused patches
 
-* Wed Nov 16 2005 Than Ngo <than@redhat.com> 0.99.2-3
-- fix typo 
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
-* Wed Nov 16 2005 Than Ngo <than@redhat.com> 0.99.2-2
-- fix xmkmf to look config files in /usr/share/X11/config
-  instead /usr/%%{_lib}/X11/config/
-- add host.conf
-
-* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-1
-- Updated to imake-0.99.2, xorg-cf-files-0.99.2, makedepend-0.99.2 from
-  X11R7 RC2.
-
-* Thu Nov 10 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-1
-- Initial build.
+* Thu Mar 08 2012 Adam Jackson <ajax@redhat.com> 1.0.5-4
+- imake 1.0.5
+- lndir 1.0.3
+- makedepend 1.0.4

sources

@@ -1,5 +1,5 @@
-b533c0771dbbaf9b041ff35bb941d3a2  gccmakedep-1.0.2.tar.bz2
-02fea5a02ba2857c7d81820c8e8b8e6f  imake-1.0.2.tar.bz2
-e274ea9f55dfd62afa0a7b1e1ab4ba96  lndir-1.0.1.tar.bz2
-5f62dd5545b782c74f6e4e70d0e6552c  xorg-cf-files-1.0.2.tar.bz2
-54ab2549d723e51ff2b9cff4d8bf44d1  makedepend-1.0.1.tar.bz2
+SHA512 (gccmakedep-1.0.3.tar.bz2) = 563b2897770a4df2792ea3eae8183a1f9e78192b7efc9c8296ee68d1cba6e72fa962a88e3251bb780df776e2aa7e80d74d5096675c61526c232aefa4f9e6a5fc
+SHA512 (imake-1.0.7.tar.bz2) = b3527c8fead25c6e093e1fe4a39e60ff210212dcd323e206505b9e872a3f36d9db85f85cab5a6f0fa914fa5c558ef54b499b2b13ccd66739223e4e72ef805d08
+SHA512 (lndir-1.0.3.tar.bz2) = c9f03c825c627935abe399bf8292bbf69304cb9e9d65a4c860b49e32e2ed4dde25bf658a5ab2116cd215381d0a52f464a8a53469c27adddbd9fa2bfd135a7289
+SHA512 (makedepend-1.0.4.tar.bz2) = b4e276847deed9f52b86d89e4b14b5521aabc409fabb840aaaec6097fae2284be3c0f723b60e77267b6bea37c24ea8ad84afb81c4104e5f22049810e9ad6802e
+SHA512 (xorg-cf-files-1.0.6.tar.bz2) = 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa

xorg-cf-files-1.0.0-ProjectRoot.patch

@@ -1,22 +0,0 @@
---- xorg-cf-files-0.99.2/site.def.orig	2005-11-28 12:18:47.000000000 +0100
-+++ xorg-cf-files-1.0.0/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
- 
- /*
---- xorg-cf-files-0.99.2/X11.tmpl.orig	2005-11-28 12:19:03.000000000 +0100
-+++ xorg-cf-files-1.0.0/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

xorg-cf-files-1.0.0-misc.patch

@@ -1,26 +0,0 @@
---- xorg-cf-files-1.0.0/Makefile.am.imake	2005-10-06 00:00:51.000000000 -0400
-+++ xorg-cf-files-1.0.0/Makefile.am	2005-11-16 12:58:22.000000000 -0500
-@@ -3,7 +3,8 @@
- 	site.def \
- 	xf86site.def \
- 	xorgsite.def \
--	xorgversion.def
-+	xorgversion.def \
-+	host.def
- 
- RULEFILES = \
- 	Imake.rules \
---- xorg-cf-files-1.0.0/host.def.imake	2005-11-16 12:58:22.000000000 -0500
-+++ xorg-cf-files-1.0.0/host.def	2005-11-16 12:58:22.000000000 -0500
-@@ -0,0 +1 @@
-+#define BuildHtmlManPages       NO
---- xorg-cf-files-1.0.0/xorg.cf.imake	2005-10-03 12:08:44.000000000 -0400
-+++ xorg-cf-files-1.0.0/xorg.cf	2005-11-16 12:58:22.000000000 -0500
-@@ -10,7 +10,6 @@
- 
- /* Get and set version information. */
- 
--#include "date.def"
- #include "xorgversion.def"
- 
- #if !defined(XorgVersionString) && \

xorg-cf-files-1.0.2-redhat.patch

@@ -1,5 +1,5 @@
---- 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
+--- xorg-cf-files-1.0.6/linux.cf.redhat	2005-10-21 21:10:27.000000000 +0200
++++ xorg-cf-files-1.0.6/linux.cf	2005-12-21 11:27:16.000000000 +0100
 @@ -190,7 +190,13 @@
  #endif /* LinuxDebian */
  

xorg-cf-files-1.0.2-xprint.patch

@@ -1,39 +0,0 @@
---- 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