Merge branch 'f14' into f13

Conflicts:
	imake.spec

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.spec

@@ -1,7 +1,7 @@
 Summary: imake source code configuration and build system
 Name: imake
 Version: 1.0.2
-Release: 13%{?dist}
+Release: 15%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -19,6 +19,7 @@ Patch3: xorg-cf-files-1.0.2-xprint.patch
 # fix RH BZ #538249
 Patch4: lndir-1.0.1-git-1.patch
 Patch10: imake-1.0.2-find-pedantry.patch
+Patch11: imake-1.0.2-abort.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
@@ -45,6 +46,7 @@ migrate software to the GNU autotools system.
 %patch4 -p0 -b .lndir
 
 %patch10 -p0 -b .find
+%patch11 -p0 -b .abort
 
 %build
 # Build everything
@@ -101,7 +103,6 @@ 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
@@ -122,6 +123,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xmkmf.1x*
 
 %changelog
+* Mon Oct 25 2010 Adam Jackson <ajax@redhat.com> 1.0.2-15
+- imake-1.0.2-abort.patch: Paper over an abort (#646561)
+
+* Mon Oct 25 2010 Adam Jackson <ajax@redhat.com> 1.0.2-14
+- Don't own things owned by filesystem (#569411)
+
 * Mon Feb 22 2010 Matěj Cepl <mcepl@redhat.com> - 1.0.2-13
 -  lndir should ignore .git directory (RH BZ #538249)