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 7633618..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: alliance
-# $Id$
-NAME := alliance
-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
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept 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/alliance-env.patch b/alliance-env.patch
index 2ddf663..2281a58 100644
--- a/alliance-env.patch
+++ b/alliance-env.patch
@@ -1,131 +1,65 @@
-diff -Naur distrib/etc/alc_env.csh.in etc/alc_env.csh.in
---- distrib/etc/alc_env.csh.in	2006-10-05 12:09:24.000000000 +0200
-+++ etc/alc_env.csh.in	2007-08-18 13:48:55.000000000 +0200
-@@ -1,4 +1,4 @@
--# -*- Mode: Shell-script     -*- 
-+# -*- Mode: Shell-script     -*-
- # -*- vim: set filetype=csh: -*-
- #             ,,,
- #            (o o)
-@@ -28,17 +28,17 @@
-  setenv MBK_OUT_LO           vst
-  setenv MBK_IN_PH            ap
-  setenv MBK_OUT_PH           ap
-- 
-+
-  setenv MBK_WORK_LIB         .
-  setenv MBK_CATAL_NAME       CATAL
-- 
-+
-  setenv MBK_SCALE_X          100
-- 
-+
-  setenv VH_MAXERR            10
-  setenv VH_BEHSFX            vbe
-  setenv VH_PATSFX            pat
-  setenv VH_DLYSFX            dly
-- 
-+
-  setenv MBK_CATA_LIB         ".:${ALLIANCE_TOP}/cells/sxlib"
-  setenv MBK_CATA_LIB         "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/dp_sxlib"
-  setenv MBK_CATA_LIB         "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/rflib"
-@@ -48,42 +48,29 @@
-  setenv MBK_CATA_LIB         "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/pxlib"
-  setenv MBK_CATA_LIB         "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/padlib"
-  setenv MBK_TARGET_LIB       "${ALLIANCE_TOP}/cells/sxlib"
-- setenv MBK_C4_LIB           ./cellsC4 
-- 
-+ setenv MBK_C4_LIB           ./cellsC4
-+
-  setenv MBK_VDD              vdd
-  setenv MBK_VSS              vss
-- 
-+
-  setenv XPAT_PARAM_NAME      "${ALLIANCE_TOP}/etc/xpat.par"
-  setenv XFSM_PARAM_NAME      "${ALLIANCE_TOP}/etc/xfsm.par"
-  setenv XSCH_PARAM_NAME      "${ALLIANCE_TOP}/etc/xsch.par"
-- 
-+
-  setenv RDS_IN               cif
-  setenv RDS_OUT              cif
-- 
-+
-  setenv DREAL_TECHNO_NAME    "${ALLIANCE_TOP}/etc/cmos.dreal"
-  setenv GRAAL_TECHNO_NAME    "${ALLIANCE_TOP}/etc/cmos.graal"
-  setenv GENVIEW_TECHNO_NAME  "${ALLIANCE_TOP}/etc/cmos.genview"
-- 
-+
-  setenv RDS_TECHNO_NAME      "${ALLIANCE_TOP}/etc/cmos.rds"
-  setenv ELP_TECHNO_NAME      "${ALLIANCE_TOP}/etc/prol.elp"
- 
- 
+--- distrib/etc/alc_env.csh.in  2006-10-05 12:09:25.000000000 +0200
++++ etc/alc_env.csh.in  2008-05-26 22:37:15.000000000 +0200
+@@ -70,20 +70,23 @@
+
  # System environment variables.
-- if ( $?PATH ) then
+  if ( $?PATH ) then
 -   setenv PATH "${ALLIANCE_TOP}/bin:$PATH"
-- else
--   setenv PATH "${ALLIANCE_TOP}/bin"
-- endif
--
--# Only needed on Solaris (included in /etc/ld.so.conf under Linux).
-- if ( $?LD_LIBRARY_PATH ) then
++   setenv PATH "${PATH}:${ALLIANCE_TOP}/bin"
+  else
+    setenv PATH "${ALLIANCE_TOP}/bin"
+  endif
+
+ # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
+  if ( $?LD_LIBRARY_PATH ) then
 -   setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:$LD_LIBRARY_PATH"
-- else
--   setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib"
-- endif
--
++   setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib"
+  else
+    setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib"
+  endif
+
 - if ( $?MANPATH ) then
 -   setenv MANPATH "${ALLIANCE_TOP}/man:${MANPATH}"
