rpms/flex/devel flex-2.5.33-includedir.patch, 1.1, 1.2 flex-2.5.33-pic.patch, 1.2, 1.3 flex.spec, 1.47, 1.48

[Petr Machata (pmachata)]

Author: pmachata

Update of /cvs/pkgs/rpms/flex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23834

Modified Files:
	flex-2.5.33-includedir.patch flex-2.5.33-pic.patch flex.spec 
Log Message:
* Tue Jan  8 2008 Petr Machata <pmachata at redhat.com> - 2.5.33-13
- Patch with -fPIC only after the autogen.sh is run.


flex-2.5.33-includedir.patch:

Index: flex-2.5.33-includedir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/flex/devel/flex-2.5.33-includedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- flex-2.5.33-includedir.patch	25 Jun 2007 14:27:27 -0000	1.1
+++ flex-2.5.33-includedir.patch	8 Jan 2008 15:16:43 -0000	1.2
@@ -1,12 +1,11 @@
 diff -urp flex-2.5.33/Makefile.in flex-2.5.33-pm/Makefile.in
 --- flex-2.5.33/Makefile.in	2007-05-30 10:57:18.000000000 +0200
 +++ flex-2.5.33-pm/Makefile.in	2007-05-30 10:57:11.000000000 +0200
-@@ -291,7 +291,7 @@ SUBDIRS = \
+@@ -291,6 +291,6 @@ SUBDIRS = \
  
  
  localedir = $(datadir)/locale
 -AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I at includedir@ -I$(top_srcdir)/intl
 +AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
- AM_CFLAGS = -fPIC
  
  # Run GNU indent on sources. Don't run this unless all the sources compile cleanly.

flex-2.5.33-pic.patch:

Index: flex-2.5.33-pic.patch
===================================================================
RCS file: /cvs/pkgs/rpms/flex/devel/flex-2.5.33-pic.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- flex-2.5.33-pic.patch	31 Jan 2007 15:11:10 -0000	1.2
+++ flex-2.5.33-pic.patch	8 Jan 2008 15:16:43 -0000	1.3
@@ -1,13 +1,10 @@
-Only in flex-2.5.33-pm: flex-2.5.33
-diff -urp flex-2.5.33/Makefile.in flex-2.5.33-pm/Makefile.in
---- flex-2.5.33/Makefile.in	2006-02-21 03:45:12.000000000 +0100
-+++ flex-2.5.33-pm/Makefile.in	2007-01-31 15:06:32.000000000 +0100
-@@ -292,6 +292,7 @@ SUBDIRS = \
+--- flex-2.5.33/Makefile.in	2008-01-08 16:09:52.000000000 +0100
++++ flex-2.5.33-pm/Makefile.in	2008-01-08 16:10:22.000000000 +0100
+@@ -375,6 +375,7 @@ SUBDIRS = \
+ 	tests
  
- localedir = $(datadir)/locale
  AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I at includedir@ -I$(top_srcdir)/intl
 +AM_CFLAGS = -fPIC
  
  # Run GNU indent on sources. Don't run this unless all the sources compile cleanly.
  #
-Only in flex-2.5.33-pm: Makefile.in~


Index: flex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flex/devel/flex.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- flex.spec	3 Jan 2008 14:45:41 -0000	1.47
+++ flex.spec	8 Jan 2008 15:16:43 -0000	1.48
@@ -1,16 +1,16 @@
 Summary: A tool for creating scanners (text pattern recognizers)
 Name: flex
 Version: 2.5.33
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://flex.sourceforge.net/
 Source: flex-%{version}.tar.bz2
-Patch0: flex-2.5.33-pic.patch
 Patch1: flex-2.5.33-yy.patch
 Patch2: flex-2.5.33-opts.patch
 Patch3: flex-2.5.33-includedir.patch
 Patch4: flex-2.5.33-test-linedir-r.patch
+Patch5: flex-2.5.33-pic.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: m4
 BuildRequires: gettext bison m4 gawk autoconf automake gettext-devel
@@ -33,14 +33,16 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+./autogen.sh
+# The -fPIC patch has to be applied after the build system is
+# re-generated.
+%patch5 -p1
 
 %build
-./autogen.sh
 %configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
@@ -85,6 +87,9 @@
 %{_infodir}/flex.info*
 
 %changelog
+* Tue Jan  8 2008 Petr Machata <pmachata at redhat.com> - 2.5.33-13
+- Patch with -fPIC only after the autogen.sh is run.
+
 * Thu Jan  3 2008 Petr Machata <pmachata at redhat.com> - 2.5.33-12
 - Run autogen.sh before the rest of the build.
 - Add BR autoconf automake gettext-devel.