rpms/flex
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Do not run autogen.sh, it undoes the effect of includedir patch.

Browse Source 
- Adapt test-linedir-r.patch so that it fixes Makefile.in and works even
    though autogen.sh is not run.
This commit is contained in:
Štěpán Kasal 2008-01-15 17:22:05 +00:00
parent 823c989ac3
commit 18076a6f65
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flex-2.5.33-test-linedir-r.patch
View File

@ -1,6 +1,6 @@
diff -rup flex-2.5.33/tests/test-linedir-r/Makefile.am flex-2.5.33-pm/tests/test-linedir-r/Makefile.am diff -rup flex-2.5.33/tests/test-linedir-r/Makefile.am flex-2.5.33-pm/tests/test-linedir-r/Makefile.am
--- flex-2.5.33/tests/test-linedir-r/Makefile.am 2003-03-26 19:29:45.000000000 +0100 --- flex-2.5.33/tests/test-linedir-r/Makefile.in 2003-03-26 19:29:45.000000000 +0100
+++ flex-2.5.33-pm/tests/test-linedir-r/Makefile.am 2007-08-30 12:28:09.000000000 +0200 +++ flex-2.5.33-pm/tests/test-linedir-r/Makefile.in 2007-08-30 12:28:09.000000000 +0200
@@ -46,8 +46,8 @@ $(testname)$(EXEEXT): $(OBJS) @@ -46,8 +46,8 @@ $(testname)$(EXEEXT): $(OBJS)
test: $(testname)$(EXEEXT) test: $(testname)$(EXEEXT)

10
flex.spec
View File

@ -1,7 +1,7 @@
Summary: A tool for creating scanners (text pattern recognizers) Summary: A tool for creating scanners (text pattern recognizers)
Name: flex Name: flex
Version: 2.5.33 Version: 2.5.33
Release: 14%{?dist} Release: 15%{?dist}
License: BSD License: BSD
Group: Development/Tools Group: Development/Tools
URL: http://flex.sourceforge.net/ URL: http://flex.sourceforge.net/
@ -12,7 +12,7 @@ Patch3: flex-2.5.33-includedir.patch
Patch4: flex-2.5.33-test-linedir-r.patch Patch4: flex-2.5.33-test-linedir-r.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: m4 Requires: m4
BuildRequires: gettext bison m4 gawk autoconf automake gettext-devel BuildRequires: gettext bison m4
Requires(post): /sbin/install-info Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info Requires(preun): /sbin/install-info
@ -36,7 +36,6 @@ application development.
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
./autogen.sh
%build %build
%configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS" %configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS"
@ -83,6 +82,11 @@ rm -rf ${RPM_BUILD_ROOT}
%{_infodir}/flex.info* %{_infodir}/flex.info*
%changelog %changelog
* Tue Jan 15 2008 Stepan Kasal <skasal@redhat.com> - 2.5.33-15
- Do not run autogen.sh, it undoes the effect of includedir patch.
- Adapt test-linedir-r.patch so that it fixes Makefile.in and works
even though autogen.sh is not run.
* Thu Jan 10 2008 Stepan Kasal <skasal@redhat.com> - 2.5.33-14 * Thu Jan 10 2008 Stepan Kasal <skasal@redhat.com> - 2.5.33-14
- Insert the "-fPIC" on configure command-line. - Insert the "-fPIC" on configure command-line.
- Drop the -fPIC patch. - Drop the -fPIC patch.