-- else
--   setenv MANPATH "${ALLIANCE_TOP}/man"
-- endif
-+  setenv PATH "${PATH}:${ALLIANCE_TOP}/bin"
++ if ($?MANPATH) then
 +  setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man"
+  else
+-   setenv MANPATH "${ALLIANCE_TOP}/man"
++  setenv MANPATH ":${ALLIANCE_TOP}/man"
+  endif
 +
 +# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
 +  setenv MBK_SPI_MODEL       "${ALLIANCE_TOP}/etc/spimodel.cfg"
-diff -Naur distrib/etc/alc_env.sh.in etc/alc_env.sh.in
---- distrib/etc/alc_env.sh.in	2006-10-05 12:09:24.000000000 +0200
-+++ etc/alc_env.sh.in	2007-08-18 13:47:04.000000000 +0200
-@@ -1,4 +1,4 @@
--# -*- Mode: Shell-script    -*- 
-+# -*- Mode: Shell-script    -*-
- # -*- vim: set filetype=sh: -*-
- #             ,,,
- #            (o o)
-@@ -24,7 +24,7 @@
- 
- # Alliance environment variables.
-            MBK_IN_LO=vst;                            export MBK_IN_LO
--          MBK_OUT_LO=vst;                            export MBK_OUT_LO 
-+          MBK_OUT_LO=vst;                            export MBK_OUT_LO
-            MBK_IN_PH=ap;                             export MBK_IN_PH
-           MBK_OUT_PH=ap;                             export MBK_OUT_PH
- 
-@@ -70,20 +70,8 @@
- 
- 
+--- distrib/etc/alc_env.sh.in   2006-10-05 12:09:25.000000000 +0200
++++ etc/alc_env.sh.in   2008-05-26 22:41:30.000000000 +0200
+@@ -70,20 +70,23 @@
+
+
  # System environment variables.
 - PATH=$ALLIANCE_TOP/bin:$PATH
-- export PATH
-+  export PATH=$PATH:$ALLIANCE_TOP/bin
-+  export MANPATH=$MANPATH:$ALLIANCE_TOP/man
- 
--# Only needed on Solaris (included in /etc/ld.so.conf under Linux).
-- if [ -z "${LD_LIBRARY_PATH}" ]; then
--   LD_LIBRARY_PATH=$ALLIANCE_TOP/lib
-- else
++ PATH=$PATH:$ALLIANCE_TOP/bin
+  export PATH
+
+ # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
+  if [ -z "${LD_LIBRARY_PATH}" ]; then
+    LD_LIBRARY_PATH=$ALLIANCE_TOP/lib
+  else
 -   LD_LIBRARY_PATH=$ALLIANCE_TOP/lib:$LD_LIBRARY_PATH
-- fi
-- export LD_LIBRARY_PATH
--
-- if [ -z "${MANPATH}" ]; then
++   LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib
+  fi
+  export LD_LIBRARY_PATH
+
+  if [ -z "${MANPATH}" ]; then
 -   MANPATH=$ALLIANCE_TOP/man
-- else
++   MANPATH=:$ALLIANCE_TOP/man
+  else
 -   MANPATH=$ALLIANCE_TOP/man:$MANPATH
-- fi
-- export MANPATH
++   MANPATH=$MANPATH:$ALLIANCE_TOP/man
+  fi
+  export MANPATH
++
 +# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
 +  MBK_SPI_MODEL=$ALLIANCE_TOP/etc/spimodel.cfg;      export MBK_SPI_MODEL
+
 diff -Naur distrib/etc/Makefile.am etc/Makefile.am
 --- distrib/etc/Makefile.am	2002-06-25 16:09:38.000000000 +0200
 +++ etc/Makefile.am	2007-08-18 13:58:38.000000000 +0200
