[vhd2vl] RHBZ#660820 and release 2.4

[Chitlesh GOORAH]

commit 208e821b63a62abd1c318ea9aeb843e34498b2b9
Author: Chitlesh GOORAH <chitlesh at fedoraproject.org>
Date:   Thu Dec 15 08:15:51 2011 +0100

    RHBZ#660820 and release 2.4

 .gitignore  |    1 +
 sources     |    2 +-
 vhd2vl.spec |   30 ++++++++++++++++++++++++------
 3 files changed, 26 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index afdb7c6..476208c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 vhd2vl-2.3.tar.gz
+/vhd2vl-2.4.tar.gz
diff --git a/sources b/sources
index 0fdcf63..760e165 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ff5327e31ecdd378133004b4481f4e2  vhd2vl-2.3.tar.gz
+deb226d5b1566c654b286d38a5fd3789  vhd2vl-2.4.tar.gz
diff --git a/vhd2vl.spec b/vhd2vl.spec
index 564313b..f93148a 100644
--- a/vhd2vl.spec
+++ b/vhd2vl.spec
@@ -1,18 +1,26 @@
+# Features in Fedora/Free Electronic Lab
+#   Supported targets: EL-5, EL-6, F-15, F-16 and rawhide
+
+# Known bug reports not treated by this SPEC:
+# NONE yet
+
 Name:          vhd2vl
-Version:       2.3
-Release:       2.1%{?dist}
+Version:       2.4
+Release:       1%{?dist}
 Summary:       VHDL to Verilog translator
 
 License:       GPLv2+
 Group:         Applications/Engineering
-Url:           http://doolittle.icarus.com/~larry/%{name}/
+Url:           http://doolittle.icarus.com/~larry/vhd2vl/
 
 Source0:       http://doolittle.icarus.com/~larry/%{name}/%{name}-%{version}.tar.gz
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: flex bison flex-static
-
+BuildRequires: flex bison
+%if 0%{?fedora}
+BuildRequires: flex-static
+%endif
 
 %description
 vhd2vl is a VHDL to Verilog translation program.
@@ -24,8 +32,14 @@ subset of VHDL, sufficient for complex designs.
 %prep
 %setup -q
 
+# rpmlint warning: W: wrong-file-end-of-line-encoding /usr/share/doc/vhd2vl-2.4/examples/gh_fifo_async16_sr.vhd
+echo -n -e "... Fixing the end-of-line encodings of $f  \t"
+sed -i.bak -e 's|\r||g' examples/gh_fifo_async16_sr.vhd
+touch -r examples/gh_fifo_async16_sr.vhd.bak examples/gh_fifo_async16_sr.vhd
+%{__rm} -f examples/gh_fifo_async16_sr.vhd.bak
+echo "done"
 
-%{__sed} -i "s|gcc -Wall|gcc %{optflags}|" src/makefile
+%{__sed} -i "s|gcc \${STANDARD} \${WARNS} -O2 -g|gcc \${STANDARD} \${WARNS} %{optflags}|" src/makefile
 
 
 %build
@@ -51,6 +65,10 @@ subset of VHDL, sufficient for complex designs.
 
 
 %changelog
+* Tue Dec 06 2011 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 2.4-1
+- New upstream release
+- Fixed RHBZ#660820 - FTBFS vhd2vl-2.3-1.fc14
+
 * Fri May 06 2011 Karsten Hopp <karsten at redhat.com> 2.3-2.1
 - add buildrequirement flex-static