From 6a385199d3acfd2245c6d080aa223c83b6ff637f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 18:00:51 +0000 Subject: [PATCH 1/4] Initialize branch F-9 for flex --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 9d7d34fe10b87468229024774e2af099a47963d6 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 12 May 2008 11:31:51 +0000 Subject: [PATCH 2/4] Reintroduce the signed patch --- flex-2.5.35-sign.patch | 11 +++++++++++ flex.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 flex-2.5.35-sign.patch diff --git a/flex-2.5.35-sign.patch b/flex-2.5.35-sign.patch new file mode 100644 index 0000000..fbee18b --- /dev/null +++ b/flex-2.5.35-sign.patch @@ -0,0 +1,11 @@ +--- flex-2.5.35/gen.c-orig 2008-04-30 22:51:08.000000000 +0200 ++++ flex-2.5.35/gen.c 2008-04-30 22:51:14.000000000 +0200 +@@ -1890,7 +1890,7 @@ + outn ("\tif ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \\"); + outn ("\t\t{ \\"); + outn ("\t\tint c = '*'; \\"); +- outn ("\t\tint n; \\"); ++ outn ("\t\tunsigned n; \\"); + outn ("\t\tfor ( n = 0; n < max_size && \\"); + outn ("\t\t\t (c = getc( yyin )) != EOF && c != '\\n'; ++n ) \\"); + outn ("\t\t\tbuf[n] = (char) c; \\"); diff --git a/flex.spec b/flex.spec index 3fb3f37..5bba511 100644 --- a/flex.spec +++ b/flex.spec @@ -1,11 +1,12 @@ Summary: A tool for creating scanners (text pattern recognizers) Name: flex Version: 2.5.35 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Development/Tools URL: http://flex.sourceforge.net/ Source: flex-%{version}.tar.bz2 +Patch0: flex-2.5.35-sign.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: m4 BuildRequires: gettext bison m4 @@ -28,6 +29,7 @@ application development. %prep %setup -q +%patch0 -p1 %build %configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS" @@ -74,6 +76,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_infodir}/flex.info* %changelog +* Mon May 12 2008 Petr Machata - 2.5.35-2 +- Resolves: #445950 + * Wed Feb 27 2008 Petr Machata - 2.5.35-1 - Rebase to 2.5.35. Drop two patches. - Resolves: #434961 From 45a124a600f7aa612186f1896d9d164312d1417f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:28:10 +0000 Subject: [PATCH 3/4] 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 a8f1ab8..043f5d8 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: flex -# $Id: Makefile,v 1.1 2004/09/09 04:46:04 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:45:30 notting Exp $ NAME := flex 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 c13e528363ccea329a29b6116cb00fed69714172 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 14:33:45 +0000 Subject: [PATCH 4/4] 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 043f5d8..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: flex -# $Id: Makefile,v 1.2 2007/10/15 18:45:30 notting Exp $ -NAME := flex -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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9