From ffdc6191edc423db904ee5c414fa579fab1fd29f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 05:29:44 +0000 Subject: [PATCH 1/5] Initialize branch F-11 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..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 902714338740325c2541b275ef7309c749332e16 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 20 Apr 2009 15:00:15 +0000 Subject: [PATCH 2/5] - Resolves: #496548. --- flex-2.5.35-gcc44.patch | 22 ++++++++++++++++++++++ flex.spec | 7 ++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 flex-2.5.35-gcc44.patch diff --git a/flex-2.5.35-gcc44.patch b/flex-2.5.35-gcc44.patch new file mode 100644 index 0000000..7929fc0 --- /dev/null +++ b/flex-2.5.35-gcc44.patch @@ -0,0 +1,22 @@ +diff -urNp flex-2.5.35.orig/flex.skl flex-2.5.35/flex.skl +--- flex-2.5.35.orig/flex.skl 2009-04-20 03:09:46.000000000 +0530 ++++ flex-2.5.35/flex.skl 2009-04-20 07:46:58.000000000 +0530 +@@ -217,6 +217,7 @@ m4preproc_include(`flexint.h') + /* begin standard C++ headers. */ + #include + #include ++#include + #include + #include + /* end standard C++ headers. */ +diff -urNp flex-2.5.35.orig/skel.c flex-2.5.35/skel.c +--- flex-2.5.35.orig/skel.c 2009-04-20 03:09:46.000000000 +0530 ++++ flex-2.5.35/skel.c 2009-04-20 07:46:40.000000000 +0530 +@@ -284,6 +284,7 @@ const char *skel[] = { + "/* begin standard C++ headers. */", + "#include ", + "#include ", ++ "#include ", + "#include ", + "#include ", + "/* end standard C++ headers. */", diff --git a/flex.spec b/flex.spec index f31a119..bc1c63a 100644 --- a/flex.spec +++ b/flex.spec @@ -1,12 +1,13 @@ Summary: A tool for creating scanners (text pattern recognizers) Name: flex Version: 2.5.35 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: Development/Tools URL: http://flex.sourceforge.net/ Source: flex-%{version}.tar.bz2 Patch0: flex-2.5.35-sign.patch +Patch2: flex-2.5.35-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: m4 BuildRequires: gettext bison m4 @@ -30,6 +31,7 @@ application development. %prep %setup -q %patch0 -p1 +%patch2 -p1 %build %configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS" @@ -76,6 +78,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_infodir}/flex.info* %changelog +* Mon Apr 20 2009 Debarshi Ray - 2.5.35-4 +- Resolves: #496548. + * Tue Feb 24 2009 Fedora Release Engineering - 2.5.35-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From e35c2836101ed54d48659b2ee7325aba47c37869 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 20 Apr 2009 15:01:47 +0000 Subject: [PATCH 3/5] NVR collision --- flex.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flex.spec b/flex.spec index bc1c63a..51d2c1b 100644 --- a/flex.spec +++ b/flex.spec @@ -1,7 +1,7 @@ Summary: A tool for creating scanners (text pattern recognizers) Name: flex Version: 2.5.35 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: Development/Tools URL: http://flex.sourceforge.net/ @@ -78,7 +78,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_infodir}/flex.info* %changelog -* Mon Apr 20 2009 Debarshi Ray - 2.5.35-4 +* Mon Apr 20 2009 Debarshi Ray - 2.5.35-5 - Resolves: #496548. * Tue Feb 24 2009 Fedora Release Engineering - 2.5.35-3 From 03bac9e43fb08743aa3cbeccac06d53263d2db71 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:28:09 +0000 Subject: [PATCH 4/5] 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 82803d895cb98f891f5479509d7e65e7bc4ad901 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 14:33:48 +0000 Subject: [PATCH 5/5] 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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11