From de1517d87fc631291e35387dc50a9dc87868b491 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 05:24:37 +0000 Subject: [PATCH 1/6] Initialize branch F-8 for diffutils --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 8f4b4e84a9faacbc6805edda0103698f1e36a0bb Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 6 Nov 2007 12:12:56 +0000 Subject: [PATCH 2/6] - Fixed multibyte speed improvement patch (bug #363381). --- diffutils-2.8.4-i18n.patch | 2 +- diffutils.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/diffutils-2.8.4-i18n.patch b/diffutils-2.8.4-i18n.patch index 2042c9f..d601e6f 100644 --- a/diffutils-2.8.4-i18n.patch +++ b/diffutils-2.8.4-i18n.patch @@ -376,7 +376,7 @@ continue; - if (! lines_differ (eqline, ip)) -+ if (! lines_differ (eqline, eqs[i].length, ip, length)) ++ if (! lines_differ (eqline, eqs[i].length + 1, ip, length + 1)) break; } diff --git a/diffutils.spec b/diffutils.spec index 9787385..367871d 100644 --- a/diffutils.spec +++ b/diffutils.spec @@ -1,7 +1,7 @@ Summary: A GNU collection of diff utilities. Name: diffutils Version: 2.8.1 -Release: 17%{?dist} +Release: 18%{?dist} Group: Applications/Text URL: http://www.gnu.org/software/diffutils/diffutils.html Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.gz @@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT %{_infodir}/diff.info*gz %changelog +* Tue Nov 6 2007 Tim Waugh 2.8.1-18 +- Fixed multibyte speed improvement patch (bug #363381). + * Tue Aug 14 2007 Tim Waugh 2.8.1-17 - Multibyte speed improvement (bug #252117). From 627614aeea3b1e361a7ea53cf777360a9f94fae6 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 6 Nov 2007 12:39:17 +0000 Subject: [PATCH 3/6] - Rebuilt. --- diffutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diffutils.spec b/diffutils.spec index 367871d..012f939 100644 --- a/diffutils.spec +++ b/diffutils.spec @@ -77,8 +77,11 @@ rm -rf $RPM_BUILD_ROOT %{_infodir}/diff.info*gz %changelog +* Tue Nov 6 2007 Tim Waugh 2.8.1-19 +- Rebuilt. + * Tue Nov 6 2007 Tim Waugh 2.8.1-18 -- Fixed multibyte speed improvement patch (bug #363381). +- Fixed multibyte speed improvement patch (bug #363831). * Tue Aug 14 2007 Tim Waugh 2.8.1-17 - Multibyte speed improvement (bug #252117). From 7633e6de17be838bd98b41fb68483f545be06b20 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 6 Nov 2007 12:40:05 +0000 Subject: [PATCH 4/6] 2.8.1-19 --- diffutils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diffutils.spec b/diffutils.spec index 012f939..cb77437 100644 --- a/diffutils.spec +++ b/diffutils.spec @@ -1,7 +1,7 @@ Summary: A GNU collection of diff utilities. Name: diffutils Version: 2.8.1 -Release: 18%{?dist} +Release: 19%{?dist} Group: Applications/Text URL: http://www.gnu.org/software/diffutils/diffutils.html Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.gz From 745ff50b418333ed731d2dcf0abf5c61705cff15 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:22:30 +0000 Subject: [PATCH 5/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index aeb8a84..46d0b6b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: diffutils -# $Id: Makefile,v 1.1 2004/09/09 04:12:59 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:42:08 notting Exp $ NAME := diffutils 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 +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)) From 6a8cb1e2b039362f7cc36b94c7200a50072eda4b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 12:58:32 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 46d0b6b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: diffutils -# $Id: Makefile,v 1.2 2007/10/15 18:42:08 notting Exp $ -NAME := diffutils -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) diff --git a/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8