rpms/imake/devel lndir-1.0.1-git-1.patch, NONE, 1.1 imake.spec, 1.36, 1.37

[Matej Cepl]

Author: mcepl

Update of /cvs/pkgs/rpms/imake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8625

Modified Files:
	imake.spec 
Added Files:
	lndir-1.0.1-git-1.patch 
Log Message:
Make lndir work with .git

lndir-1.0.1-git-1.patch:
 lndir.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE lndir-1.0.1-git-1.patch ---
--- 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;


Index: imake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imake/devel/imake.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- imake.spec	19 Oct 2009 22:55:31 -0000	1.36
+++ imake.spec	22 Feb 2010 22:53:22 -0000	1.37
@@ -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 sy
 #%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 <mcepl at redhat.com> - 1.0.2-13
+-  lndir should ignore .git directory (RH BZ #538249)
+
 * Mon Oct 19 2009 Adam Jackson <ajax at redhat.com> 1.0.2-12
 - xorg-cf-files 1.0.3.3.3