dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: sed
-# $Id: Makefile,v 1.1 2004/09/09 12:09:04 cvsdist Exp $
-NAME := sed
-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)

sed-4.1.5-follow.patch

@@ -71,10 +71,10 @@ diff -Burp sed-4.1.5-orig/lib/utils.c sed-4.1.5-follow/lib/utils.c
 +	    buf2 [err] = '\0';
 +
 +	  /* need to handle relative paths with care */
-+	  if (buf2[0] != '/')
-+	    {
 +	      dir = dirname (buf);    // dir part of orig path
 +	      int len = strlen (dir); // orig path len
++	  if (buf2[0] != '/' && len != 1 && dir[0] != '.')
++	    {
 +	      buf[len] = '/';
 +	      strncpy (buf+len+1, buf2, bufsize - len - 1);
 +	      if (buf[bufsize-1] != 0)

sed.spec

@@ -6,7 +6,7 @@
 Summary: A GNU stream text editor
 Name: sed
 Version: 4.1.5
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: Applications/Text
 URL: http://sed.sourceforge.net/
@@ -70,6 +70,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Thu Nov 13 2008 Jiri Moskovcak <jmoskovc@redhat.com> 4.1.5-10
+- improved follow.patch (thanks to Arkadiusz Miskiewicz for initial patch)
+- Resolves: #470912
+
 * Thu Oct  4 2007 Petr Machata <pmachata@redhat.com> - 4.1.5-9
 - Fix licensing tag.
 - Clean up per merge review comments.