diff --git a/alliance-generic.patch b/alliance-generic.patch
new file mode 100644
index 0000000..24591b9
--- /dev/null
+++ b/alliance-generic.patch
@@ -0,0 +1,20 @@
+--- vbl/src/vbl_bcomp_y.y	2004-09-03 21:11:18.000000000 +0200
++++ vbl_bcomp_y.y	2009-02-01 15:39:12.000000000 +0100
+@@ -4645,7 +4645,7 @@
+ 
+             if ( ! $1.DYNAMIC )
+             {
+-              VexTarget = vbl_dynamicvexatom( $1.NAME, $1.LEFT, $1.RIGHT, Dynamic );
++              VexTarget = vbl_dynamicvexatom( $1.NAME, $1.LEFT, $1.RIGHT, 0 );
+             }
+             else
+             {
+@@ -4903,7 +4903,7 @@
+ 
+             if ( ! $5.DYNAMIC )
+             {
+-              VexTarget = vbl_dynamicvexatom( $5.NAME, $5.LEFT, $5.RIGHT, Dynamic );
++              VexTarget = vbl_dynamicvexatom( $5.NAME, $5.LEFT, $5.RIGHT, 0 );
+             }
+             else
+             {
diff --git a/alliance.spec b/alliance.spec
index 3c81939..994b2bc 100644
--- a/alliance.spec
+++ b/alliance.spec
@@ -1,10 +1,11 @@
 %define        prefix    %{_libdir}/%{name}
 %define        snapshot  20070718
+%define        _default_patch_fuzz  2
 
 Name:          alliance
 Version:       5.0
-Release:       13.%{snapshot}snap%{?dist}
-Summary:       Alliance VLSI CAD Sytem
+Release:       24.%{snapshot}snap%{?dist}
+Summary:       VLSI EDA System
 
 License:       GPLv2
 Group:         Applications/Engineering
@@ -17,6 +18,7 @@ Patch1:        alliance-examples.patch
 Patch2:        alliance-run.patch
 Patch3:        alliance-perms.patch
 Patch4:        alliance-gcc43.patch
+Patch5:        alliance-generic.patch
 
 Source1:       xsch.desktop
 Source2:       dreal.desktop
@@ -42,8 +44,9 @@ BuildRequires: lesstif-devel libXt-devel byacc desktop-file-utils bison
 BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4
 BuildRequires: transfig ghostscript
 
-Requires:      %{name}-libs = %{version}-%{release}
-
+Requires:       xorg-x11-fonts-misc
+# 442379
+Requires(post): %{name}-libs = %{version}-%{release}
 
 %description
 Alliance is a complete set of free CAD tools and portable libraries for
@@ -125,6 +128,7 @@ tar -xvf %{SOURCE14}
 
 
 %patch4 -p1 -b .include
+%patch5 -p0 -b .generic
 
 # make sure the man pages are UTF-8...
 for nonUTF8 in distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \
@@ -200,6 +204,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 for desktopfile in *.desktop; do
 desktop-file-install --vendor fedora          \
   --add-category Engineering                  \
+  --add-category Electronics                  \
   --remove-category Science                   \
   --dir %{buildroot}%{_datadir}/applications/ \
   $desktopfile
@@ -289,6 +294,36 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %changelog
+* Sun Feb 01 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-24.20070718snap
+- Improved VHDL generic implementation
+
+* Mon Nov 10 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-23.20070718snap
+- Added Requires xorg-x11-fonts-misc to fix launch crash
+
+* Mon Nov 3 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-22.20070718snap
+- rebuild for F10
+
+* Mon Sep 15 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-21.20070718snap
+- Bugfix : Alliance incorrectly mungs your path and adds the cwd to the path #459336
+- Bugfix : Latest alc_env fixes broken system man path #452645
+
+* Mon Aug 04 2008 Aanjhan Ranganathan <aanjhan [AT] tuxmaniac DOT com> - 5.0-20.20070718snap
+- Bumped release version to match changelog
+
+* Fri Aug 01 2008 Aanjhan Ranganathan <aanjhan [AT] tuxmaniac DOT com> - 5.0-16.20070718snap
+- Rebuild using latest lesstif-devel. For #368441
+- Temporarily set fuzz parameter of patch system to be 2
+
+* Fri May 30 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-16.20070718snap
+- Bugfix /etc/profile.d/alc_env.csh problem #449062 #448480
+
+* Mon May 26 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-15.20070718snap
+- Bugfix: error in postinstall scriptlet: /etc/profile.d/alc_env.sh not found #442379
+- Bugfix: /etc/profile.d/alc_env.csh assumes MANPATH is preset #440083
+
+* Tue May 20 2008 Thibault North < tnorth [AT] fedoraproject DOT org> - 5.0-14.20070718snap
+- Add to Electronics Menu
+
 * Fri Mar 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-13.20070718snap
 - Requiring new FEL menu structure
 - Fixing previous desktop files