From 66bcba12b4adcd69f524c2620069be29f23261e1 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 22 Feb 2010 22:53:22 +0000 Subject: [PATCH 1/4] Make lndir work with .git --- imake.spec | 8 +++++++- lndir-1.0.1-git-1.patch | 11 +++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 lndir-1.0.1-git-1.patch diff --git a/imake.spec b/imake.spec index af03822..0b9ea27 100644 --- a/imake.spec +++ b/imake.spec @@ -1,7 +1,7 @@ Summary: imake source code configuration and build system Name: imake Version: 1.0.2 -Release: 12%{?dist} +Release: 13%{?dist} License: MIT Group: User Interface/X URL: http://www.x.org @@ -16,6 +16,8 @@ Patch0: xorg-cf-files-1.0.0-misc.patch Patch1: xorg-cf-files-1.0.0-ProjectRoot.patch Patch2: xorg-cf-files-1.0.2-redhat.patch 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 BuildRequires: pkgconfig @@ -40,6 +42,7 @@ migrate software to the GNU autotools system. #%patch1 -p0 -b .ProjectRoot %patch2 -p0 -b .redhat %patch3 -p0 -b .xprint +%patch4 -p0 -b .lndir %patch10 -p0 -b .find @@ -119,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/xmkmf.1x* %changelog +* Mon Feb 22 2010 Matěj Cepl - 1.0.2-13 +- lndir should ignore .git directory (RH BZ #538249) + * Mon Oct 19 2009 Adam Jackson 1.0.2-12 - xorg-cf-files 1.0.3.3.3 diff --git a/lndir-1.0.1-git-1.patch b/lndir-1.0.1-git-1.patch new file mode 100644 index 0000000..b83bc9b --- /dev/null +++ b/lndir-1.0.1-git-1.patch @@ -0,0 +1,11 @@ +--- lndir-1.0.1/lndir.c.git 2005-11-23 14:33:07.000000000 -0800 ++++ lndir-1.0.1/lndir.c 2009-11-17 17:06:51.000000000 -0800 +@@ -224,6 +224,8 @@ dodir (char *fn, /* name of "from" dire + continue; + if (!strcmp (dp->d_name, ".svn")) + continue; ++ if (!strcmp (dp->d_name, ".git")) ++ continue; + } + ocurdir = rcurdir; + rcurdir = buf; From 26b4981b5f78098fd6f6bb6a60fd7dcb51c1718c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 17:29:51 +0000 Subject: [PATCH 2/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 65fe5d3..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: imake -# $Id: Makefile,v 1.2 2007/10/15 18:52:54 notting 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 $$d/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) From 635deb4f1c10e4cba39b97e58d1a95b8d77a6ead Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 25 Oct 2010 16:47:30 -0400 Subject: [PATCH 3/4] directory ownership --- imake.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/imake.spec b/imake.spec index 0b9ea27..9a046cf 100644 --- a/imake.spec +++ b/imake.spec @@ -1,7 +1,7 @@ Summary: imake source code configuration and build system Name: imake Version: 1.0.2 -Release: 13%{?dist} +Release: 14%{?dist} License: MIT Group: User Interface/X URL: http://www.x.org @@ -101,7 +101,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 +121,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/xmkmf.1x* %changelog +* Mon Oct 25 2010 Adam Jackson 1.0.2-14 +- Don't own things owned by filesystem (#569411) + * Mon Feb 22 2010 Matěj Cepl - 1.0.2-13 - lndir should ignore .git directory (RH BZ #538249) From d3691afe492185b1826b49d60d375a8503409ed9 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 25 Oct 2010 17:16:00 -0400 Subject: [PATCH 4/4] haaaaack --- imake-1.0.2-abort.patch | 18 ++++++++++++++++++ imake.spec | 7 ++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 imake-1.0.2-abort.patch diff --git a/imake-1.0.2-abort.patch b/imake-1.0.2-abort.patch new file mode 100644 index 0000000..49ffdce --- /dev/null +++ b/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 + diff --git a/imake.spec b/imake.spec index 9a046cf..a990965 100644 --- a/imake.spec +++ b/imake.spec @@ -1,7 +1,7 @@ Summary: imake source code configuration and build system Name: imake Version: 1.0.2 -Release: 14%{?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 @@ -121,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/xmkmf.1x* %changelog +* Mon Oct 25 2010 Adam Jackson 1.0.2-15 +- imake-1.0.2-abort.patch: Paper over an abort (#646561) + * Mon Oct 25 2010 Adam Jackson 1.0.2-14 - Don't own things owned by filesystem (#569411)