18 changed files with 264 additions and 53042 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,2 @@
+alliance-5.0-20090901.tar.gz
 /alliance-5.1.1.tar.bz2
--- a/0000-alliance-5.1.1-gitd8c05cd.patch
+++ b/0000-alliance-5.1.1-gitd8c05cd.patch
--- a/0001-Remove-stray-files.patch
+++ b/0001-Remove-stray-files.patch
--- a/0002-Update-autostuff.patch
+++ b/0002-Update-autostuff.patch
@ -1,191 +0,0 @@
-From c4b1cb8e7cbf8e36282f42b9307fe46b6cc6a92f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
-Date: Sun, 28 Feb 2016 10:07:48 +0100
-Subject: [PATCH 02/10] Update autostuff
-
---
- alliance/src/Makefile.am |   2 +
- alliance/src/autostuff   | 123 ++++++++++++++++++++++++-----------------------
- 2 files changed, 66 insertions(+), 59 deletions(-)
-
-diff --git a/alliance/src/Makefile.am b/alliance/src/Makefile.am
-index 061389e..e23b5c2 100644
--- a/alliance/src/Makefile.am
-+++ b/alliance/src/Makefile.am
-@@ -1,3 +1,5 @@
-+ACLOCAL_AMFLAGS = -I.
-+
- SUBDIRS = @TOOLSDIRS@
- 
- EXTRA_DIST = autostuff alliance.m4 motif.m4 oldgcc.m4 xpm.m4 build depcomp \
-diff --git a/alliance/src/autostuff b/alliance/src/autostuff
-index 53083eb..2955c8b 100755
--- a/alliance/src/autostuff
-+++ b/alliance/src/autostuff
-@@ -89,38 +89,40 @@ ordered_dirs="$ordered_dirs $dirs"
- 
- AC_OUTPUT=`find $ordered_dirs -name Makefile.am | sed "s,\.am,,"`
- 
-rm -f configure.in
-echo ""                                      >> configure.in
-echo "AC_INIT(./autostuff)"                  >> configure.in
-echo "AM_INIT_AUTOMAKE(alliance, 5.0)"       >> configure.in
-echo ""                                      >> configure.in
-echo "AM_PROG_LEX"                           >> configure.in
-echo "AM_PROG_LIBTOOL"                       >> configure.in
-echo "AC_CHECK_HEADERS(fcntl.h malloc.h strings.h sys/time.h unistd.h)" >>  configure.in
-echo "AC_CHECK_HEADERS(strings.h unistd.h)"  >> configure.in
-echo "AC_CHECK_LIB(gen, basename)"           >> configure.in
-echo "AC_CHECK_LIB(iberty, basename)"        >> configure.in
-echo "AC_CHECK_LIB(m, exp)"                  >> configure.in
-echo "AC_CHECK_LIB(m, floor)"                >> configure.in
-echo "AC_CHECK_LIB(m, pow)"                  >> configure.in
-echo "AC_CHECK_LIB(m, sqrt)"                 >> configure.in
-echo "AC_CHECK_PROG(SED, sed, sed)"          >> configure.in
-echo "AC_CHECK_PROGS(SED, gsed sed)"         >> configure.in
-echo "AC_C_CONST"                            >> configure.in
-echo "AC_FUNC_VFORK"                         >> configure.in
-echo "AC_HEADER_STDC"                        >> configure.in
-echo "AC_HEADER_SYS_WAIT"                    >> configure.in
-echo "AC_PATH_XTRA"                          >> configure.in
-echo "AC_PROG_CC"                            >> configure.in
-echo "AC_PROG_CPP"                           >> configure.in
-echo "AC_PROG_CXX"                           >> configure.in
-echo "AC_PROG_INSTALL"                       >> configure.in
-echo "AC_PROG_MAKE_SET"                      >> configure.in
-echo "AC_PROG_LIBTOOL"                       >> configure.in
-echo "AC_PROG_YACC"                          >> configure.in
-echo "AC_TYPE_SIGNAL"                        >> configure.in
-+rm -f configure.ac
-+echo ""                                      >> configure.ac
-+echo "AC_INIT(alliance,5.0)"                 >> configure.ac
-+echo "AC_CONFIG_SRCDIR(./autostuff)"         >> configure.ac
-+echo "AM_INIT_AUTOMAKE(foreign)"             >> configure.ac
-+echo "AC_CONFIG_MACRO_DIRS([.])"             >> configure.ac
-+echo ""                                      >> configure.ac
-+echo "AM_PROG_LEX"                           >> configure.ac
-+echo "AM_PROG_LIBTOOL"                       >> configure.ac
-+echo "AC_CHECK_HEADERS(fcntl.h malloc.h strings.h sys/time.h unistd.h)" >>  configure.ac
-+echo "AC_CHECK_HEADERS(strings.h unistd.h)"  >> configure.ac
-+echo "AC_CHECK_LIB(gen, basename)"           >> configure.ac
-+echo "AC_CHECK_LIB(iberty, basename)"        >> configure.ac
-+echo "AC_CHECK_LIB(m, exp)"                  >> configure.ac
-+echo "AC_CHECK_LIB(m, floor)"                >> configure.ac
-+echo "AC_CHECK_LIB(m, pow)"                  >> configure.ac
-+echo "AC_CHECK_LIB(m, sqrt)"                 >> configure.ac
-+echo "AC_CHECK_PROG(SED, sed, sed)"          >> configure.ac
-+echo "AC_CHECK_PROGS(SED, gsed sed)"         >> configure.ac
-+echo "AC_C_CONST"                            >> configure.ac
-+echo "AC_FUNC_VFORK"                         >> configure.ac
-+echo "AC_HEADER_STDC"                        >> configure.ac
-+echo "AC_HEADER_SYS_WAIT"                    >> configure.ac
-+echo "AC_PATH_XTRA"                          >> configure.ac
-+echo "AC_PROG_CC"                            >> configure.ac
-+echo "AC_PROG_CPP"                           >> configure.ac
-+echo "AC_PROG_CXX"                           >> configure.ac
-+echo "AC_PROG_INSTALL"                       >> configure.ac
-+echo "AC_PROG_MAKE_SET"                      >> configure.ac
-+echo "AC_PROG_LIBTOOL"                       >> configure.ac
-+echo "AC_PROG_YACC"                          >> configure.ac
-+echo "AC_TYPE_SIGNAL"                        >> configure.ac
- 
-cat >> configure.in <<"EOF"
-+cat >> configure.ac <<"EOF"
- dnl
- dnl Check for X stuff
- dnl
-@@ -283,60 +285,63 @@ LDFLAGS="$ice_save_LDFLAGS"
- fi
- EOF
- 
-echo "AM_ALLIANCE"                                 >> configure.in
-echo "AM_CONDITIONAL([ALLIANCE_BUILD],[(exit 0)])" >> configure.in
-+echo "AM_ALLIANCE"                                 >> configure.ac
-+echo "AM_CONDITIONAL([ALLIANCE_BUILD],[(exit 0)])" >> configure.ac
- 
- find $ordered_dirs -name configure.in | while read config; do
-   echo "Scanning $config"
-  echo "" >> configure.in
-  echo "dnl Infos extracted from $config"  >> configure.in
-+  echo "" >> configure.ac
-+  echo "dnl Infos extracted from $config"  >> configure.ac
- 
-   for version_line in  `grep -ah _CUR= $config`; do
-    echo "$version_line"  >> configure.in
-+    echo "$version_line"  >> configure.ac
-     version_name=`echo $version_line | sed 's,=.*,,'`
-    echo "AC_SUBST($version_name)" >> configure.in
-+    echo "AC_SUBST($version_name)" >> configure.ac
-   done
-   for version_line in  `grep -ah _REV= $config`; do
-    echo "$version_line"  >> configure.in
-+    echo "$version_line"  >> configure.ac
-     version_name=`echo $version_line | sed 's,=.*,,'`
-    echo "AC_SUBST($version_name)" >> configure.in
-+    echo "AC_SUBST($version_name)" >> configure.ac
-   done
-   for version_line in  `grep -ah _REL= $config`; do
-    echo "$version_line"  >> configure.in
-+    echo "$version_line"  >> configure.ac
-     version_name=`echo $version_line | sed 's,=.*,,'`
-    echo "AC_SUBST($version_name)" >> configure.in
-+    echo "AC_SUBST($version_name)" >> configure.ac
-   done
- 
-   for dll_line in `grep -ah _DLL_VERSION= $config`; do
-    echo "$dll_line"  >> configure.in
-+    echo "$dll_line"  >> configure.ac
-     dll_name=`echo $dll_line | sed 's,=.*,,'`
-    echo "AC_SUBST($dll_name)" >> configure.in
-+    echo "AC_SUBST($dll_name)" >> configure.ac
-   done
-   for version_line in  `grep -ah _VERSION= $config | grep -v DLL`; do
-    echo "$version_line"  >> configure.in
-+    echo "$version_line"  >> configure.ac
-     version_name=`echo $version_line | sed 's,=.*,,'`
-    echo "AC_SUBST($version_name)" >> configure.in
-+    echo "AC_SUBST($version_name)" >> configure.ac
-   done
- done
- 
-echo ""                                      >> configure.in
-echo "TOOLSDIRS=\"$ordered_dirs\""           >> configure.in
-echo "AC_SUBST(TOOLSDIRS)"                   >> configure.in
-+echo ""                                      >> configure.ac
-+echo "TOOLSDIRS=\"$ordered_dirs\""           >> configure.ac
-+echo "AC_SUBST(TOOLSDIRS)"                   >> configure.ac
- 
-echo ""                                      >> configure.in
-echo "AC_OUTPUT(["                           >> configure.in
-echo "Makefile"                              >> configure.in
-echo "distrib/etc/alc_env.sh"                >> configure.in
-echo "distrib/etc/alc_env.csh"               >> configure.in
-+echo ""                                      >> configure.ac
-+echo "# HACK: Set to empty."                 >> configure.ac
-+echo "AC_SUBST([ALLIANCE_LIB],[ ])"          >> configure.ac
-+echo "AC_SUBST([ALLIANCE_CFLAGS],[ ])"	     >> configure.ac
-+echo "AC_SUBST([ALLIANCE_TOP],[ ])"          >> configure.ac
-+
-+echo ""                                      >> configure.ac
-+echo "AC_OUTPUT(["                           >> configure.ac
-+echo "Makefile"                              >> configure.ac
-+echo "distrib/etc/alc_env.sh"                >> configure.ac
-+echo "distrib/etc/alc_env.csh"               >> configure.ac
- for template in $AC_OUTPUT; do
-  echo "$template"                           >> configure.in
-+  echo "$template"                           >> configure.ac
- done
-echo "])"                                    >> configure.in
-+echo "])"                                    >> configure.ac
- 
- 
-aclocal -I .
-libtoolize --force --copy --automake
-automake --foreign --add-missing --copy
-autoconf
-+autoreconf -fi
- 
- exit 0
-- 
-2.5.0
-
--- a/0003-Consolidate-installation-dirs.patch
+++ b/0003-Consolidate-installation-dirs.patch
@ -1,151 +0,0 @@
-From 9397e394dfbb0162236e85d6046862fb7e9bae58 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
-Date: Mon, 29 Feb 2016 14:49:22 +0100
-Subject: [PATCH 03/10] Consolidate installation dirs
-
---
- alliance/src/cells/src/dp_sxlib/Makefile.am |  2 +-
- alliance/src/cells/src/mpxlib/Makefile.am   |  2 +-
- alliance/src/cells/src/msxlib/Makefile.am   |  2 +-
- alliance/src/cells/src/padlib/Makefile.am   |  2 +-
- alliance/src/cells/src/pxlib/Makefile.am    |  2 +-
- alliance/src/cells/src/ramlib/Makefile.am   |  2 +-
- alliance/src/cells/src/rf2lib/Makefile.am   |  2 +-
- alliance/src/cells/src/rflib/Makefile.am    |  2 +-
- alliance/src/cells/src/romlib/Makefile.am   |  2 +-
- alliance/src/cells/src/sxlib/Makefile.am    | 14 +++++++-------
- 10 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/alliance/src/cells/src/dp_sxlib/Makefile.am b/alliance/src/cells/src/dp_sxlib/Makefile.am
-index 58fa1a2..5d1b32f 100644
--- a/alliance/src/cells/src/dp_sxlib/Makefile.am
-+++ b/alliance/src/cells/src/dp_sxlib/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am,v 1.4 2002/05/08 21:07:13 jpc Exp $
- 
-dp_sxlibdir=$(prefix)/cells/dp_sxlib
-+dp_sxlibdir=$(pkgdatadir)/cells/dp_sxlib
- 
- dp_sxlib_DATA=CATAL dp_dff_scan_x4.ap dp_dff_scan_x4.vbe dp_dff_scan_x4_buf.ap dp_dff_scan_x4_buf.vbe dp_dff_x4.ap dp_dff_x4.vbe dp_dff_x4_buf.ap dp_dff_x4_buf.vbe dp_mux_x2.ap dp_mux_x2.vbe dp_mux_x2_buf.ap dp_mux_x2_buf.vbe dp_mux_x4.ap dp_mux_x4.vbe dp_mux_x4_buf.ap dp_mux_x4_buf.vbe dp_nmux_x1.ap dp_nmux_x1.vbe dp_nmux_x1_buf.ap dp_nmux_x1_buf.vbe dp_nts_x2.ap dp_nts_x2.vbe dp_nts_x2_buf.ap dp_nts_x2_buf.vbe dp_rom2_buf.ap dp_rom2_buf.vbe dp_rom4_buf.ap dp_rom4_buf.vbe dp_rom4_nxr2_x4.ap dp_rom4_nxr2_x4.vbe dp_rom4_xr2_x4.ap dp_rom4_xr2_x4.vbe dp_sff_scan_x4.ap dp_sff_scan_x4.vbe dp_sff_scan_x4_buf.ap dp_sff_scan_x4_buf.vbe dp_sff_x4.ap dp_sff_x4.vbe dp_sff_x4_buf.ap dp_sff_x4_buf.vbe dp_sxlib.lef dp_ts_x4.ap dp_ts_x4.vbe dp_ts_x4_buf.ap dp_ts_x4_buf.vbe dp_ts_x8.ap dp_ts_x8.vbe dp_ts_x8_buf.ap dp_ts_x8_buf.vbe
- 
-diff --git a/alliance/src/cells/src/mpxlib/Makefile.am b/alliance/src/cells/src/mpxlib/Makefile.am
-index 9469aab..47166af 100644
--- a/alliance/src/cells/src/mpxlib/Makefile.am
-+++ b/alliance/src/cells/src/mpxlib/Makefile.am
-@@ -1,5 +1,5 @@
- 
-mpxlibdir=$(prefix)/cells/mpxlib
-+mpxlibdir=$(pkgdatadir)/cells/mpxlib
- 
- mpxlib_DATA=CATAL \
-             pck_mpx.ap \
-diff --git a/alliance/src/cells/src/msxlib/Makefile.am b/alliance/src/cells/src/msxlib/Makefile.am
-index d67fc5b..5300de0 100644
--- a/alliance/src/cells/src/msxlib/Makefile.am
-+++ b/alliance/src/cells/src/msxlib/Makefile.am
-@@ -1,5 +1,5 @@
- 
-msxlibdir=$(prefix)/cells/msxlib
-+msxlibdir=$(pkgdatadir)/cells/msxlib
- 
- msxlib_DATA=CATAL \
-             an2_x05.ap \
-diff --git a/alliance/src/cells/src/padlib/Makefile.am b/alliance/src/cells/src/padlib/Makefile.am
-index 9b14265..b28a371 100644
--- a/alliance/src/cells/src/padlib/Makefile.am
-+++ b/alliance/src/cells/src/padlib/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am,v 1.4 2002/05/08 21:07:24 jpc Exp $
- 
-padlibdir=$(prefix)/cells/padlib
-+padlibdir=$(pkgdatadir)/cells/padlib
- 
- padlib_DATA=CATAL corner_sp.ap corner_sp.vbe padreal.ap padreal.cif padsymb.db palck_sp.ap pali_sp.ap paliot_sp.ap paliotw_sp.ap palo_sp.ap palot_sp.ap palotw_sp.ap palow_sp.ap palvdde_sp.ap palvddeck_sp.ap palvddi_sp.ap palvddick_sp.ap palvsse_sp.ap palvsseck_sp.ap palvssi_sp.ap palvssick_sp.ap pck_sp.al pck_sp.ap pck_sp.vbe pi_sp.al pi_sp.ap pi_sp.vbe piot_sp.al piot_sp.ap piot_sp.vbe piotw_sp.al piotw_sp.ap piotw_sp.vbe po_sp.al po_sp.ap po_sp.vbe pot_sp.al pot_sp.ap pot_sp.vbe potw_sp.al potw_sp.ap potw_sp.vbe pow_sp.al pow_sp.ap pow_sp.vbe pvdde_sp.al pvdde_sp.ap pvdde_sp.vbe pvddeck_sp.al pvddeck_sp.ap pvddeck_sp.vbe pvddi_sp.al pvddi_sp.ap pvddi_sp.vbe pvddick_sp.al pvddick_sp.ap pvddick_sp.vbe pvsse_sp.al pvsse_sp.ap pvsse_sp.vbe pvsseck_sp.al pvsseck_sp.ap pvsseck_sp.vbe pvssi_sp.al pvssi_sp.ap pvssi_sp.vbe pvssick_sp.al pvssick_sp.ap pvssick_sp.vbe
- 
-diff --git a/alliance/src/cells/src/pxlib/Makefile.am b/alliance/src/cells/src/pxlib/Makefile.am
-index 3a2ed65..d0f631f 100644
--- a/alliance/src/cells/src/pxlib/Makefile.am
-+++ b/alliance/src/cells/src/pxlib/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am,v 1.2 2005/11/08 10:13:51 franck Exp $
- 
-pxlibdir=$(prefix)/cells/pxlib
-+pxlibdir=$(pkgdatadir)/cells/pxlib
- 
- pxlib_DATA=CATAL \
-            pck_px.ap \
-diff --git a/alliance/src/cells/src/ramlib/Makefile.am b/alliance/src/cells/src/ramlib/Makefile.am
-index 66febd9..63a92ff 100644
--- a/alliance/src/cells/src/ramlib/Makefile.am
-+++ b/alliance/src/cells/src/ramlib/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am,v 1.1 2002/07/15 22:23:32 jpc Exp $
- 
-ramlibdir   = $(prefix)/cells/ramlib
-+ramlibdir   = $(pkgdatadir)/cells/ramlib
- 
- ramlib_DATA = ramlib.lef \
-               CATAL \
-diff --git a/alliance/src/cells/src/rf2lib/Makefile.am b/alliance/src/cells/src/rf2lib/Makefile.am
-index fd9318a..fc80cd3 100644
--- a/alliance/src/cells/src/rf2lib/Makefile.am
-+++ b/alliance/src/cells/src/rf2lib/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am,v 1.2 2004/09/29 21:50:28 jpc Exp $
- 
-rf2libdir=$(prefix)/cells/rf2lib
-+rf2libdir=$(pkgdatadir)/cells/rf2lib
- 
- rf2lib_DATA=CATAL \
-     rf2lib.lef \
-diff --git a/alliance/src/cells/src/rflib/Makefile.am b/alliance/src/cells/src/rflib/Makefile.am
-index 33ee5ac..6f8ffa7 100644
--- a/alliance/src/cells/src/rflib/Makefile.am
-+++ b/alliance/src/cells/src/rflib/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am,v 1.4 2002/05/08 21:07:24 jpc Exp $
- 
-rflibdir=$(prefix)/cells/rflib
-+rflibdir=$(pkgdatadir)/cells/rflib
- 
- rflib_DATA=CATAL rf_dec_bufad0.ap rf_dec_bufad0.vbe rf_dec_bufad1.ap rf_dec_bufad1.vbe rf_dec_bufad2.ap rf_dec_bufad2.vbe rf_dec_nand2.ap rf_dec_nand2.vbe rf_dec_nand3.ap rf_dec_nand3.vbe rf_dec_nand4.ap rf_dec_nand4.vbe rf_dec_nao3.ap rf_dec_nao3.vbe rf_dec_nbuf.ap rf_dec_nbuf.vbe rf_dec_nor3.ap rf_dec_nor3.vbe rf_fifo_buf.ap rf_fifo_buf.vbe rf_fifo_clock.ap rf_fifo_clock.vbe rf_fifo_empty.ap rf_fifo_empty.vbe rf_fifo_full.ap rf_fifo_full.vbe rf_fifo_inc.ap rf_fifo_inc.vbe rf_fifo_nop.ap rf_fifo_nop.vbe rf_fifo_ok.ap rf_fifo_ok.vbe rf_fifo_orand4.ap rf_fifo_orand4.vbe rf_fifo_orand5.ap rf_fifo_orand5.vbe rf_fifo_ptreset.ap rf_fifo_ptreset.vbe rf_fifo_ptset.ap rf_fifo_ptset.vbe rf_inmux_buf_2.ap rf_inmux_buf_2.vbe rf_inmux_buf_4.ap rf_inmux_buf_4.vbe rf_inmux_mem.ap rf_inmux_mem.vbe rf_mid_buf_2.ap rf_mid_buf_2.vbe rf_mid_buf_4.ap rf_mid_buf_4.vbe rf_mid_mem.ap rf_mid_mem.vbe rf_mid_mem_r0.ap rf_mid_mem_r0.vbe rf_out_buf_2.ap rf_out_buf_2.vbe rf_out_buf_4.ap rf_out_buf_4.vbe rf_out_mem.ap rf_out_mem.vbe rflib.lef
- 
-diff --git a/alliance/src/cells/src/romlib/Makefile.am b/alliance/src/cells/src/romlib/Makefile.am
-index 578081e..b9ae364 100644
--- a/alliance/src/cells/src/romlib/Makefile.am
-+++ b/alliance/src/cells/src/romlib/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am,v 1.2 2006/06/07 19:20:03 jpc Exp $
- 
-romlibdir   = $(prefix)/cells/romlib
-+romlibdir   = $(pkgdatadir)/cells/romlib
- 
- romlib_DATA = romlib.lef \
-               CATAL \
-diff --git a/alliance/src/cells/src/sxlib/Makefile.am b/alliance/src/cells/src/sxlib/Makefile.am
-index fdadefe..ef8957c 100644
--- a/alliance/src/cells/src/sxlib/Makefile.am
-+++ b/alliance/src/cells/src/sxlib/Makefile.am
-@@ -1,12 +1,12 @@
- # $Id: Makefile.am,v 1.5 2002/05/08 21:07:24 jpc Exp $
- 
-sxlibvbedir=$(prefix)/cells/sxlib
-sxlibapdir=$(prefix)/cells/sxlib
-sxlibaldir=$(prefix)/cells/sxlib
-sxlibdatdir=$(prefix)/cells/sxlib
-sxlibvhddir=$(prefix)/cells/sxlib
-sxlibetcdir=$(prefix)/cells/sxlib
-sxlibsymdir=$(prefix)/cells/sxlib
-+sxlibvbedir=$(pkgdatadir)/cells/sxlib
-+sxlibapdir=$(pkgdatadir)/cells/sxlib
-+sxlibaldir=$(pkgdatadir)/cells/sxlib
-+sxlibdatdir=$(pkgdatadir)/cells/sxlib
-+sxlibvhddir=$(pkgdatadir)/cells/sxlib
-+sxlibetcdir=$(pkgdatadir)/cells/sxlib
-+sxlibsymdir=$(pkgdatadir)/cells/sxlib
- 
- sxlibvbe_DATA = a2_x2.vbe a2_x4.vbe a3_x2.vbe a3_x4.vbe \
- a4_x2.vbe a4_x4.vbe an12_x1.vbe an12_x4.vbe ao22_x2.vbe \
-- 
-2.5.0
-
--- a/0004-Misc-installation-dirs-fixes.patch
+++ b/0004-Misc-installation-dirs-fixes.patch
@ -1,316 +0,0 @@
-From d0a8e157bca76b7686d632e15f6360e549241dbf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
-Date: Mon, 29 Feb 2016 14:53:11 +0100
-Subject: [PATCH 04/10] Misc installation dirs fixes.
-
---
- alliance/src/attila/doc/Makefile.am              | 1 -
- alliance/src/attila/doc/attila/Makefile.am       | 5 +----
- alliance/src/attila/etc/Makefile.am              | 2 +-
- alliance/src/distrib/etc/Makefile.am             | 4 ++--
- alliance/src/documentation/Makefile.am           | 5 +----
- alliance/src/documentation/tutorials/Makefile.am | 2 +-
- alliance/src/dreal/etc/Makefile.am               | 2 +-
- alliance/src/elp/etc/Makefile.am                 | 2 +-
- alliance/src/genlib/doc/Makefile.am              | 1 -
- alliance/src/genlib/doc/genlib/Makefile.am       | 2 +-
- alliance/src/graal/etc/Makefile.am               | 2 +-
- alliance/src/mbk/etc/Makefile.am                 | 2 +-
- alliance/src/nero/doc/Makefile.am                | 1 -
- alliance/src/nero/doc/nero/Makefile.am           | 5 +----
- alliance/src/rds/etc/Makefile.am                 | 2 +-
- alliance/src/scapin/etc/Makefile.am              | 2 +-
- alliance/src/sea/etc/Makefile.am                 | 2 +-
- alliance/src/xfsm/etc/Makefile.am                | 2 +-
- alliance/src/xgra/etc/Makefile.am                | 2 +-
- alliance/src/xpat/etc/Makefile.am                | 2 +-
- alliance/src/xsch/etc/Makefile.am                | 2 +-
- alliance/src/xvpn/etc/Makefile.am                | 2 +-
- 22 files changed, 20 insertions(+), 32 deletions(-)
-
-diff --git a/alliance/src/attila/doc/Makefile.am b/alliance/src/attila/doc/Makefile.am
-index ff3f0f1..46665bd 100644
--- a/alliance/src/attila/doc/Makefile.am
-+++ b/alliance/src/attila/doc/Makefile.am
-@@ -1,7 +1,6 @@
- 
- SUBDIRS = attila man1
- 
-pdfdir = $(prefix)/doc/pdf
- pdf_DATA = attila.pdf
- 
- EXTRA_DIST = $(pdf_DATA) \
-diff --git a/alliance/src/attila/doc/attila/Makefile.am b/alliance/src/attila/doc/attila/Makefile.am
-index d342379..86e7e1e 100644
--- a/alliance/src/attila/doc/attila/Makefile.am
-+++ b/alliance/src/attila/doc/attila/Makefile.am
-@@ -1,12 +1,9 @@
- 
- 
-pkghtmldir = $(prefix)/doc/html/@PACKAGE@
-+pkghtmldir = $(htmldir)/@PACKAGE@
- pkghtml_DATA = \
-                ./attila.html \
-                ./ref_attila.html \
-                ./man_attila.html
- 
- EXTRA_DIST = $(pkghtml_DATA)
-
-install-data-hook:
-	find $(DESTDIR)$(prefix)/doc/html/@PACKAGE@ -type f | xargs chmod g+w
-diff --git a/alliance/src/attila/etc/Makefile.am b/alliance/src/attila/etc/Makefile.am
-index b69a787..0902c40 100644
--- a/alliance/src/attila/etc/Makefile.am
-+++ b/alliance/src/attila/etc/Makefile.am
-@@ -1,4 +1,4 @@
-etcdir = $(prefix)/etc
-+etcdir=$(sysconfdir)/alliance
- 
- etc_DATA = attila.conf
- 
-diff --git a/alliance/src/distrib/etc/Makefile.am b/alliance/src/distrib/etc/Makefile.am
-index 39d2d29..f84b52b 100644
--- a/alliance/src/distrib/etc/Makefile.am
-+++ b/alliance/src/distrib/etc/Makefile.am
-@@ -1,7 +1,7 @@
- # $Id: Makefile.am,v 1.9 2012/05/03 15:32:24 jpc Exp $
- 
-etcdir=$(sysconfdir)/profile.d
-+profileddir=$(sysconfdir)/profile.d
- 
-etc_SCRIPTS=alc_env.csh alc_env.sh
-+profiled_DATA=alc_env.csh alc_env.sh
- 
- EXTRA_DIST=alc_env.csh.in alc_env.sh.in
-diff --git a/alliance/src/documentation/Makefile.am b/alliance/src/documentation/Makefile.am
-index f937897..5a2c299 100644
--- a/alliance/src/documentation/Makefile.am
-+++ b/alliance/src/documentation/Makefile.am
-@@ -1,9 +1,6 @@
- 
- SUBDIRS = tutorials
- 
-
-docdir = $(prefix)/doc
-
- nobase_doc_DATA = overview/datapath.gif \
-                   overview/genview.gif \
-                   overview/graal.gif \
-@@ -51,7 +48,7 @@ nobase_doc_DATA = overview/datapath.gif \
-                   design-flow/xpat.gif \
-                   design-flow/xsch.gif
- 
-examplesdir = $(prefix)/examples
-+examplesdir = $(docdir)/examples
- 
- nobase_examples_DATA = regression.sh \
-                        alliance-examples/go-all.sh \
-diff --git a/alliance/src/documentation/tutorials/Makefile.am b/alliance/src/documentation/tutorials/Makefile.am
-index f97c255..547c094 100644
--- a/alliance/src/documentation/tutorials/Makefile.am
-+++ b/alliance/src/documentation/tutorials/Makefile.am
-@@ -1,5 +1,5 @@
- 
-tutorialsdir = $(prefix)/tutorials
-+tutorialsdir = $(docdir)/tutorials
- 
- nobase_tutorials_DATA = place_and_route/src/Makefile \
-                         place_and_route/src/amd2901/Makefile \
-diff --git a/alliance/src/dreal/etc/Makefile.am b/alliance/src/dreal/etc/Makefile.am
-index debdb76..3e3d097 100644
--- a/alliance/src/dreal/etc/Makefile.am
-+++ b/alliance/src/dreal/etc/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am,v 1.5 2002/05/08 21:07:25 jpc Exp $
- 
-etcdir=$(prefix)/etc
-+etcdir=$(sysconfdir)/alliance
- 
- etc_DATA=cmos.dreal
- 
-diff --git a/alliance/src/elp/etc/Makefile.am b/alliance/src/elp/etc/Makefile.am
-index b8ef276..c833a67 100644
--- a/alliance/src/elp/etc/Makefile.am
-+++ b/alliance/src/elp/etc/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am,v 1.5 2002/05/08 21:07:25 jpc Exp $
- 
-etcdir=$(prefix)/etc
-+etcdir=$(sysconfdir)/alliance
- 
- etc_DATA=prol.elp
- 
-diff --git a/alliance/src/genlib/doc/Makefile.am b/alliance/src/genlib/doc/Makefile.am
-index ec53916..b4e44c5 100644
--- a/alliance/src/genlib/doc/Makefile.am
-+++ b/alliance/src/genlib/doc/Makefile.am
-@@ -1,7 +1,6 @@
- 
- SUBDIRS = genlib
- 
-pdfdir = $(prefix)/doc/pdf
- pdf_DATA = genlib.pdf
- 
- EXTRA_DIST = $(pdf_DATA) \
-diff --git a/alliance/src/genlib/doc/genlib/Makefile.am b/alliance/src/genlib/doc/genlib/Makefile.am
-index 448eabb..b398869 100644
--- a/alliance/src/genlib/doc/genlib/Makefile.am
-+++ b/alliance/src/genlib/doc/genlib/Makefile.am
-@@ -1,6 +1,6 @@
- 
- 
-pkghtmldir = $(prefix)/doc/html/@PACKAGE@
-+pkghtmldir = $(htmldir)/@PACKAGE@
- pkghtml_DATA = \
-                ./genlib.html \
-                ./ref_genlib.html \
-diff --git a/alliance/src/graal/etc/Makefile.am b/alliance/src/graal/etc/Makefile.am
-index 3ca5068..dfec7cb 100644
--- a/alliance/src/graal/etc/Makefile.am
-+++ b/alliance/src/graal/etc/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am,v 1.6 2002/05/08 21:07:25 jpc Exp $
- 
-etcdir=$(prefix)/etc
-+etcdir=$(sysconfdir)/alliance
- 
- etc_DATA=cmos.graal
- 
-diff --git a/alliance/src/mbk/etc/Makefile.am b/alliance/src/mbk/etc/Makefile.am
-index 2e75ab1..ba1b61d 100644
--- a/alliance/src/mbk/etc/Makefile.am
-+++ b/alliance/src/mbk/etc/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am,v 1.4 2002/05/08 21:07:25 jpc Exp $
- 
-etcdir=$(prefix)/etc
-+etcdir=$(sysconfdir)/alliance
- 
- etc_DATA=spimodel.cfg
- 
-diff --git a/alliance/src/nero/doc/Makefile.am b/alliance/src/nero/doc/Makefile.am
-index 0c33137..56d01bc 100644
--- a/alliance/src/nero/doc/Makefile.am
-+++ b/alliance/src/nero/doc/Makefile.am
-@@ -1,7 +1,6 @@
- 
- SUBDIRS = nero man1
- 
-pdfdir = $(prefix)/doc/pdf
- pdf_DATA = nero.pdf
- 
- EXTRA_DIST = $(pdf_DATA) \
-diff --git a/alliance/src/nero/doc/nero/Makefile.am b/alliance/src/nero/doc/nero/Makefile.am
-index 11d58e1..8e29a17 100644
--- a/alliance/src/nero/doc/nero/Makefile.am
-+++ b/alliance/src/nero/doc/nero/Makefile.am
-@@ -1,12 +1,9 @@
- 
- 
-pkghtmldir = $(prefix)/doc/html/@PACKAGE@
-+pkghtmldir = $(htmldir)/@PACKAGE@
- pkghtml_DATA = \
-                ./nero.html \
-                ./ref_nero.html \
-                ./man_nero.html
- 
- EXTRA_DIST = $(pkghtml_DATA)
-
-install-data-hook:
-	find $(DESTDIR)$(prefix)/doc/html/@PACKAGE@ -type f | xargs chmod g+w
-diff --git a/alliance/src/rds/etc/Makefile.am b/alliance/src/rds/etc/Makefile.am
-index d5cca76..fac05cd 100644
--- a/alliance/src/rds/etc/Makefile.am
-+++ b/alliance/src/rds/etc/Makefile.am
-@@ -1,5 +1,5 @@
- 
-etcdir=$(prefix)/etc
-+etcdir=$(sysconfdir)/alliance
- 
- etc_DATA=cmos.rds scn6m_deep_09.rds
- 
-diff --git a/alliance/src/scapin/etc/Makefile.am b/alliance/src/scapin/etc/Makefile.am
-index 9684d1f..ddb68bd 100644
--- a/alliance/src/scapin/etc/Makefile.am
-+++ b/alliance/src/scapin/etc/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am,v 1.5 2002/05/08 21:07:26 jpc Exp $
- 
-etcdir=$(prefix)/etc
-+etcdir=$(sysconfdir)/alliance
- 
- etc_DATA=sxlib.scapin
- 
-diff --git a/alliance/src/sea/etc/Makefile.am b/alliance/src/sea/etc/Makefile.am
-index d1f3aca..fab246b 100644
--- a/alliance/src/sea/etc/Makefile.am
-+++ b/alliance/src/sea/etc/Makefile.am
-@@ -1,4 +1,4 @@
-etcdir = $(prefix)/etc
-+etcdir=$(sysconfdir)/alliance
- 
- etc_DATA = se_defaults.mac cmos.lef
- 
-diff --git a/alliance/src/xfsm/etc/Makefile.am b/alliance/src/xfsm/etc/Makefile.am
-index 2b35b64..63387be 100644
--- a/alliance/src/xfsm/etc/Makefile.am
-+++ b/alliance/src/xfsm/etc/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am,v 1.5 2002/05/08 21:07:26 jpc Exp $
- 
-etcdir=$(prefix)/etc
-+etcdir=$(sysconfdir)/alliance
- 
- etc_DATA=xfsm.par
- 
-diff --git a/alliance/src/xgra/etc/Makefile.am b/alliance/src/xgra/etc/Makefile.am
-index 4c9feb5..37edcd1 100644
--- a/alliance/src/xgra/etc/Makefile.am
-+++ b/alliance/src/xgra/etc/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am,v 1.1 2007/11/27 20:41:31 ludo Exp $
- 
-etcdir=$(prefix)/etc
-+etcdir=$(sysconfdir)/alliance
- 
- etc_DATA=xgra.par
- 
-diff --git a/alliance/src/xpat/etc/Makefile.am b/alliance/src/xpat/etc/Makefile.am
-index 8f2fa0d..43175c2 100644
--- a/alliance/src/xpat/etc/Makefile.am
-+++ b/alliance/src/xpat/etc/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am,v 1.6 2002/05/08 21:07:26 jpc Exp $
- 
-etcdir=$(prefix)/etc
-+etcdir=$(sysconfdir)/alliance
- 
- etc_DATA=xpat.par
- 
-diff --git a/alliance/src/xsch/etc/Makefile.am b/alliance/src/xsch/etc/Makefile.am
-index 973ab38..2d88390 100644
--- a/alliance/src/xsch/etc/Makefile.am
-+++ b/alliance/src/xsch/etc/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am,v 1.5 2002/05/08 21:07:26 jpc Exp $
- 
-etcdir=$(prefix)/etc
-+etcdir=$(sysconfdir)/alliance
- 
- etc_DATA=xsch.par
- 
-diff --git a/alliance/src/xvpn/etc/Makefile.am b/alliance/src/xvpn/etc/Makefile.am
-index ba70004..f28560a 100644
--- a/alliance/src/xvpn/etc/Makefile.am
-+++ b/alliance/src/xvpn/etc/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am,v 1.5 2002/05/08 21:07:26 jpc Exp $
- 
-etcdir=$(prefix)/etc
-+etcdir=$(sysconfdir)/alliance
- 
- etc_DATA=xvpn.par
- 
-- 
-2.5.0
-
--- a/0005-Use-inttypes-macros-to-print-int32_t.patch
+++ b/0005-Use-inttypes-macros-to-print-int32_t.patch
@ -1,36 +0,0 @@
-From 5305097fa027775bc96ae58e0e938a1ef85f1fff Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
-Date: Sun, 28 Feb 2016 09:33:27 +0100
-Subject: [PATCH 05/10] Use inttypes-macros to print int32_t.
-
---
- alliance/src/rds/src/gds_parse.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/alliance/src/rds/src/gds_parse.c b/alliance/src/rds/src/gds_parse.c
-index dfa2239..18e4ec6 100644
--- a/alliance/src/rds/src/gds_parse.c
-+++ b/alliance/src/rds/src/gds_parse.c
-@@ -21,6 +21,7 @@
- # include <stdio.h>
- # include <math.h>
- # include <string.h>
-+# include <inttypes.h>
- 
- # include <mut.h>
- # include <mph.h>
-@@ -742,9 +743,9 @@ FILE *fp;
-             }
-          }
-          if ((coord_nb < 5) || (ispolyrec(coord_tab, coord_nb) == 0)) {
-            sprintf(texte, "(%ld, %ld", coord_tab[0].X, coord_tab[0].Y);
-+            sprintf(texte, "(%" PRId32 ", %" PRId32 "", coord_tab[0].X, coord_tab[0].Y);
-             for (i = 1; i < coord_nb; i++)
-               sprintf(&texte[strlen(texte)], ", %ld, %ld", coord_tab[i].X, coord_tab[i].Y);
-+               sprintf(&texte[strlen(texte)], ", %" PRId32 ", %" PRId32 "", coord_tab[i].X, coord_tab[i].Y);
-             strcat(texte, ")");
-             pv_emet_warning(pv_model->NAME, "Non rectangle polygon here", texte);
-             FLAG = -1;
-- 
-2.5.0
-
--- a/0006-Use-ring_yy-instead-of-yy.patch
+++ b/0006-Use-ring_yy-instead-of-yy.patch
@ -1,77 +0,0 @@
-From b689820c62058c0e3b205efc0d604e15a128a5d4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
-Date: Sun, 28 Feb 2016 09:31:44 +0100
-Subject: [PATCH 06/10] Use ring_yy instead of yy.
-
---
- alliance/src/ring/src/lireplace.c | 2 +-
- alliance/src/ring/src/ringram.y   | 9 +++++++++
- alliance/src/ring/src/rinscan.l   | 4 ++--
- alliance/src/ring/src/struct.h    | 4 ++--
- 4 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/alliance/src/ring/src/lireplace.c b/alliance/src/ring/src/lireplace.c
-index 296bb03..b057784 100644
--- a/alliance/src/ring/src/lireplace.c
-+++ b/alliance/src/ring/src/lireplace.c
-@@ -100,7 +100,7 @@ void lecture_fic(char *nomfic, lofig_list *circuit_lo,
- 	if (mode_debug) 
- 		printf("Avant analyse lex et yacc \n");
- 
-	yyin = mbkfopen(nomfic, NULL, READ_TEXT);
-+	ring_yyin = mbkfopen(nomfic, NULL, READ_TEXT);
- 
- 	/* ------------------------------------------------------------------ */
- 	/* lancement de lex et yacc pour interpreter le fichier de parametres */
-diff --git a/alliance/src/ring/src/ringram.y b/alliance/src/ring/src/ringram.y
-index 1bb548c..677bd52 100644
--- a/alliance/src/ring/src/ringram.y
-+++ b/alliance/src/ring/src/ringram.y
-@@ -51,3 +51,12 @@ lnomchiffre: lnomchiffre IDENT NOMBRE { declaration_width($2,$3);if (mode_debug)
- 	| IDENT NOMBRE { declaration_width($1,$2);if (mode_debug) printf("yacc lnomchiffre \n");}
- 	;
- 
-+%%
-+
-+
-+void
-+yyerror (char const *s)
-+{
-+
-+  fprintf (stderr, "%s\n", s);
-+}
-diff --git a/alliance/src/ring/src/rinscan.l b/alliance/src/ring/src/rinscan.l
-index 2c74c9e..a98e354 100644
--- a/alliance/src/ring/src/rinscan.l
-+++ b/alliance/src/ring/src/rinscan.l
-@@ -24,10 +24,10 @@ comment [#]({lettre}*{chiffre}*{esp}*{pct}*)*{rc}
- "west"  {if (mode_debug) ECHO; return(M_WEST) ;}
- "east"  {if (mode_debug) ECHO; return(M_EAST) ;}
- "width" {if (mode_debug) ECHO; return(M_WIDTH);}
-{nombre} {if (mode_debug) ECHO; sscanf(yytext,"%ld",&yylval.i);
-+{nombre} {if (mode_debug) ECHO; sscanf(yytext,"%ld",&ring_yylval.i);
- 					 return(NOMBRE);
- 					} 				 
-{ident} {if (mode_debug) ECHO; yylval.s = namealloc(yytext);
-+{ident} {if (mode_debug) ECHO; ring_yylval.s = namealloc(yytext);
- 				return(IDENT);
- 				}
- {comment} {if (mode_debug) {ECHO; printf("commentaire\n");}}
-diff --git a/alliance/src/ring/src/struct.h b/alliance/src/ring/src/struct.h
-index 0d54a94..1cb5b7a 100644
--- a/alliance/src/ring/src/struct.h
-+++ b/alliance/src/ring/src/struct.h
-@@ -321,8 +321,8 @@ extern char	*pvssi_p;
- 
- extern char	*nom_fic_param;              /* nom du fichier parametre            */
- 
-extern FILE *yyin;                       /* pointeur sur fichier lex */
-extern int	yylineno;                     /* no de la ligne traitee par lex */
-+extern FILE *ring_yyin;                       /* pointeur sur fichier lex */
-+extern int	ring_yylineno;                     /* no de la ligne traitee par lex */
- extern chain_list *nom_plot[NB_FACES];   /* liste pour l'analyseur des noms de 
-                                             plots */
- extern chain_list *liste_width;          /* liste pour l'analyseur des noms
-- 
-2.5.0
-
--- a/0007-Eliminate-CFLAGS.patch
+++ b/0007-Eliminate-CFLAGS.patch
@ -1,62 +0,0 @@
-From 6c48c76ab601dd1f608e716bc598e16794b42789 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
-Date: Wed, 24 Feb 2016 08:03:54 +0100
-Subject: [PATCH 07/10] Eliminate CFLAGS.
-
---
- alliance/src/druc/src/Makefile.am | 5 ++---
- alliance/src/m2e/src/Makefile.am  | 2 +-
- alliance/src/nero/src/Makefile.am | 3 ---
- 3 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/alliance/src/druc/src/Makefile.am b/alliance/src/druc/src/Makefile.am
-index 16ecb34..bb31154 100644
--- a/alliance/src/druc/src/Makefile.am
-+++ b/alliance/src/druc/src/Makefile.am
-@@ -8,7 +8,8 @@ drucompi.h drucring.c drucring.h drucutil.c drucutil.h vmcaract.c vmcaract.h \
- vmcasmld.c vmcasmld.h vmcerror.c vmcerror.h vmcmesur.c vmcmesur.h vmcrelat.c \
- vmcrelat.h vmctools.c vmctools.h vmcunify.c vmcunify.h
- 
-CFLAGS = $(ALLIANCE_CFLAGS) -g -O0
-+AM_CFLAGS = $(ALLIANCE_CFLAGS)
-+AM_CPPFLAGS = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/rds/src
- libVrd_la_LDFLAGS = -version-info @VRD_DLL_VERSION@
- libVrd_la_LIBADD  = -lRds -lMut
- 
-@@ -22,8 +23,6 @@ drucompi_l.c : $(srcdir)/drucompi_l.l drucompi_y.h
- 
- bin_PROGRAMS = druc
- 
-AM_CFLAGS = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/rds/src
-
- druc_LDADD = $(ALLIANCE_LIBS) -L. libVrd.la \
- -L$(builddir)/../../rds/src/.libs -lRds \
- -L$(builddir)/../../mbk/src/.libs -lMpu -lMut
-diff --git a/alliance/src/m2e/src/Makefile.am b/alliance/src/m2e/src/Makefile.am
-index 969bc1a..04a817b 100644
--- a/alliance/src/m2e/src/Makefile.am
-+++ b/alliance/src/m2e/src/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
-AM_CFLAGS    = -g -I$(top_srcdir)/mbk/src
-+AM_CFLAGS    = -I$(top_srcdir)/mbk/src
- 
- bin_PROGRAMS = m2e
- 
-diff --git a/alliance/src/nero/src/Makefile.am b/alliance/src/nero/src/Makefile.am
-index 71e2810..f3a5abd 100644
--- a/alliance/src/nero/src/Makefile.am
-+++ b/alliance/src/nero/src/Makefile.am
-@@ -1,8 +1,5 @@
- ## Process this file with automake to produce Makefile.in
- 
-#CXXFLAGS        = -g -pg -O2
-CXXFLAGS         = -g -O2
-#CXXFLAGS        = -O2
- AM_CXXFLAGS      = @ALLIANCE_CFLAGS@ \
-                    -I$(top_srcdir)/abl/src \
-                    -I$(top_srcdir)/aut/src \
-- 
-2.5.0
-
--- a/0008-Rework-Makefile.ams.patch
+++ b/0008-Rework-Makefile.ams.patch
--- a/0009-Misc.-doc-fixes.patch
+++ b/0009-Misc.-doc-fixes.patch
@ -1,388 +0,0 @@
-From d8bd23ccfd34a60eb8d58593ceb190e4f68b1e24 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
-Date: Sun, 28 Feb 2016 15:03:03 +0100
-Subject: [PATCH 09/12] Misc. doc fixes.
-
---
- alliance/src/boog/doc/boog.1                                           | 2 +-
- .../documentation/tutorials/place_and_route/tex/place_and_route.tex    | 1 -
- .../src/documentation/tutorials/simulation/src/addaccu_beh/addaccu.vbe | 0
- .../documentation/tutorials/simulation/src/addaccu_beh/addaccu4.vhdl   | 0
- .../documentation/tutorials/simulation/src/addaccu_beh/addaccu_dly.vbe | 0
- .../documentation/tutorials/simulation/src/addaccu_beh/patterns.pat    | 0
- .../tutorials/simulation/src/addaccu_beh/patterns_dly.pat              | 0
- .../src/documentation/tutorials/simulation/src/addaccu_struct/accu.vbe | 0
- .../src/documentation/tutorials/simulation/src/addaccu_struct/accu.vst | 0
- .../documentation/tutorials/simulation/src/addaccu_struct/addaccu.vbe  | 0
- .../documentation/tutorials/simulation/src/addaccu_struct/addaccu.vst  | 0
- .../src/documentation/tutorials/simulation/src/addaccu_struct/alu.vbe  | 0
- .../src/documentation/tutorials/simulation/src/addaccu_struct/alu.vst  | 0
- .../src/documentation/tutorials/simulation/src/addaccu_struct/mux.vbe  | 0
- .../src/documentation/tutorials/simulation/src/addaccu_struct/mux.vst  | 0
- .../documentation/tutorials/simulation/src/addaccu_struct/pat_new.c    | 0
- alliance/src/documentation/tutorials/simulation/tex/simulation.tex     | 1 -
- alliance/src/documentation/tutorials/start/Makefile                    | 2 +-
- alliance/src/documentation/tutorials/start/start.tex                   | 2 +-
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_0.vbe    | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_1.vbe    | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_10.vbe   | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_11.vbe   | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_12.vbe   | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_13.vbe   | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_14.vbe   | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_15.vbe   | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_16.vbe   | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_17.vbe   | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_18.vbe   | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_19.vbe   | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_2.vbe    | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_20.vbe   | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_21.vbe   | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_22.vbe   | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_23.vbe   | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_24.vbe   | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_3.vbe    | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_4.vbe    | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_5.vbe    | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_6.vbe    | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_7.vbe    | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_8.vbe    | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_9.vbe    | 0
- alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_ok.vbe   | 0
- alliance/src/documentation/tutorials/synthesis/tex/synthesis.tex       | 1 -
- alliance/src/fsm/man1/fsm.1                                            | 2 +-
- alliance/src/mbk/man3/viewlofigcon.3                                   | 3 ++-
- alliance/src/mbk/man3/viewphfig.3                                      | 3 ++-
- alliance/src/mbk/man3/viewphvia.3                                      | 3 ++-
- alliance/src/nero/doc/man1/nero.1                                      | 1 -
- alliance/src/ring/doc/ring.1                                           | 2 +-
- 52 files changed, 11 insertions(+), 12 deletions(-)
- mode change 100755 => 100644 alliance/src/documentation/tutorials/simulation/src/addaccu_beh/addaccu.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/simulation/src/addaccu_beh/addaccu4.vhdl
- mode change 100755 => 100644 alliance/src/documentation/tutorials/simulation/src/addaccu_beh/addaccu_dly.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/simulation/src/addaccu_beh/patterns.pat
- mode change 100755 => 100644 alliance/src/documentation/tutorials/simulation/src/addaccu_beh/patterns_dly.pat
- mode change 100755 => 100644 alliance/src/documentation/tutorials/simulation/src/addaccu_struct/accu.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/simulation/src/addaccu_struct/accu.vst
- mode change 100755 => 100644 alliance/src/documentation/tutorials/simulation/src/addaccu_struct/addaccu.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/simulation/src/addaccu_struct/addaccu.vst
- mode change 100755 => 100644 alliance/src/documentation/tutorials/simulation/src/addaccu_struct/alu.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/simulation/src/addaccu_struct/alu.vst
- mode change 100755 => 100644 alliance/src/documentation/tutorials/simulation/src/addaccu_struct/mux.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/simulation/src/addaccu_struct/mux.vst
- mode change 100755 => 100644 alliance/src/documentation/tutorials/simulation/src/addaccu_struct/pat_new.c
- mode change 100755 => 100644 alliance/src/documentation/tutorials/start/Makefile
- mode change 100755 => 100644 alliance/src/documentation/tutorials/start/start.tex
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_0.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_1.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_10.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_11.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_12.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_13.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_14.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_15.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_16.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_17.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_18.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_19.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_2.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_20.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_21.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_22.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_23.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_24.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_3.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_4.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_5.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_6.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_7.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_8.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_9.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_ok.vbe
- mode change 100755 => 100644 alliance/src/documentation/tutorials/synthesis/tex/synthesis.tex
-
-diff --git a/alliance/src/boog/doc/boog.1 b/alliance/src/boog/doc/boog.1
-index c9dcb73..6e87374 100644
--- a/alliance/src/boog/doc/boog.1
-+++ b/alliance/src/boog/doc/boog.1
-@@ -136,7 +136,7 @@ Just another way to show explicitly the \f4VST\fP output file name.
- Just another way to show explicitly the \f4LAX\fP parameter file name.
- .TP 10
- \f4\-d debug_file\fP
-Generates a \f4VBE\f debug file. It comes from internal result algorithm. Users aren't concerned.
-+Generates a \f4VBE\fP debug file. It comes from internal result algorithm. Users aren't concerned.
- .br
- 
- .SH ENVIRONMENT VARIABLES
-diff --git a/alliance/src/documentation/tutorials/place_and_route/tex/place_and_route.tex b/alliance/src/documentation/tutorials/place_and_route/tex/place_and_route.tex
-index 8d51631..0115a94 100644
--- a/alliance/src/documentation/tutorials/place_and_route/tex/place_and_route.tex
-+++ b/alliance/src/documentation/tutorials/place_and_route/tex/place_and_route.tex
-@@ -85,7 +85,6 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
- %\end{figure}
- %---------------------------------- document ---------------------------------
- \begin{document}
-\setlength{\footrulewidth}{0.6pt}
- 
- \title{
-                {\Huge ALLIANCE TUTORIAL \\}
-diff --git a/alliance/src/documentation/tutorials/simulation/src/addaccu_beh/addaccu.vbe b/alliance/src/documentation/tutorials/simulation/src/addaccu_beh/addaccu.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/simulation/src/addaccu_beh/addaccu4.vhdl b/alliance/src/documentation/tutorials/simulation/src/addaccu_beh/addaccu4.vhdl
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/simulation/src/addaccu_beh/addaccu_dly.vbe b/alliance/src/documentation/tutorials/simulation/src/addaccu_beh/addaccu_dly.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/simulation/src/addaccu_beh/patterns.pat b/alliance/src/documentation/tutorials/simulation/src/addaccu_beh/patterns.pat
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/simulation/src/addaccu_beh/patterns_dly.pat b/alliance/src/documentation/tutorials/simulation/src/addaccu_beh/patterns_dly.pat
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/simulation/src/addaccu_struct/accu.vbe b/alliance/src/documentation/tutorials/simulation/src/addaccu_struct/accu.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/simulation/src/addaccu_struct/accu.vst b/alliance/src/documentation/tutorials/simulation/src/addaccu_struct/accu.vst
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/simulation/src/addaccu_struct/addaccu.vbe b/alliance/src/documentation/tutorials/simulation/src/addaccu_struct/addaccu.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/simulation/src/addaccu_struct/addaccu.vst b/alliance/src/documentation/tutorials/simulation/src/addaccu_struct/addaccu.vst
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/simulation/src/addaccu_struct/alu.vbe b/alliance/src/documentation/tutorials/simulation/src/addaccu_struct/alu.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/simulation/src/addaccu_struct/alu.vst b/alliance/src/documentation/tutorials/simulation/src/addaccu_struct/alu.vst
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/simulation/src/addaccu_struct/mux.vbe b/alliance/src/documentation/tutorials/simulation/src/addaccu_struct/mux.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/simulation/src/addaccu_struct/mux.vst b/alliance/src/documentation/tutorials/simulation/src/addaccu_struct/mux.vst
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/simulation/src/addaccu_struct/pat_new.c b/alliance/src/documentation/tutorials/simulation/src/addaccu_struct/pat_new.c
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/simulation/tex/simulation.tex b/alliance/src/documentation/tutorials/simulation/tex/simulation.tex
-index 2b99a40..0b0d105 100644
--- a/alliance/src/documentation/tutorials/simulation/tex/simulation.tex
-+++ b/alliance/src/documentation/tutorials/simulation/tex/simulation.tex
-@@ -91,7 +91,6 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
- %---------------------------------- document ---------------------------------
- 
- \begin{document}
-\setlength{\footrulewidth}{0.6pt}
- 
- \title{
-                     {\Huge ALLIANCE TUTORIAL\\}
-diff --git a/alliance/src/documentation/tutorials/start/Makefile b/alliance/src/documentation/tutorials/start/Makefile
-old mode 100755
-new mode 100644
-index 2a99685..4649755
--- a/alliance/src/documentation/tutorials/start/Makefile
-+++ b/alliance/src/documentation/tutorials/start/Makefile
-@@ -14,4 +14,4 @@ start.dvi : start.tex
- 	latex start.tex
- 
- clean :
-	rm -f $(MYFILE).ps $(MYFILE).pdf *.log *.dvi *.aux
-+	rm -f start.ps start.pdf *.log *.dvi *.aux
-diff --git a/alliance/src/documentation/tutorials/start/start.tex b/alliance/src/documentation/tutorials/start/start.tex
-old mode 100755
-new mode 100644
-index c88481b..7ee4a90
--- a/alliance/src/documentation/tutorials/start/start.tex
-+++ b/alliance/src/documentation/tutorials/start/start.tex
-@@ -144,7 +144,7 @@ To see it, please enter the following command :
- ~alp/addaccu %-) env | grep MBK
- \end{phraseverbatim}
- 
-\begin{figure}[H]\center\leavevmode
-+\begin{figure}[p]\center\leavevmode
- \begin{framedverbatim}
- ~alp/addaccu %-) env | grep MBK
- MBK_OUT_PH=ap
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_0.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_0.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_1.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_1.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_10.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_10.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_11.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_11.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_12.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_12.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_13.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_13.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_14.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_14.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_15.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_15.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_16.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_16.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_17.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_17.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_18.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_18.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_19.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_19.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_2.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_2.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_20.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_20.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_21.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_21.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_22.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_22.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_23.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_23.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_24.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_24.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_3.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_3.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_4.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_4.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_5.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_5.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_6.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_6.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_7.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_7.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_8.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_8.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_9.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_9.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_ok.vbe b/alliance/src/documentation/tutorials/synthesis/src/amdbug/amd_ok.vbe
-old mode 100755
-new mode 100644
-diff --git a/alliance/src/documentation/tutorials/synthesis/tex/synthesis.tex b/alliance/src/documentation/tutorials/synthesis/tex/synthesis.tex
-old mode 100755
-new mode 100644
-index 099caee..d8bd15c
--- a/alliance/src/documentation/tutorials/synthesis/tex/synthesis.tex
-+++ b/alliance/src/documentation/tutorials/synthesis/tex/synthesis.tex
-@@ -85,7 +85,6 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
- 
- %---------------------------------- document ---------------------------------
- \begin{document}
-\setlength{\footrulewidth}{0.6pt}
- 
- \title{
-                {\Huge ALLIANCE TUTORIAL\\}
-diff --git a/alliance/src/fsm/man1/fsm.1 b/alliance/src/fsm/man1/fsm.1
-index a0f6142..ca58505 100644
--- a/alliance/src/fsm/man1/fsm.1
-+++ b/alliance/src/fsm/man1/fsm.1
-@@ -40,7 +40,7 @@ Functions :
- .TP 20
- .br
- 
-...
-+\&...
- 
- .TP 0
- libFsm101.a :
-diff --git a/alliance/src/mbk/man3/viewlofigcon.3 b/alliance/src/mbk/man3/viewlofigcon.3
-index cabb1c0..8bc798b 100644
--- a/alliance/src/mbk/man3/viewlofigcon.3
-+++ b/alliance/src/mbk/man3/viewlofigcon.3
-@@ -10,10 +10,11 @@ viewlofigcon
- .ti 0.2i
- viewlofigcon
- .XE2 \}
-.so man1/alc_origin.1
-+.TH VIEWLOFIGCON 3 "October 1, 1997" "ASIM/LIP6" "MBK LOGICAL FUNCTIONS"
- .SH NAME
- viewlofigcon \- display elements of a \fBlocon_list\fP attached to a
- figure
-+.so man1/alc_origin.1
- .SH SYNOPSIS
- .nf
- .if n \{\
-diff --git a/alliance/src/mbk/man3/viewphfig.3 b/alliance/src/mbk/man3/viewphfig.3
-index cade2bf..1aaec24 100644
--- a/alliance/src/mbk/man3/viewphfig.3
-+++ b/alliance/src/mbk/man3/viewphfig.3
-@@ -10,9 +10,10 @@ viewphfig
- .ti 0.2i
- viewphfig
- .XE0 \}
-.so man1/alc_origin.1
-+.TH VIEWPHSEG 3 "October 1, 1997" "ASIM/LIP6" "MBK PHYSICAL FUNCTIONS"
- .SH NAME
- viewphfig \- display elements of a \fBphfig_list\fP
-+.so man1/alc_origin.1
- .SH SYNOPSIS
- .nf
- .if n \{\
-diff --git a/alliance/src/mbk/man3/viewphvia.3 b/alliance/src/mbk/man3/viewphvia.3
-index fb7050c..b82f05c 100644
--- a/alliance/src/mbk/man3/viewphvia.3
-+++ b/alliance/src/mbk/man3/viewphvia.3
-@@ -10,9 +10,10 @@ viewphvia
- .ti 0.2i
- viewphvia
- .XE0 \}
-.so man1/alc_origin.1
-+.TH VIEWPHVIA 3 "October 1, 1997" "ASIM/LIP6" "MBK PHYSICAL FUNCTIONS"
- .SH NAME
- viewphvia \- display elements of a \fBphvia_list\fP
-+.so man1/alc_origin.1
- .SH SYNOPSIS
- .nf
- .if n \{\
-diff --git a/alliance/src/nero/doc/man1/nero.1 b/alliance/src/nero/doc/man1/nero.1
-index e3c76c9..46e396d 100644
--- a/alliance/src/nero/doc/man1/nero.1
-+++ b/alliance/src/nero/doc/man1/nero.1
-@@ -1,4 +1,3 @@
-.\\" auto-generated by docbook2man-spec $Revision: 1.4 $
- .TH "NERO" "1" "13 October 2002" "ASIM/LIP6" "Alliance - nero User's Manual"
- .SH NAME
- nero \- Negotiating Router
-diff --git a/alliance/src/ring/doc/ring.1 b/alliance/src/ring/doc/ring.1
-index 054aa47..43a6be3 100644
--- a/alliance/src/ring/doc/ring.1
-+++ b/alliance/src/ring/doc/ring.1
-@@ -110,7 +110,7 @@ piot_sp  C
- .br
- pvssick_sp  C
- .br
-\.\.\.\.
-+\&...
- .br
- pvdde_sp C
- .br
-- 
-2.5.5
-
--- a/0010-Fedora-profiles.patch
+++ b/0010-Fedora-profiles.patch
@ -1,114 +0,0 @@
-From 52c5cec07b86e606d5062da6e83ada94cf214c13 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
-Date: Tue, 1 Mar 2016 15:27:11 +0100
-Subject: [PATCH 10/10] Fedora profiles.
-
---
- alliance/src/distrib/etc/alc_env.csh.in | 32 ++-----------------------------
- alliance/src/distrib/etc/alc_env.sh.in  | 34 +++------------------------------
- 2 files changed, 5 insertions(+), 61 deletions(-)
-
-diff --git a/alliance/src/distrib/etc/alc_env.csh.in b/alliance/src/distrib/etc/alc_env.csh.in
-index cea6941..4051fba 100644
--- a/alliance/src/distrib/etc/alc_env.csh.in
-+++ b/alliance/src/distrib/etc/alc_env.csh.in
-@@ -21,13 +21,8 @@
- 
- # Where the Alliance CAD is installed
-  setenv ALLIANCE_TOP         "@prefix@"
- set    SYSCONF_TOP          "${ALLIANCE_TOP}/etc"
- set    CELLS_TOP            "${ALLIANCE_TOP}/cells"
- if ( "${ALLIANCE_TOP}" == "/usr/lib/alliance" ) then
-# For installation in the FHS.
-   set  SYSCONF_TOP          "/etc/alliance"
-   set  CELLS_TOP            "/usr/share/alliance/cells"
- endif
-+ set  SYSCONF_TOP            "@sysconfdir@/alliance"
-+ set  CELLS_TOP              "@datadir@/alliance/cells"
- 
- 
- # Alliance environment variables.
-@@ -75,29 +70,6 @@
-  setenv ELP_TECHNO_NAME      "${SYSCONF_TOP}/prol.elp"
- 
- 
-# System PATH variables, only needed when not installed in the FHS.
- if ( "${ALLIANCE_TOP}" != "/usr/lib/alliance" ) then
-   if ( $?PATH ) then
-     setenv PATH "${PATH}:${ALLIANCE_TOP}/bin"
-   else
-     setenv PATH "${ALLIANCE_TOP}/bin"
-   endif
-  
-   if ( "`uname -o`" != "GNU/Linux" ) then
-    # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
-     if ( $?LD_LIBRARY_PATH ) then
-       setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib"
-     else
-       setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib"
-     endif
-   endif
-  
-   if ( $?MANPATH ) then
-     setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/share/man"
-   else
-     setenv MANPATH ":${ALLIANCE_TOP}/share/man:`manpath`"
-   endif
- endif
-  
-  # fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
-  setenv MBK_SPI_MODEL     "${SYSCONF_TOP}/spimodel.cfg"
-diff --git a/alliance/src/distrib/etc/alc_env.sh.in b/alliance/src/distrib/etc/alc_env.sh.in
-index a4115f2..246eec6 100644
--- a/alliance/src/distrib/etc/alc_env.sh.in
-+++ b/alliance/src/distrib/etc/alc_env.sh.in
-@@ -20,14 +20,9 @@
- 
- 
- # Where the Alliance CAD is installed
-        ALLIANCE_TOP=@prefix@;                       export ALLIANCE_TOP
-         SYSCONF_TOP=$ALLIANCE_TOP/etc
-           CELLS_TOP=$ALLIANCE_TOP/cells
- if [ "$ALLIANCE_TOP" = "/usr/lib/alliance" ]; then
-  # FHS Installation.
-         SYSCONF_TOP="/etc/alliance"
-           CELLS_TOP="/usr/share/alliance/cells"
- fi
-+        ALLIANCE_TOP="@prefix@";                       export ALLIANCE_TOP
-+         SYSCONF_TOP="@sysconfdir@/alliance"
-+           CELLS_TOP="@datadir@/alliance/cells"
- 
- # Alliance environment variables.
-            MBK_IN_LO=vst;                            export MBK_IN_LO
-@@ -76,28 +71,5 @@
-      ELP_TECHNO_NAME=$SYSCONF_TOP/prol.elp;          export ELP_TECHNO_NAME
- 
- 
-# System PATH variables, only needed when not installed in the FHS.
- if [ "$ALLIANCE_TOP" != "/usr/lib/alliance" ]; then
-   PATH=$PATH:$ALLIANCE_TOP/bin
-   export PATH
-  
-  # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
-  #if [ "`uname -o`" != "GNU/Linux" ]; then
-     if [ -z "${LD_LIBRARY_PATH}" ]; then
-       LD_LIBRARY_PATH=$ALLIANCE_TOP/lib
-     else
-       LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib
-     fi
-     export LD_LIBRARY_PATH
-  #fi
-  
-   if [ -z "${MANPATH}" ]; then
-     MANPATH=:$ALLIANCE_TOP/share/man:$(manpath)
-   else
-     MANPATH=$MANPATH:$ALLIANCE_TOP/share/man
-   fi
-   export MANPATH
- fi
- 
- # fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
-  MBK_SPI_MODEL=$SYSCONF_TOP/spimodel.cfg;      export MBK_SPI_MODEL
-- 
-2.5.0
-
--- a/0011-Use-setenv-instead-of-set-RHBZ-1337691.patch
+++ b/0011-Use-setenv-instead-of-set-RHBZ-1337691.patch
@ -1,27 +0,0 @@
-From 69c5281b9193149e3fa6d7fceac49de4eb57ab30 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
-Date: Fri, 20 May 2016 05:16:44 +0200
-Subject: [PATCH 11/11] Use setenv instead of set (RHBZ#1337691)
-
---
- alliance/src/distrib/etc/alc_env.csh.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/alliance/src/distrib/etc/alc_env.csh.in b/alliance/src/distrib/etc/alc_env.csh.in
-index 4051fba..37c3b00 100644
--- a/alliance/src/distrib/etc/alc_env.csh.in
-+++ b/alliance/src/distrib/etc/alc_env.csh.in
-@@ -21,8 +21,8 @@
- 
- # Where the Alliance CAD is installed
-  setenv ALLIANCE_TOP         "@prefix@"
- set  SYSCONF_TOP            "@sysconfdir@/alliance"
- set  CELLS_TOP              "@datadir@/alliance/cells"
-+ setenv SYSCONF_TOP          "@sysconfdir@/alliance"
-+ setenv CELLS_TOP            "@datadir@/alliance/cells"
- 
- 
- # Alliance environment variables.
-- 
-2.5.5
-
--- a/0012-Remove-yylineno.patch
+++ b/0012-Remove-yylineno.patch
@ -1,28 +0,0 @@
-From ac0697c6f79155677668a3f096da3403f72b9ded Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
-Date: Fri, 20 May 2016 06:11:20 +0200
-Subject: [PATCH 12/12] Remove yylineno.
-
---
- alliance/src/sea/src/DEF_grammar_lex.l | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/alliance/src/sea/src/DEF_grammar_lex.l b/alliance/src/sea/src/DEF_grammar_lex.l
-index 752e2f8..ca527ab 100644
--- a/alliance/src/sea/src/DEF_grammar_lex.l
-+++ b/alliance/src/sea/src/DEF_grammar_lex.l
-@@ -21,11 +21,6 @@
- #define    yylineno     DEF_grammarlineno
- 
- 
-#ifndef FLEX_BETA 
-        int  yylineno = 1;
-#endif
-
-
- static  int  yywrap(void);
- static  int  string(void);
- static  int  history(void);
-- 
-2.5.5
-
--- a/0013-GCC-10-fixes.patch
+++ b/0013-GCC-10-fixes.patch
@ -1,78 +0,0 @@
-From 87faa08f9a1d3f55e3430a68acb0f898adc75a2d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
-Date: Fri, 7 Feb 2020 08:51:41 +0100
-Subject: [PATCH 13/13] GCC-10 fixes
-
---
- alliance/src/elp/src/elp.c        | 1 -
- alliance/src/elp/src/elp.h        | 3 ++-
- alliance/src/elp/src/elp_y.y      | 1 -
- alliance/src/nero/src/MDRGrid.cpp | 1 +
- alliance/src/pat/src/Makefile.am  | 1 +
- 5 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/alliance/src/elp/src/elp.c b/alliance/src/elp/src/elp.c
-index d279e6cfc..e516f1ee6 100644
--- a/alliance/src/elp/src/elp.c
-+++ b/alliance/src/elp/src/elp.c
-@@ -33,7 +33,6 @@ double elpVoltage[elpVOLTNUM]                                              ;
- double elpCapa[elpTRANSNUM][elpCAPANUM]                                    ;
- double elpGeneral[elpGENERALNUM]           = {0.0,0.0,1000.0}              ;
- char   elpLang                             = elpDEFLANG                    ;
-int    elpyylineno                                                            ;
- 
- /*****************************************************************************/
- /*                        function elpenv()                                  */
-diff --git a/alliance/src/elp/src/elp.h b/alliance/src/elp/src/elp.h
-index b1d4930f1..b1f284aed 100644
--- a/alliance/src/elp/src/elp.h
-+++ b/alliance/src/elp/src/elp.h
-@@ -106,7 +106,8 @@ extern double elpGeneral[elpGENERALNUM] ;
- #define elpACM        0  /* methode de calcul des capacites dynamiques */
- #define elpTEMP       1  /* temperature de simulation et d'analyse     */
- #define elpSLOPE      2  /* front sur les connecteurs d'entree         */
-
-+extern int  yylineno ;
-+extern int  elpyylineno ;
- 
- /* les fonctions externes */
- extern int elpenv() ;
-diff --git a/alliance/src/elp/src/elp_y.y b/alliance/src/elp/src/elp_y.y
-index 904ce7f02..fb5db214a 100644
--- a/alliance/src/elp/src/elp_y.y
-+++ b/alliance/src/elp/src/elp_y.y
-@@ -100,7 +100,6 @@ elpvar    :
-           ;
- %%
- 
-extern int  yylineno ;
- extern char yytext[] ;
- 
- void yyerror()
-diff --git a/alliance/src/nero/src/MDRGrid.cpp b/alliance/src/nero/src/MDRGrid.cpp
-index b7e9fb9f3..f8095ab3b 100644
--- a/alliance/src/nero/src/MDRGrid.cpp
-+++ b/alliance/src/nero/src/MDRGrid.cpp
-@@ -17,6 +17,7 @@
- 
- 
- # include  "MDefs.h"
-+template class TMatrix<char>;
- 
- 
- 
-diff --git a/alliance/src/pat/src/Makefile.am b/alliance/src/pat/src/Makefile.am
-index d8875fb83..f93af2822 100644
--- a/alliance/src/pat/src/Makefile.am
-+++ b/alliance/src/pat/src/Makefile.am
-@@ -28,6 +28,7 @@ pat_decl_y.c pat_decl_y.h : $(srcdir)/pat_decl_y.y
- 	    && sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.c \
- 	     | sed -e "s/int[        ]*pat_decl_y_char;/extern int pat_decl_y_char;/" \
- 	     | sed -e "s/int[        ]*pat_decl_y_nerrs;/extern int pat_decl_y_nerrs;/" \
-+	     | sed -e "s/^PAT_DECL_Y_STYPE pat_decl_y_lval;//" \
- 	     > pat_decl_y.c \
- 	    && sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.h > pat_decl_y.h
- 
-- 
-2.24.1
-
--- a/alliance-5.0-20090901-bison.patch
+++ b/alliance-5.0-20090901-bison.patch
@ -0,0 +1,25 @@
+From debian/patches/10-fix-parser-extern.patch
+Fix duplicate extern error with newer bison
+
+--- a/ppt/src/Makefile.am
+++ b/ppt/src/Makefile.am
+@@ -19,7 +19,7 @@ pat_decl_y.c pat_decl_y.h : $(srcdir)/pat_decl_y.y
+ 	$(YACC) -d $(YFLAGS) $(srcdir)/pat_decl_y.y \
+ 	&& sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.c \
+ 	 | sed -e "s/int[	 ]*pat_decl_y_char;/extern int pat_decl_y_char;/" \
+-	 | sed -e "s/PAT_DECL_Y_STYPE[	 ]*pat_decl_y_lval;/extern PAT_DECL_Y_STYPE pat_decl_y_lval;/" \
+	 | sed -e "s/PAT_DECL_Y_STYPE[	 ]*pat_decl_y_lval;/PAT_DECL_Y_STYPE pat_decl_y_lval;/" \
+ 	 | sed -e "s/int[	 ]*pat_decl_y_nerrs;/extern int pat_decl_y_nerrs;/" \
+          > pat_decl_y.c \
+ 	&& sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.h > pat_decl_y.h
+--- a/ppt/src/Makefile.in
+++ b/ppt/src/Makefile.in
+@@ -701,7 +701,7 @@ pat_decl_y.c pat_decl_y.h : $(srcdir)/pat_decl_y.y
+ 	$(YACC) -d $(YFLAGS) $(srcdir)/pat_decl_y.y \
+ 	&& sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.c \
+ 	 | sed -e "s/int[	 ]*pat_decl_y_char;/extern int pat_decl_y_char;/" \
+-	 | sed -e "s/PAT_DECL_Y_STYPE[	 ]*pat_decl_y_lval;/extern PAT_DECL_Y_STYPE pat_decl_y_lval;/" \
+	 | sed -e "s/PAT_DECL_Y_STYPE[	 ]*pat_decl_y_lval;/PAT_DECL_Y_STYPE pat_decl_y_lval;/" \
+ 	 | sed -e "s/int[	 ]*pat_decl_y_nerrs;/extern int pat_decl_y_nerrs;/" \
+          > pat_decl_y.c \
+ 	&& sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.h > pat_decl_y.h
--- a/alliance-5.0-20090901-format-security.patch
+++ b/alliance-5.0-20090901-format-security.patch
@ -0,0 +1,85 @@
+--- a/rtd/src/rtd_drive.c
+++ b/rtd/src/rtd_drive.c
+@@ -100,7 +100,7 @@ static void RtlWriteNameFile( Name )
+     RtlExprLength = Length;
+   }
+ 
+-  fprintf( RtlFile, Name );
+  fprintf( RtlFile, "%s", Name );
+ }
+ 
+ /*------------------------------------------------------------\
+--- a/vpd/src/vpd_drive.c
+++ b/vpd/src/vpd_drive.c
+@@ -100,7 +100,7 @@ static void VpnWriteNameFile( Name )
+     VpnExprLength = Length;
+   }
+ 
+-  fprintf( VpnFile, Name );
+  fprintf( VpnFile, "%s", Name );
+ }
+ 
+ /*------------------------------------------------------------\
+--- a/boog/src/bog_normalize_message.c
+++ b/boog/src/bog_normalize_message.c
+@@ -106,7 +106,7 @@ extern void display_error_in_abl(char* message, chain_list *abl)
+    }
+ 
+    fprintf(stderr,"BEH: ");
+-   fprintf(stderr,message);
+   fprintf(stderr,"%s",message);
+    fprintf(stderr," in '");
+    fflush(stderr);
+    display_abl(abl);
+--- a/l2p/src/drive_ps.c
+++ b/l2p/src/drive_ps.c
+@@ -83,22 +83,22 @@ char	*msg;
+ 		break;
+ 		case E_OPEN :
+ 			fprintf (stderr, "Problem while opening file ");
+-			fprintf (stderr, msg);
+			fprintf (stderr, "%s", msg);
+ 		break;
+ 		case E_CLOSE :
+ 			fprintf (stderr, "Problem while closing file ");
+-			fprintf (stderr, msg);
+			fprintf (stderr, "%s", msg);
+ 		break;
+ 		case E_WRITE :
+ 			fprintf (stderr, "Problem while writing file ");
+-			fprintf (stderr, msg);
+			fprintf (stderr, "%s", msg);
+ 		break;
+ 		case E_READ :
+ 			fprintf (stderr, "Problem while reading file ");
+-			fprintf (stderr, msg);
+			fprintf (stderr, "%s", msg);
+ 		break;
+ 		case E_OUTBOX :
+-			fprintf (stderr, msg);
+			fprintf (stderr, "%s", msg);
+ 		break;
+ 		default :
+ 			fprintf (stderr, "Unknow internal error");
+--- a/loon/src/lon_normalize_message.c
+++ b/loon/src/lon_normalize_message.c
+@@ -106,7 +106,7 @@ extern void display_error_in_abl(char* message, chain_list *abl)
+    }
+ 
+    fprintf(stderr,"BEH: ");
+-   fprintf(stderr,message);
+   fprintf(stderr,"%s",message);
+    fprintf(stderr," in '");
+    fflush(stderr);
+    display_abl(abl);
+--- a/sea/src/util_LEFDEF.c
+++ b/sea/src/util_LEFDEF.c
+@@ -213,7 +213,7 @@ extern char *MBK2DEF_name(asLEF, asMBK)
+     *pI = (char)0; pI += 1;
+     sprintf (asLEF, "%s(%s)", sTmp, pI);
+   } else {
+-    sprintf (asLEF, sTmp);
+    sprintf (asLEF, "%s", sTmp);
+   }
+ 
+   return (asLEF);
--- a/alliance.spec
+++ b/alliance.spec
@ -1,49 +1,30 @@
-%global snapdate 20160506
-%global commit d8c05cd022a15586e946da6e5d19d861a489ff5e
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
 Name:           alliance
 Version:        5.1.1
-Release:        37.%{snapdate}git%{shortcommit}%{?dist}
+Release:        2%{?dist}
 Summary:        VLSI EDA System
-License:        GPL-2.0-only
+License:        GPLv2
 URL:            https://soc-extras.lip6.fr/en/alliance-abstract-en/
 Source:         http://www-asim.lip6.fr/pub/alliance/distribution/latest/alliance-%{version}.tar.bz2
 Source1:        alliance.fedora

+# Chitlesh's donated pictures to alliance
+# included asfrom snapshot 20090901
+
 Source2:       alliance-tutorials-go-all.sh
 Source3:       alliance-tutorials-go-all-clean.sh
 Source4:       alliance-examples-go-all.sh
 Source5:       alliance-examples-go-all-clean.sh
-
-# Update alliance-5.1.1 to commit %%{shortcommit} from
-# https://www-soc.lip6.fr/git/alliance.git
-Patch00: 0000-alliance-5.1.1-git%{shortcommit}.patch
-
-Patch01: 0001-Remove-stray-files.patch
-Patch02: 0002-Update-autostuff.patch
-Patch03: 0003-Consolidate-installation-dirs.patch
-Patch04: 0004-Misc-installation-dirs-fixes.patch
-Patch05: 0005-Use-inttypes-macros-to-print-int32_t.patch
-Patch06: 0006-Use-ring_yy-instead-of-yy.patch
-Patch07: 0007-Eliminate-CFLAGS.patch
-Patch08: 0008-Rework-Makefile.ams.patch
-Patch09: 0009-Misc.-doc-fixes.patch
-Patch10: 0010-Fedora-profiles.patch
-# Bashisms in /etc/profile.d/alc_env.csh
-Patch11: 0011-Use-setenv-instead-of-set-RHBZ-1337691.patch
-# Flex compatibility issues
-Patch12: 0012-Remove-yylineno.patch
-# GCC-10 incompatibilities
-Patch13: 0013-GCC-10-fixes.patch
-
-
-BuildRequires:  gcc-c++
+# 2014-07-01: Notified upstream via e-mail to alliance-users@asim.lip6.fr
+#Patch0:        alliance-5.0-20090901-format-security.patch
+# 2014-07-01: From debian: debian/patches/10-fix-parser-extern.patch
+#Patch1:        alliance-5.0-20090901-bison.patch
 BuildRequires:  bison
 BuildRequires:  byacc
 BuildRequires:  desktop-file-utils
 BuildRequires:  flex
+BuildRequires:  ghostscript
 BuildRequires:  libstdc++-devel
+BuildRequires:  libXp-devel
 BuildRequires:  libXpm-devel
 BuildRequires:  libXt-devel
 BuildRequires:  m4
@ -53,15 +34,11 @@ BuildRequires:  tex(picinpar.sty)
 BuildRequires:  tex(subfigure.sty)
 BuildRequires:  tex(wrapfig.sty)
 BuildRequires:  transfig
-BuildRequires:  /usr/bin/convert
-BuildRequires:  /usr/bin/dvipdf
-BuildRequires:  autoconf automake libtool
-
 %if 0%{?rhel}
 BuildRequires:  openmotif-devel
 BuildRequires:  pkgconfig
 %else
-BuildRequires:  motif-devel
+BuildRequires:  lesstif-devel
 %endif
 Requires:       xorg-x11-fonts-misc
 # RHBZ 442379
@ -92,137 +69,139 @@ Alliance provides CAD tools covering most of all the digital design flow:
 Alliance is listed among Fedora Electronic Lab (FEL) packages.

 %package        libs
-Summary:        Alliance VLSI CAD System - Libraries
+Summary:        Alliance VLSI CAD Sytem - multilibs
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       electronics-menu

 %description    libs
 Architecture dependent files for the Alliance VLSI CAD Sytem.

-%package        devel
-Summary:        Alliance VLSI CAD System - Development libraries
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-
-%description    devel
-%{summary}
-
 %package        doc
-Summary:        Alliance VLSI CAD System - Documentations
+Summary:        Alliance VLSI CAD Sytem - Documentations
 BuildArch:      noarch
 Requires:       gnuplot
 BuildRequires:  tetex-latex
-BuildRequires:  make

 %description    doc
 Documentation and tutorials for the Alliance VLSI CAD Sytem.

 %prep
-%setup -qn %{name}
-%patch -P00 -p2
-
-%patch -P01 -p2
-%patch -P02 -p2
-%patch -P03 -p2
-%patch -P04 -p2
-%patch -P05 -p2
-%patch -P06 -p2
-%patch -P07 -p2
-%patch -P08 -p2
-%patch -P09 -p2
-%patch -P10 -p2
-%patch -P11 -p2
-%patch -P12 -p2
-%patch -P13 -p2
-
-pushd src > /dev/null
-
-# Don't build attila
-rm -r attila
-
-# Setup auto*stuff
-./autostuff
-
-# The configure.ins confuse rpm
-# rename them into configure.in~
-sed -i -e 's/configure.in/configure.in~/g' autostuff
-for x in $(find */* -name configure.in); do
-mv $x $x~
-done
-
-chmod +x configure
+%setup -qn %{name}/src
+#%patch0 -p1
+#%patch1 -p1
+rm -frv autom4te.cache

 cp -p %{SOURCE1} .
-sed -i "s|ALLIANCE_TOP/bin|%{_libdir}/alliance/bin|" distrib/*.desktop
+sed -i "s|ALLIANCE_TOP|%{prefix}|" distrib/*.desktop
+
+# removed useless copyrighted (by Cadence) lines from the examples
+# and even in alliance-run
+# https://www-asim.lip6.fr/wws/arc/alliance-users/2007-07/msg00006.html

+# ------------------------------------------------------------------------------
+# Description : 2008 March : TexLive introduction to Rawhide
+sed -i "s|tutorials||" documentation/Makefile.in
+sed -i "s|documentation/tutorials/Makefile||" configure*
+pushd documentation/tutorials
+    # clean unneccessary files
+    rm Makefile*
+    rm *.pdf
+    # build documentation
+    for folder in place_and_route/tex start simulation/tex synthesis/tex; do
+        pushd $folder
+            make
+        popd
+        # remove useless directories before %%doc
+        rm -rf $folder
+    done
+    # Add automated scripts to tutorials
+    install -pm 755 %{SOURCE2} go-all.sh
+    install -pm 755 %{SOURCE3} go-all-clean.sh
+    # Fedora Electronic Lab self test for alliance
+    #./go-all.sh 2>&1 | tee self-test-tutorials.log
+    # clean temporary files
+    ./go-all-clean.sh
+popd
 # ------------------------------------------------------------------------------

-## Convert to UTF-8
-for nonUTF8 in \
-  FAQ \
-  alcban/man1/alcbanner.1 \
-  distrib/doc/alc_origin.1 \
-  loon/doc/loon.1 \
-  boog/doc/boog.1 \
-  m2e/doc/man1/m2e.1 \
-  documentation/overview/overview.tex \
-  documentation/alliance-examples/tuner/build_tuner \
-  documentation/alliance-examples/tuner/README \
-  documentation/alliance-examples/tuner/tuner.vbe \
-  documentation/alliance-examples/mipsR3000/sce/mips_dpt.c \
-  documentation/alliance-examples/mipsR3000/asm/mips_defs.h \
-; do \
+# fixing flex and bison update on rawhide
+sed -i '30i\#include \"string.h\"' ocp/src/placer/Ocp.cpp ocp/src/placer/PPlacement.h
+sed -i '18i\#include \"bvl_bcomp_y.h\"' bvl/src/bvl_bcomp_y.y
+
+# make sure the man pages are UTF-8...
+for nonUTF8 in FAQ README LICENCE distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \
+               loon/doc/loon.1 m2e/doc/man1/m2e.1 boog/doc/boog.1 ; do
  %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv
  mv -f $nonUTF8.conv $nonUTF8
 done

 pushd documentation/alliance-examples/
+# make sure the man pages are UTF-8...
+for nonUTF8 in tuner/build_tuner mipsR3000/asm/mips_defs.h tuner/tuner.vbe \
+               tuner/README mipsR3000/sce/mips_dpt.c ; do
+  %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv
+  mv -f $nonUTF8.conv $nonUTF8
+done
+
 #wrong-file-end-of-line-encoding
 sed -i 's/\r//' mipsR3000/asm/*
 popd

 find documentation/tutorials/ \
-   \( -name *.vbe  -o \
+    -name *.vbe  -o \
    -name *.pat  -o \
    -name *.vhdl -o \
    -name *.vst  -o \
-    -name *.c \) \
+    -name *.c \
    -exec chmod 0644 {} ';'
-popd > /dev/null

 %build
-# The C parts use implicit ints, implicit function declarations,
-# and old-style function declarations heavily.
-%global build_type_safety_c 0
-export CFLAGS="%build_cflags -std=gnu89"
-export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS"
-pushd src > /dev/null
-%configure --enable-alc-shared             \
-           --disable-static                \
-           --prefix=%{_libdir}/%{name}     \
-           --bindir=%{_libdir}/%{name}/bin \
-           --libdir=%{_libdir}/%{name}/lib \
-           --includedir=%{_libdir}/%{name}/include \
-           --docdir=%{_pkgdocdir} \
-           --mandir=%{_mandir}
+export ALLIANCE_TOP=%{prefix}
+%configure --enable-alc-shared            \
+           --disable-static               \
+           --includedir=%{prefix}/include \
+           --libdir=%{prefix}/lib         \
+           --mandir=%{_datadir}/%{name}/man         # RHBZ 252941
+
+# disabling rpath
+sed -i 's|^hardcode_libdir_flag_spec="\\${wl}--rpath \\${wl}\\$libdir"|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+# clean unused-direct-shlib-dependencies
+sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool

 # Is not parallel-build-safe
 make
-popd

 %install
-pushd src > /dev/null
 %make_install

-# Add automated scripts to examples
-#install -pm 755 %{SOURCE4} alliance-examples/go-all.sh
-#install -pm 755 %{SOURCE5} alliance-examples/go-all-clean.sh
+# Set execution rights on the alc_env.* batchs and adjust ALLIANCE_TOP.
+pushd %{buildroot}%{_sysconfdir}/profile.d
+  chmod 0644 alc_env.*
+  sed -i "s|@DATE@|`date`|" alc_env*
+  sed "s|ALLIANCE_TOP *= *\([^;]*\)|ALLIANCE_TOP=%{prefix}|" alc_env.sh
+  sed "s|setenv *ALLIANCE_TOP *\([^;]*\)|setenv ALLIANCE_TOP %{prefix}|" alc_env.csh
+popd

-#pushd alliance-examples/
-#    # FEL self test for alliance
-#    #./go-all.sh 2>&1 | tee self-test-examples.log
-#    # clean temporary files
-#    ./go-all-clean.sh
-#popd
+
+# documentation
+cp -pr %{buildroot}%{prefix}/doc/ .
+cp -pr %{buildroot}%{prefix}/examples/alliance-examples/ .
+
+rm -rf %{buildroot}%{prefix}/doc/
+rm -rf %{buildroot}%{prefix}/examples/
+
+# Add automated scripts to examples
+install -pm 755 %{SOURCE4} alliance-examples/go-all.sh
+install -pm 755 %{SOURCE5} alliance-examples/go-all-clean.sh
+
+pushd alliance-examples/
+    # FEL self test for alliance
+    #./go-all.sh 2>&1 | tee self-test-examples.log
+    # clean temporary files
+    ./go-all-clean.sh
+popd

 find %{buildroot} -name '*.la' -delete -print

@ -237,192 +216,83 @@ for d in distrib/*.desktop; do
 desktop-file-install --dir %{buildroot}%{_datadir}/applications/ $d
 done

+# Architecture independent files
+mv %{buildroot}%{prefix}/cells %{buildroot}%{_datadir}/%{name}/
+mv %{buildroot}%{prefix}/etc   %{buildroot}%{_datadir}/%{name}/
+
 # protecting hardcoded links
-#ln -sf ../../..%{_datadir}/%{name}/cells %{buildroot}%{_prefix}/cells
-#ln -sf ../../..%{_datadir}/%{name}/etc   %{buildroot}%{_prefix}/etc
-#ln -sf ../../..%{_datadir}/%{name}/man   %{buildroot}%{_prefix}/man
-
-# rename manpages to avoid conflicts
-# RHBZ 252941
-pushd $RPM_BUILD_ROOT%{_mandir} > /dev/null
-/usr/bin/rename .1 .1alc man1/*
-/usr/bin/rename .3 .3alc man3/*
-/usr/bin/rename .5 .5alc man5/*
-# Reflect man page renamer to man page includes
-sed -i -e 's,^\(.so man[13]/alc_.*.[13]\)$,\1alc,' man*/*
-popd > /dev/null
-
-# Rename alliance subdir into html
-mv %{buildroot}%{_pkgdocdir}/alliance %{buildroot}%{_pkgdocdir}/html
-# Directly install files to go into 5%{_pkgdocdir}
-install -m 644 README CHANGES FAQ alliance.fedora %{buildroot}%{_pkgdocdir}
+ln -sf ../../..%{_datadir}/%{name}/cells %{buildroot}%{prefix}/cells
+ln -sf ../../..%{_datadir}/%{name}/etc   %{buildroot}%{prefix}/etc
+ln -sf ../../..%{_datadir}/%{name}/man   %{buildroot}%{prefix}/man

+# manpage-not-gzipped
+find %{prefix}/man -type f -not -name '*.gz' -print | xargs gzip -9f

 %{__mkdir} -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/
 cat > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf << EOF
 # Alliance VLSI design system
-%{_libdir}/%{name}/lib
+%{prefix}/lib
 EOF

+
+# removing tools for compiling and installing Alliance tools
+# These are for the packager (i.e me) and not for user
+rm -f %{buildroot}%{_sysconfdir}/%{name}/attila.conf
+rm -f %{buildroot}%{prefix}/etc/attila.conf
+rm -f %{buildroot}%{prefix}/bin/attila
+rm -f %{buildroot}%{_datadir}/man/man1/attila*
+rm -f doc/html/alliance/*attila.html
+rm -f doc/pdf/attila.pdf
+
+# correcting minor documentation details
+sed -i "s|/bin/zsh|/bin/sh|" doc/alliance-run/bench.zsh
+
 %{_fixperms} %{buildroot}/*
-popd > /dev/null

 %post
+/sbin/ldconfig
 source %{_sysconfdir}/profile.d/alc_env.sh
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

-%post libs -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

-%postun libs -p /sbin/ldconfig
+
+#These headers are useful for the _usage_ of the binaries
+#without these headers some of the binaries will be broken by default

 %files
-%{_pkgdocdir}/README
-%{_pkgdocdir}/CHANGES
-%{_pkgdocdir}/FAQ
-%{_pkgdocdir}/alliance.fedora
-%license src/LICENCE src/COPYING*
-
-%{_datadir}/alliance
+%license LICENCE COPYING*
+%doc CHANGES FAQ alliance.fedora
+#%{prefix}/
+%{_datadir}/%{name}/
 %{_datadir}/icons/hicolor/48x48/apps/*
-%{_datadir}/applications/*.desktop
-%dir %{_libdir}/alliance
-%{_libdir}/alliance/bin
-%{_mandir}/man1/*.1*
-%config(noreplace) %{_sysconfdir}/alliance
-%config(noreplace) %{_sysconfdir}/profile.d/alc_env.*
-
-%files devel
-%dir %{_libdir}/alliance
-%{_libdir}/alliance/include
-%dir %{_libdir}/alliance/lib
-%{_libdir}/alliance/lib/*.so
-%{_mandir}/man3/*.3*

 %files libs
-%dir %{_libdir}/alliance
-%dir %{_libdir}/alliance/lib
-%{_libdir}/alliance/lib/lib*.so.*
-%{_mandir}/man5/*.5*
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/*
+%{_datadir}/applications/*.desktop
+%config(noreplace) %{_sysconfdir}/profile.d/alc_env.*

 %files doc
-%{_pkgdocdir}
+%license LICENCE COPYING*
+%doc doc/html/
+%doc doc/design-flow
+%doc doc/pdf/*.pdf
+%doc doc/overview/*.ps
+%doc doc/overview/*.pdf
+%doc documentation/tutorials/
+#Makefiles are present in alliance-examples/*. It is normal because
+# * it gives the VLSI designer a template on how to create his own
+#   Makefile for alliance (VLSI designers normally don't know how to do so)
+# * it is not part of the build, but part of the working environment of the user
+%doc alliance-examples/
+%doc doc/alliance-run/


 %changelog
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-37.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-36.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-35.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-34.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-33.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-32.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Aug 16 2023 Florian Weimer <fweimer@redhat.com> - 5.1.1-31.20160506gitd8c05cd
- Set build_type_safety_c to 0 (#2187002)
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-30.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Apr 15 2023 Florian Weimer <fweimer@redhat.com> - 5.1.1-29.20160506gitd8c05cd
- Build in C89 mode (#2187002)
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-28.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Dec 05 2022 Ralf Corsépius <corsepiu@fedoraproject.org> - 5.1.1-27.20160506gitd8c05cd
- Convert license to SPDX.
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-26.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-25.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-24.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-23.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Sep 30 2020 Adam Jackson <ajax@redhat.com> - 5.1.1-22.20160506gitd8c05cd
- Remove unused BuildRequires: libXp-devel
-
-* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-21.20160506gitd8c05cd
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Jeff Law <law@redhat.com> - 5.1.1-20.20160506gitd8c05cd
- Force C++14 as the code is not ready for C++17
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-19.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Feb 22 2020 Ralf Corsépius <corsepiu@fedoraproject.org> - 5.1.1-18.20160506gitd8c05cd
- Drop lesstif.
- Spec file cleanup.
- Add 0013-GCC-10-fixes.patch (F32FTBFS, RHBZ#1799147).
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-17.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-16.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-15.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-14.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Mar 15 2018 Ralf Corsépius <corsepiu@fedoraproject.org> - 5.1.1-13.20160506gitd8c05cd
- BR: /usr/bin/dvipdf instead of ghostscript (F28FTBFS).
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-12.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sun Jan 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 5.1.1-11.20160506gitd8c05cd
- Remove obsolete scriptlets
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-10.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-9.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.1-8.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-7.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri May 20 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 5.1.1-6.20160506gitd8c05cd
- Upstream update.
- Rebase patches.
- Remove reference to FLEX_BETA.
-
-* Fri May 20 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 5.1.1-5.20160220git10a7b7e
- Remove bashisms in /etc/profile/alc_env.csh (RHBZ#1337691).
- Work around flex-2.6.0 compatibility issues triggering a FTBFS.
-
-* Tue Mar 01 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 5.1.1-4.20160220git10a7b7e
- Rework spec.
- Add upstream changes.
- Rework package configuration.
- Introduce *-devel.
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
 * Sun Dec 27 2015 Björn Esser <fedora@besser82.io> - 5.1.1-2
 - Rebuilt for libXm so-name bump
 - Use %%license