From 0f051ce81c752d9ce251e833598504c18a14e61f Mon Sep 17 00:00:00 2001
From: Chitlesh GOORAH <chitlesh@fedoraproject.org>
Date: Sep 03 2009 05:18:37 +0000
Subject: 20090901snap: upstream merged most of our patches


---

diff --git a/.cvsignore b/.cvsignore
index 6cd5c0b..2f30e04 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-alliance-5.0-20090827.tar.gz
+alliance-5.0-20090901.tar.gz
diff --git a/alliance-env.patch b/alliance-env.patch
deleted file mode 100644
index 2743ed5..0000000
--- a/alliance-env.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -Naur distrib/etc/alc_env.csh.in distrib1/etc/alc_env.csh.in
---- distrib/etc/alc_env.csh.in	2007-11-28 15:58:10.000000000 +0100
-+++ distrib1/etc/alc_env.csh.in	2009-08-27 18:16:05.285270921 +0200
-@@ -70,20 +70,23 @@
- 
- # System environment variables.
-  if ( $?PATH ) then
--   setenv PATH "${ALLIANCE_TOP}/bin:$PATH"
-+   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"
-+   setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib"
-  else
-    setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:`manpath`"
-  endif
- 
-  if ( $?MANPATH ) then
--   setenv MANPATH "${ALLIANCE_TOP}/man:${MANPATH}"
-+   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 distrib1/etc/alc_env.sh.in
---- distrib/etc/alc_env.sh.in	2007-11-28 15:58:10.000000000 +0100
-+++ distrib1/etc/alc_env.sh.in	2009-08-27 18:17:38.477272066 +0200
-@@ -70,20 +70,23 @@
- 
- 
- # System environment variables.
-- PATH=$ALLIANCE_TOP/bin:$PATH
-+ 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
-+   LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib
-  fi
-  export LD_LIBRARY_PATH
- 
-  if [ -z "${MANPATH}" ]; then
--   MANPATH=$ALLIANCE_TOP/man:$(manpath)
-+   MANPATH=:$ALLIANCE_TOP/man:$(manpath)
-  else
--   MANPATH=$ALLIANCE_TOP/man:$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
-@@ -1,6 +1,6 @@
- # $Id: Makefile.am,v 1.4 2002/06/25 14:09:38 czo Exp $
- 
--etcdir=$(prefix)/etc
-+etcdir=/etc/profile.d
- 
- etc_SCRIPTS=alc_env.csh alc_env.sh
- 
-diff -Naur distrib/etc/Makefile.in etc/Makefile.in
---- distrib/etc/Makefile.in	2007-07-18 19:04:22.000000000 +0200
-+++ etc/Makefile.in	2007-08-18 13:59:28.000000000 +0200
-@@ -336,7 +336,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--etcdir = $(prefix)/etc
-+etcdir = /etc/profile.d
- etc_SCRIPTS = alc_env.csh alc_env.sh
- EXTRA_DIST = alc_env.csh.in alc_env.sh.in
- all: all-am
diff --git a/alliance-examples-adm2901.patch b/alliance-examples-adm2901.patch
deleted file mode 100644
index dd18a4b..0000000
--- a/alliance-examples-adm2901.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Naur alliance-5.0/documentation/alliance-examples/amd2901/amd2901_chip.c test-64/alliance-examples/amd2901/amd2901_chip.c
---- alliance-5.0/documentation/alliance-examples/amd2901/amd2901_chip.c	2004-05-23 20:55:16.000000000 +0200
-+++ test-64/alliance-examples/amd2901/amd2901_chip.c	2009-06-14 02:35:45.000000000 +0200
-@@ -1,5 +1,5 @@
- #include <genlib.h>
--#define POWER "vdde","vdd","vsse","vss",0
-+#define POWER "vdde","vdd","vsse","vss",NULL
- 
- int main ()
-  {
-@@ -78,7 +78,7 @@
- 
- 	"vdd => vdd",
- 	"vss => vss",
--	0);
-+	NULL);
- 
-   GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER);
- 
-@@ -119,13 +119,13 @@
-   GENLIB_LOINS ("piot_sp","p_r3",
- 	"ram_o_up","sh_left","ram_i_up","r3","cki", POWER );
- 
--  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",0);
--  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",0);
-+  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
-+  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
- 
--  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",0);
--  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",0);
--  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",0);
--  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",0);
-+  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
-+  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
-+  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
-+  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
- 
-   GENLIB_SAVE_LOFIG();
- 
-diff -Naur alliance-5.0/documentation/alliance-examples/amd2901/amd2901_core.c test-64/alliance-examples/amd2901/amd2901_core.c
---- alliance-5.0/documentation/alliance-examples/amd2901/amd2901_core.c	2004-05-23 20:55:16.000000000 +0200
-+++ test-64/alliance-examples/amd2901/amd2901_core.c	2009-06-14 02:36:07.000000000 +0200
-@@ -109,7 +109,7 @@
-        "out_x[3:0] =>     y[3:0]",
- 
-        "vdd => vdd",
--       "vss => vss", 0);
-+       "vss => vss", NULL);
- 
- 
-   /* ***************** Control Instanciation ****************** */
-@@ -161,7 +161,7 @@
-        "oe => oe",
- 
-        "vdd => vdd",
--       "vss => vss", 0);
-+       "vss => vss", NULL);
- 
-   GENLIB_PLACE ("amd2901_dpt", "amd2901_dpt", NOSYM, 0, 0);
-   GENLIB_DEF_AB (0, 0, 0, 100);
diff --git a/alliance-examples-mipsR3000.patch b/alliance-examples-mipsR3000.patch
deleted file mode 100644
index 5e1bdf0..0000000
--- a/alliance-examples-mipsR3000.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur alliance-5.0/documentation/alliance-examples/mipsR3000/sce/Makefile test-64/alliance-examples/mipsR3000/sce/Makefile
---- alliance-5.0/documentation/alliance-examples/mipsR3000/sce/Makefile	2004-07-30 02:40:09.000000000 +0200
-+++ test-64/alliance-examples/mipsR3000/sce/Makefile	2009-06-14 03:12:56.000000000 +0200
-@@ -119,7 +119,7 @@
-       LVX = $(MBK_EXTRACT_ENV); $(ALLIANCE_BIN)/lvx
-     PROOF = $(MBK_EXTRACT_ENV); $(ALLIANCE_BIN)/proof
-      RING = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ring
--    DPGEN = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/genlib
-+    DPGEN = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/genlib --keep-exec --verbose
-     OCP   = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ocp -v -gnuplot
-     OCR   = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/ocr
-     NERO  = $(MBK_GENERAT_ENV); $(ALLIANCE_BIN)/nero -V
diff --git a/alliance-examples.patch b/alliance-examples.patch
deleted file mode 100644
index 582c2fc..0000000
--- a/alliance-examples.patch
+++ /dev/null
@@ -1,594 +0,0 @@
-diff -Naur documentation/alliance-examples/addaccu16/Makefile alliance-examples/addaccu16/Makefile
---- documentation/alliance-examples/addaccu16/Makefile	2004-05-24 00:15:16.000000000 +0200
-+++ alliance-examples/addaccu16/Makefile	2007-07-19 13:13:51.000000000 +0200
-@@ -16,7 +16,9 @@
- # |                                                             |
- # \------------------------------------------------------------*/
- 
- ALLIANCE_BIN=$(ALLIANCE_TOP)/bin
-+ 
-+ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples
- 
- VASY   = $(ALLIANCE_BIN)/vasy
- ASIMUT = $(ALLIANCE_BIN)/asimut
-@@ -39,8 +41,8 @@
- TOUCH  = touch
- 
- TARGET_LIB      = $(ALLIANCE_TOP)/cells/sxlib
--RDS_TECHNO_SYMB = ../etc/techno-symb.rds
--RDS_TECHNO      = ../etc/techno-035.rds
-+RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds
-+RDS_TECHNO      = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds
- SPI_MODEL       = $(ALLIANCE_TOP)/etc/spimodel.cfg
- METAL_LEVEL     = 2
- 
-diff -Naur documentation/alliance-examples/addaccu16/README alliance-examples/addaccu16/README
---- documentation/alliance-examples/addaccu16/README	2004-07-28 13:00:06.000000000 +0200
-+++ alliance-examples/addaccu16/README	2007-07-19 13:13:51.000000000 +0200
-@@ -10,11 +10,13 @@
- the associated stimuli file, and also a configuration file for IO
- placement (used during the Place and Route step).
- 
--The Makefile set environement variables properly and run Alliance tools, 
-+The Makefile set environment variables properly and run Alliance tools,
- following each step of the design flow from VHDL up to real layout in a
-  pseudo 0.35 techno.
- 
--The environement variable ALLIANCE_TOP has to be set.
-+ 
-+copy the folder "addaccu16" to any writable folder of your choice and type:
-+$ make
- 
- The main targets of the makefile are listed below (following the design flow).
- 
-diff -Naur documentation/alliance-examples/adder4/adder4.ioc alliance-examples/adder4/adder4.ioc
---- documentation/alliance-examples/adder4/adder4.ioc	2004-05-23 19:27:03.000000000 +0200
-+++ alliance-examples/adder4/adder4.ioc	2007-07-19 13:13:51.000000000 +0200
-@@ -1,4 +1,4 @@
--#      Copyright (c) 1997 by Cadence. All rights reserved.      
-+#      
- ###################################################################
- # In each of TOP()/BOTTOM()/LEFT()/RIGHT() section, there are     #
- # placed IOs. In the IGNORE() section, the IOs are ignored        #
-diff -Naur documentation/alliance-examples/adder4/Makefile alliance-examples/adder4/Makefile
---- documentation/alliance-examples/adder4/Makefile	2004-05-24 00:15:20.000000000 +0200
-+++ alliance-examples/adder4/Makefile	2007-07-19 13:13:51.000000000 +0200
-@@ -16,7 +16,9 @@
- # |                                                             |
- # \------------------------------------------------------------*/
- 
- ALLIANCE_BIN=$(ALLIANCE_TOP)/bin
-+ 
-+ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples
- 
- VASY   = $(ALLIANCE_BIN)/vasy
- ASIMUT = $(ALLIANCE_BIN)/asimut
-@@ -39,8 +41,8 @@
- TOUCH  = touch
- 
- TARGET_LIB      = $(ALLIANCE_TOP)/cells/sxlib
--RDS_TECHNO_SYMB = ../etc/techno-symb.rds
--RDS_TECHNO      = ../etc/techno-035.rds
-+RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds
-+RDS_TECHNO      = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds
- SPI_MODEL       = $(ALLIANCE_TOP)/etc/spimodel.cfg
- METAL_LEVEL     = 2
- 
-diff -Naur documentation/alliance-examples/adder4/README alliance-examples/adder4/README
---- documentation/alliance-examples/adder4/README	2004-07-28 13:00:06.000000000 +0200
-+++ alliance-examples/adder4/README	2007-07-19 13:13:51.000000000 +0200
-@@ -14,7 +14,9 @@
- following each step of the design flow from VHDL up to real layout in a
-  pseudo 0.35 techno.
- 
--The environement variable ALLIANCE_TOP has to be set.
-+ 
-+copy the folder "adder4" to any writable folder of your choice and type:
-+$ make
- 
- The main targets of the makefile are listed below (following the design flow).
-
-diff -Naur documentation/alliance-examples/amd2901/amd2901_core.ioc alliance-examples/amd2901/amd2901_core.ioc
---- documentation/alliance-examples/amd2901/amd2901_core.ioc	2004-05-23 20:55:16.000000000 +0200
-+++ alliance-examples/amd2901/amd2901_core.ioc	2007-07-19 13:13:52.000000000 +0200
-@@ -1,4 +1,4 @@
--#      Copyright (c) 1997 by Cadence. All rights reserved.      
-+#      
- ###################################################################
- # In each of TOP()/BOTTOM()/LEFT()/RIGHT() section, there are     #
- # placed IOs. In the IGNORE() section, the IOs are ignored        #
-
-diff -Naur documentation/alliance-examples/amd2901/Makefile alliance-examples/amd2901/Makefile
---- documentation/alliance-examples/amd2901/Makefile	2004-05-24 00:15:22.000000000 +0200
-+++ alliance-examples/amd2901/Makefile	2007-07-19 13:13:51.000000000 +0200
-@@ -11,7 +11,9 @@
-  STANDART_PATH = PATH=$(STANDART_BIN); export PATH
- 
- # Standart Alliance binary access paths.
-  ALLIANCE_BIN  = $(ALLIANCE_TOP)/bin
-+ 
-+ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples
- 
- # --------------------------------------------------------------------
- # Standarts binaries.
-@@ -41,8 +43,8 @@
-     CATA_LIB2 = $(ALLIANCE_TOP)/cells/padlib
-     CATA_LIB  = .:$(CATA_LIB0):$(CATA_LIB1):$(CATA_LIB2)
-    TARGET_LIB = $(ALLIANCE_TOP)/cells/sxlib
--   RDS_TECHNO     = ../etc/techno-symb.rds
--  REAL_RDS_TECHNO = ../etc/techno-035.rds 
-+RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds
-+RDS_TECHNO      = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds
-    GRAAL_TECHNO = $(ALLIANCE_TOP)/etc/cmos.graal
- 
-
-diff -Naur documentation/alliance-examples/amd2901-vasy/amd2901.ioc alliance-examples/amd2901-vasy/amd2901.ioc
---- documentation/alliance-examples/amd2901-vasy/amd2901.ioc	2004-05-23 21:00:16.000000000 +0200
-+++ alliance-examples/amd2901-vasy/amd2901.ioc	2007-07-19 13:13:52.000000000 +0200
-@@ -1,4 +1,4 @@
--#      Copyright (c) 1997 by Cadence. All rights reserved.      
-+#      
- ###################################################################
- # In each of TOP()/BOTTOM()/LEFT()/RIGHT() section, there are     #
- # placed IOs. In the IGNORE() section, the IOs are ignored        #
-diff -Naur documentation/alliance-examples/amd2901-vasy/Makefile alliance-examples/amd2901-vasy/Makefile
---- documentation/alliance-examples/amd2901-vasy/Makefile	2004-05-24 00:15:23.000000000 +0200
-+++ alliance-examples/amd2901-vasy/Makefile	2007-07-19 13:13:52.000000000 +0200
-@@ -16,7 +16,9 @@
- # |                                                             |
- # \------------------------------------------------------------*/
- 
- ALLIANCE_BIN = $(ALLIANCE_TOP)/bin
-+ 
-+ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples
- 
- VASY   = $(ALLIANCE_BIN)/vasy
- ASIMUT = $(ALLIANCE_BIN)/asimut
-@@ -40,8 +42,8 @@
- TOUCH  = touch
- 
- TARGET_LIB      = $(ALLIANCE_TOP)/cells/sxlib
--RDS_TECHNO_SYMB = ../etc/techno-symb.rds
--RDS_TECHNO      = ../etc/techno-035.rds
-+RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds
-+RDS_TECHNO      = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds
- SPI_MODEL       = $(ALLIANCE_TOP)/etc/spimodel.cfg
- METAL_LEVEL     = 4
- 
-diff -Naur documentation/alliance-examples/digi/Makefile alliance-examples/digi/Makefile
---- documentation/alliance-examples/digi/Makefile	2004-09-09 22:03:49.000000000 +0200
-+++ alliance-examples/digi/Makefile	2007-07-19 13:13:52.000000000 +0200
-@@ -16,7 +16,9 @@
- # |                                                             |
- # \------------------------------------------------------------*/
- 
- ALLIANCE_BIN=$(ALLIANCE_TOP)/bin
-+ 
-+ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples
- 
- SYF    = $(ALLIANCE_BIN)/syf
- ASIMUT = $(ALLIANCE_BIN)/asimut
-@@ -40,14 +42,14 @@
- TOUCH  = touch
- 
- TARGET_LIB      = $(ALLIANCE_TOP)/cells/sxlib
--RDS_TECHNO_SYMB = ../etc/techno-symb.rds
--RDS_TECHNO      = ../etc/techno-035.rds
-+RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds
-+RDS_TECHNO      = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds
- METAL_LEVEL     = 2
- SPI_MODEL       = $(ALLIANCE_TOP)/etc/spimodel.cfg
- 
- # /*------------------------------------------------------------\
- # |                                                             |
--# |                            Environement                     |
-+# |                            Environment                     |
- # |                                                             |
- # \------------------------------------------------------------*/
- 
-diff -Naur documentation/alliance-examples/divcas4/divcas4.ioc alliance-examples/divcas4/divcas4.ioc
---- documentation/alliance-examples/divcas4/divcas4.ioc	2004-05-23 19:52:10.000000000 +0200
-+++ alliance-examples/divcas4/divcas4.ioc	2007-07-19 13:13:52.000000000 +0200
-@@ -1,4 +1,4 @@
--#      Copyright (c) 1997 by Cadence. All rights reserved.      
-+#      
- ###################################################################
- # In each of TOP()/BOTTOM()/LEFT()/RIGHT() section, there are     #
- # placed IOs. In the IGNORE() section, the IOs are ignored        #
-diff -Naur documentation/alliance-examples/divcas4/Makefile alliance-examples/divcas4/Makefile
---- documentation/alliance-examples/divcas4/Makefile	2004-05-23 21:11:26.000000000 +0200
-+++ alliance-examples/divcas4/Makefile	2007-07-19 13:13:52.000000000 +0200
-@@ -16,7 +16,9 @@
- # |                                                             |
- # \------------------------------------------------------------*/
- 
- ALLIANCE_BIN = $(ALLIANCE_TOP)/bin
-+ 
-+ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples
- 
- VASY   = $(ALLIANCE_BIN)/vasy
- ASIMUT = $(ALLIANCE_BIN)/asimut
-@@ -39,8 +41,8 @@
- TOUCH  = touch
- 
- TARGET_LIB      = $(ALLIANCE_TOP)/cells/sxlib
--RDS_TECHNO_SYMB = ../etc/techno-symb.rds
--RDS_TECHNO      = ../etc/techno-035.rds
-+RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds
-+RDS_TECHNO      = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds
- SPI_MODEL       = $(ALLIANCE_TOP)/etc/spimodel.cfg
- METAL_LEVEL     = 2
- 
-diff -Naur documentation/alliance-examples/divcas4/README alliance-examples/divcas4/README
---- documentation/alliance-examples/divcas4/README	2004-07-28 13:00:06.000000000 +0200
-+++ alliance-examples/divcas4/README	2007-07-19 13:13:52.000000000 +0200
-@@ -14,5 +14,6 @@
- following each step of the design flow from VHDL up to real layout in a
-  pseudo 0.35 techno.
- 
--The environement variable ALLIANCE_TOP has to be set.
--
-+ 
-+copy the folder "divcas4" to any writable folder of your choice and type:
-+$ make
-diff -Naur documentation/alliance-examples/hadamard/Makefile alliance-examples/hadamard/Makefile
---- documentation/alliance-examples/hadamard/Makefile	2004-05-24 00:15:25.000000000 +0200
-+++ alliance-examples/hadamard/Makefile	2007-07-19 16:21:10.000000000 +0200
-@@ -16,7 +16,9 @@
- # |                                                             |
- # \------------------------------------------------------------*/
- 
- ALLIANCE_BIN = $(ALLIANCE_TOP)/bin
-+ 
-+ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples
- 
- VASY   = $(ALLIANCE_BIN)/vasy
- ASIMUT = $(ALLIANCE_BIN)/asimut
-@@ -39,14 +41,14 @@
- TOUCH  = touch
- 
- TARGET_LIB      = $(ALLIANCE_TOP)/cells/sxlib
--RDS_TECHNO_SYMB = ../etc/techno-symb.rds
--RDS_TECHNO      = ../etc/techno-035.rds
-+RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds
-+RDS_TECHNO      = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds
- SPI_MODEL       = $(ALLIANCE_TOP)/etc/spimodel.cfg
- METAL_LEVEL     = 6
- 
- # /*------------------------------------------------------------\
- # |                                                             |
--# |                            Environement                     |
-+# |                            Environment                     |
- # |                                                             |
- # \------------------------------------------------------------*/
- 
-@@ -163,11 +165,11 @@
- 
- res_vasy_1.pat : hadamard.vst calcul.vbe ram.vbe rom.vbe \
-                  compteur.vbe sequenceur.vbe hadamard_model.vbe
--	$(ENV_ASIMUT_VASY); $(ASIMUT) hadamard hadamard_1 res_vasy_1 
-+	$(ENV_ASIMUT_VASY); $(ASIMUT) hadamard hadamard_1 res_vasy_1
- 
- res_synth_1.pat : hadamard.vst calcul.vst ram.vst rom.vst \
-                  compteur.vst sequenceur.vst hadamard_model.vst
--	$(ENV_ASIMUT_SYNTH); $(ASIMUT) -zd hadamard hadamard_1 res_synth_1 
-+	$(ENV_ASIMUT_SYNTH); $(ASIMUT) -zd hadamard hadamard_1 res_synth_1
- 
- 
- # /*------------------------------------------------------------\
-@@ -299,7 +301,7 @@
- # |                                                             |
- # \------------------------------------------------------------*/
- 
--lvx.done : hadamard.vst hadamard_e.al 
-+lvx.done : hadamard.vst hadamard_e.al
- 	$(ENV_LVX); $(LVX) vst al hadamard hadamard_e -f
- 	$(TOUCH) lvx.done
- 
-@@ -355,4 +357,4 @@
- 	$(RM) -f *.vst *.vbe *.boom *.done *.xsc *.al *.ap *.gpl *.gds \
- 	      *.log *.drc *.cif *.fin *.dat *.out hadamard_e.spi res_synth_1.pat \
- 	      res_vasy_1.pat
--	
-+
-diff -Naur documentation/alliance-examples/mipsR3000/sce/Makefile alliance-examples/mipsR3000/sce/Makefile
---- documentation/alliance-examples/mipsR3000/sce/Makefile	2004-07-30 02:40:09.000000000 +0200
-+++ alliance-examples/mipsR3000/sce/Makefile	2007-07-19 13:13:58.000000000 +0200
-@@ -5,7 +5,9 @@
-  STANDART_PATH = PATH=$(STANDART_BIN); export PATH
- 
- # Standart Alliance binary access paths.
-  ALLIANCE_BIN  = $(ALLIANCE_TOP)/bin
-+ 
-+ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples
- 
- # FitPath Alliance binary access paths.
- #    DEVEL_BIN  = /users/soft5/newlabo/alliance-4.5.0/archi/Solaris/bin
-diff -Naur documentation/alliance-examples/mipsR3000/sce/mips_core.ioc alliance-examples/mipsR3000/sce/mips_core.ioc
---- documentation/alliance-examples/mipsR3000/sce/mips_core.ioc	2004-05-24 00:23:35.000000000 +0200
-+++ alliance-examples/mipsR3000/sce/mips_core.ioc	2007-07-19 13:13:58.000000000 +0200
-@@ -1,4 +1,4 @@
--#      Copyright (c) 1997 by Cadence. All rights reserved.      
-+#      
- ###################################################################
- # In each of TOP()/BOTTOM()/LEFT()/RIGHT() section, there are     #
- # placed IOs. In the IGNORE() section, the IOs are ignored        #
-diff -Naur documentation/alliance-examples/multi16b-reg/Makefile alliance-examples/multi16b-reg/Makefile
---- documentation/alliance-examples/multi16b-reg/Makefile	2004-05-24 00:15:29.000000000 +0200
-+++ alliance-examples/multi16b-reg/Makefile	2007-07-19 13:13:59.000000000 +0200
-@@ -16,7 +16,9 @@
- # |                                                             |
- # \------------------------------------------------------------*/
- 
- ALLIANCE_BIN = $(ALLIANCE_TOP)/bin
-+ 
-+ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples
- 
- VASY   = $(ALLIANCE_BIN)/vasy
- ASIMUT = $(ALLIANCE_BIN)/asimut
-@@ -39,14 +41,14 @@
- TOUCH  = touch
- 
- TARGET_LIB      = $(ALLIANCE_TOP)/cells/sxlib
--RDS_TECHNO_SYMB = ../etc/techno-symb.rds
--RDS_TECHNO      = ../etc/techno-035.rds
-+RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds
-+RDS_TECHNO      = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds
- SPI_MODEL       = $(ALLIANCE_TOP)/etc/spimodel.cfg
- METAL_LEVEL     = 6
- 
- # /*------------------------------------------------------------\
- # |                                                             |
--# |                            Environement                     |
-+# |                            Environment                     |
- # |                                                             |
- # \------------------------------------------------------------*/
- 
-diff -Naur documentation/alliance-examples/multi4b/Makefile alliance-examples/multi4b/Makefile
---- documentation/alliance-examples/multi4b/Makefile	2004-05-24 00:15:29.000000000 +0200
-+++ alliance-examples/multi4b/Makefile	2007-07-19 13:14:00.000000000 +0200
-@@ -16,7 +16,9 @@
- # |                                                             |
- # \------------------------------------------------------------*/
- 
- ALLIANCE_BIN=$(ALLIANCE_TOP)/bin
-+ 
-+ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples
- 
- VASY   = $(ALLIANCE_BIN)/vasy
- ASIMUT = $(ALLIANCE_BIN)/asimut
-@@ -39,14 +41,14 @@
- TOUCH  = touch
- 
- TARGET_LIB      = $(ALLIANCE_TOP)/cells/sxlib
--RDS_TECHNO_SYMB = ../etc/techno-symb.rds
--RDS_TECHNO      = ../etc/techno-035.rds
-+RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds
-+RDS_TECHNO      = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds
- SPI_MODEL       = $(ALLIANCE_TOP)/etc/spimodel.cfg
- METAL_LEVEL     = 2
- 
- # /*------------------------------------------------------------\
- # |                                                             |
--# |                            Environement                     |
-+# |                            Environment                     |
- # |                                                             |
- # \------------------------------------------------------------*/
- 
-diff -Naur documentation/alliance-examples/multi4b/README alliance-examples/multi4b/README
---- documentation/alliance-examples/multi4b/README	2004-07-28 13:00:06.000000000 +0200
-+++ alliance-examples/multi4b/README	2007-07-19 13:14:00.000000000 +0200
-@@ -14,7 +14,9 @@
- following each step of the design flow from VHDL up to real layout in a
-  pseudo 0.35 techno.
- 
--The environement variable ALLIANCE_TOP has to be set.
-+ 
-+copy the folder "multi4b" to any writable folder of your choice and type:
-+$ make
- 
- The main targets of the makefile are listed below (following the design flow).
- 
-diff -Naur documentation/alliance-examples/multi8/Makefile alliance-examples/multi8/Makefile
---- documentation/alliance-examples/multi8/Makefile	2004-05-24 00:15:30.000000000 +0200
-+++ alliance-examples/multi8/Makefile	2007-07-19 13:14:00.000000000 +0200
-@@ -16,7 +16,9 @@
- # |                                                             |
- # \------------------------------------------------------------*/
- 
- ALLIANCE_BIN=$(ALLIANCE_TOP)/bin
-+ 
-+ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples
- 
- VASY   = $(ALLIANCE_BIN)/vasy
- ASIMUT = $(ALLIANCE_BIN)/asimut
-@@ -39,8 +41,8 @@
- TOUCH  = touch
- 
- TARGET_LIB      = $(ALLIANCE_TOP)/cells/sxlib
--RDS_TECHNO_SYMB = ../etc/techno-symb.rds
--RDS_TECHNO      = ../etc/techno-035.rds
-+RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds
-+RDS_TECHNO      = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds
- SPI_MODEL       = $(ALLIANCE_TOP)/etc/spimodel.cfg
- METAL_LEVEL     = 2
- 
-diff -Naur documentation/alliance-examples/multi8/README alliance-examples/multi8/README
---- documentation/alliance-examples/multi8/README	2004-07-28 13:00:06.000000000 +0200
-+++ alliance-examples/multi8/README	2007-07-19 13:14:00.000000000 +0200
-@@ -15,4 +15,6 @@
- following each step of the design flow from VHDL up to real layout in a
-  pseudo 0.35 techno.
- 
--The environement variable ALLIANCE_TOP has to be set.
-+ 
-+copy the folder "multi8" to any writable folder of your choice and type:
-+$ make
-diff -Naur documentation/alliance-examples/multi8b/Makefile alliance-examples/multi8b/Makefile
---- documentation/alliance-examples/multi8b/Makefile	2004-05-24 00:15:30.000000000 +0200
-+++ alliance-examples/multi8b/Makefile	2007-07-19 13:14:00.000000000 +0200
-@@ -16,7 +16,9 @@
- # |                                                             |
- # \------------------------------------------------------------*/
- 
- ALLIANCE_BIN=$(ALLIANCE_TOP)/bin
-+ 
-+ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples
- 
- VASY   = $(ALLIANCE_BIN)/vasy
- ASIMUT = $(ALLIANCE_BIN)/asimut
-@@ -39,8 +41,8 @@
- TOUCH  = touch
- 
- TARGET_LIB      = $(ALLIANCE_TOP)/cells/sxlib
--RDS_TECHNO_SYMB = ../etc/techno-symb.rds
--RDS_TECHNO      = ../etc/techno-035.rds
-+RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds
-+RDS_TECHNO      = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds
- SPI_MODEL       = $(ALLIANCE_TOP)/etc/spimodel.cfg
- METAL_LEVEL     = 4
- 
-diff -Naur documentation/alliance-examples/multi8b/README alliance-examples/multi8b/README
---- documentation/alliance-examples/multi8b/README	2004-07-28 13:00:06.000000000 +0200
-+++ alliance-examples/multi8b/README	2007-07-19 13:14:00.000000000 +0200
-@@ -14,7 +14,9 @@
- following each step of the design flow from VHDL up to real layout in a
-  pseudo 0.35 techno.
- 
--The environement variable ALLIANCE_TOP has to be set.
-+ 
-+copy the folder "multi8b" to any writable folder of your choice and type:
-+$ make
- 
- The main targets of the makefile are listed below (following the design flow).
- 
-diff -Naur documentation/alliance-examples/pgcd/Makefile alliance-examples/pgcd/Makefile
---- documentation/alliance-examples/pgcd/Makefile	2004-05-24 00:15:31.000000000 +0200
-+++ alliance-examples/pgcd/Makefile	2007-07-19 13:14:00.000000000 +0200
-@@ -16,7 +16,9 @@
- # |                                                             |
- # \------------------------------------------------------------*/
- 
- ALLIANCE_BIN=$(ALLIANCE_TOP)/bin
-+ 
-+ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples
- 
- VASY   = $(ALLIANCE_BIN)/vasy
- ASIMUT = $(ALLIANCE_BIN)/asimut
-@@ -39,8 +41,8 @@
- TOUCH  = touch
- 
- TARGET_LIB      = $(ALLIANCE_TOP)/cells/sxlib
--RDS_TECHNO_SYMB = ../etc/techno-symb.rds
--RDS_TECHNO      = ../etc/techno-035.rds
-+RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds
-+RDS_TECHNO      = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds
- SPI_MODEL       = $(ALLIANCE_TOP)/etc/spimodel.cfg
- METAL_LEVEL     = 2
- 
-diff -Naur documentation/alliance-examples/pgcd/README alliance-examples/pgcd/README
---- documentation/alliance-examples/pgcd/README	2004-07-28 13:00:06.000000000 +0200
-+++ alliance-examples/pgcd/README	2007-07-19 13:14:00.000000000 +0200
-@@ -15,5 +15,7 @@
- following each step of the design flow from VHDL up to real layout in a
-  pseudo 0.35 techno.
- 
--The environement variable ALLIANCE_TOP has to be set.
-+ 
-+copy the folder "pgcd" to any writable folder of your choice and type:
-+$ make
- 
-diff -Naur documentation/alliance-examples/sqrt32/Makefile alliance-examples/sqrt32/Makefile
---- documentation/alliance-examples/sqrt32/Makefile	2004-05-23 20:49:27.000000000 +0200
-+++ alliance-examples/sqrt32/Makefile	2007-07-19 13:14:00.000000000 +0200
-@@ -16,7 +16,9 @@
- # |                                                             |
- # \------------------------------------------------------------*/
- 
- ALLIANCE_BIN=$(ALLIANCE_TOP)/bin
-+ 
-+ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples
- 
- VASY   = $(ALLIANCE_BIN)/vasy
- ASIMUT = $(ALLIANCE_BIN)/asimut
-@@ -39,8 +41,8 @@
- TOUCH  = touch
- 
- TARGET_LIB      = $(ALLIANCE_TOP)/cells/sxlib
--RDS_TECHNO_SYMB = ../etc/techno-symb.rds
--RDS_TECHNO      = ../etc/techno-035.rds
-+RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds
-+RDS_TECHNO      = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds
- SPI_MODEL       = $(ALLIANCE_TOP)/etc/spimodel.cfg
- METAL_LEVEL     = 5
- 
-diff -Naur documentation/alliance-examples/sqrt32/README alliance-examples/sqrt32/README
---- documentation/alliance-examples/sqrt32/README	2004-07-28 13:00:06.000000000 +0200
-+++ alliance-examples/sqrt32/README	2007-07-19 13:14:00.000000000 +0200
-@@ -14,4 +14,6 @@
- following each step of the design flow from VHDL up to real layout in a
-  pseudo 0.35 techno.
- 
--The environement variable ALLIANCE_TOP has to be set.
-+ 
-+copy the folder "sqrt32" to any writable folder of your choice and type:
-+$ make
-diff -Naur documentation/alliance-examples/sqrt8/Makefile alliance-examples/sqrt8/Makefile
---- documentation/alliance-examples/sqrt8/Makefile	2004-05-23 20:51:00.000000000 +0200
-+++ alliance-examples/sqrt8/Makefile	2007-07-19 16:20:40.000000000 +0200
-@@ -16,7 +16,9 @@
- # |                                                             |
- # \------------------------------------------------------------*/
- 
- ALLIANCE_BIN=$(ALLIANCE_TOP)/bin
-+ 
-+ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples
- 
- VASY   = $(ALLIANCE_BIN)/vasy
- ASIMUT = $(ALLIANCE_BIN)/asimut
-@@ -39,14 +41,14 @@
- TOUCH  = touch
- 
- TARGET_LIB      = $(ALLIANCE_TOP)/cells/sxlib
--RDS_TECHNO_SYMB = ../etc/techno-symb.rds
--RDS_TECHNO      = ../etc/techno-035.rds
-+RDS_TECHNO_SYMB = $(ALLIANCE_EXAMPLES)/etc/techno-symb.rds
-+RDS_TECHNO      = $(ALLIANCE_EXAMPLES)/etc/techno-035.rds
- SPI_MODEL       = $(ALLIANCE_TOP)/etc/spimodel.cfg
- METAL_LEVEL     = 5
- 
- # /*------------------------------------------------------------\
- # |                                                             |
--# |                            Environement                     |
-+# |                            Environment                     |
- # |                                                             |
- # \------------------------------------------------------------*/
- 
-@@ -161,9 +163,9 @@
- # \------------------------------------------------------------*/
- 
- res_vasy_1.pat : sqrt8.vst sm.vbe sqrt8_model.vbe
--	$(ENV_ASIMUT_VASY); $(ASIMUT) sqrt8 sqrt8 res_vasy_1 
-+	$(ENV_ASIMUT_VASY); $(ASIMUT) sqrt8 sqrt8 res_vasy_1
- 
--res_synth_1.pat : sqrt8.vst sm.vst sqrt8_model.vst 
-+res_synth_1.pat : sqrt8.vst sm.vst sqrt8_model.vst
- 	$(ENV_ASIMUT_SYNTH); $(ASIMUT) sqrt8 sqrt8 res_synth_1
- 
- 
-@@ -257,7 +259,7 @@
- # |                                                             |
- # \------------------------------------------------------------*/
- 
--lvx.done : sqrt8.vst sqrt8_e.al 
-+lvx.done : sqrt8.vst sqrt8_e.al
- 	$(ENV_LVX); $(LVX) vst al sqrt8 sqrt8_e -f
- 	$(TOUCH) lvx.done
- 
-@@ -313,4 +315,4 @@
- 	$(RM) -f *.vst *.vbe *.boom *.done *.xsc *.al *.ap *.gpl *.gds \
- 	      *.log *.drc *.cif *.fin *.dat *.out sqrt8_e.spi res_synth_1.pat \
- 	      res_vasy_1.pat
--	
-+
-
diff --git a/alliance-perms.patch b/alliance-perms.patch
deleted file mode 100644
index 32aa5cc..0000000
--- a/alliance-perms.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure	2006-05-09 12:10:10.000000000 +0200
-+++ configure_mod	2007-07-17 02:24:57.000000000 +0200
-@@ -26054,9 +26054,9 @@
- 
- 
- 
--INSTALL_DATA='${INSTALL} -m 664'
-+INSTALL_DATA='${INSTALL} -m 644'
- 
--INSTALL_PROGRAM='${INSTALL} -m 775'
-+INSTALL_PROGRAM='${INSTALL} -m 755'
- 
- 
- cat >>confdefs.h <<_ACEOF
diff --git a/alliance-run.patch b/alliance-run.patch
deleted file mode 100644
index 32e2009..0000000
--- a/alliance-run.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur documentation/alliance-run/amd2901_core.ioc alliance-run/amd2901_core.ioc
---- documentation/alliance-run/amd2901_core.ioc	2003-10-09 14:31:00.000000000 +0200
-+++ alliance-run/amd2901_core.ioc	2007-07-13 15:42:11.000000000 +0200
-@@ -1,4 +1,3 @@
--#      Copyright (c) 1997 by Cadence. All rights reserved.      
- ###################################################################
- # In each of TOP()/BOTTOM()/LEFT()/RIGHT() section, there are     #
- # placed IOs. In the IGNORE() section, the IOs are ignored        #
-diff -Naur documentation/alliance-run/Makefile alliance-run/Makefile
---- documentation/alliance-run/Makefile	2003-12-01 14:07:11.000000000 +0100
-+++ alliance-run/Makefile	2007-07-13 15:37:37.000000000 +0200
-@@ -12,7 +12,9 @@
-  STANDART_PATH = PATH=$(STANDART_BIN); export PATH
- 
- # Standart Alliance binary access paths.
-  ALLIANCE_BIN  = $(ALLIANCE_TOP)/bin
-+ 
-+ALLIANCE_EXAMPLES=/usr/share/doc/alliance-doc-5.0/alliance-examples
- 
- # --------------------------------------------------------------------
- # Standarts binaries.
diff --git a/alliance-tutorials-amd2901.patch b/alliance-tutorials-amd2901.patch
deleted file mode 100644
index 2cf6a4f..0000000
--- a/alliance-tutorials-amd2901.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur documentation/tutorials/synthesis/src/amd2901/Makefile tutorials/synthesis/src/amd2901/Makefile
---- documentation/tutorials/synthesis/src/amd2901/Makefile	2002-07-25 14:50:18.000000000 +0200
-+++ tutorials/synthesis/src/amd2901/Makefile	2007-07-18 19:34:53.000000000 +0200
-@@ -2,17 +2,17 @@
- all: EXAMPLE VAR  CATAL02 res.pat
- 
- 
--VAR: 
-+VAR:
- 	MBK_IN_LO=vst;export MBK_IN_LO ;\
--	MBK_CATA_LIB=/asim/alliance/cells/sxlib;export MBK_CATA_LIB
-+	MBK_CATA_LIB=$ALLIANCE_TOP/cells/sxlib;export MBK_CATA_LIB
- 
- CATAL01:
--	echo amd2901_ctl C >CATAL  
-+	echo amd2901_ctl C >CATAL
- 	echo amd2901_dpt C >>CATAL
- 
- CATAL02:
- 	echo amd2901_dpt C >CATAL
--	
-+
- EXAMPLE:
- 	genlib circuit
- 
-@@ -38,7 +38,7 @@
- 
- res2.pat: amd2901_chip.vst pattern.pat amd2901_core.vst CATAL
- 	asimut amd2901_chip pattern res2
--	touch amd2901_chip.vst 
-+	touch amd2901_chip.vst
- 
- clean :
- 	rm -f Makefile-*                 \
-
diff --git a/alliance-tutorials-place_n_route.patch b/alliance-tutorials-place_n_route.patch
deleted file mode 100644
index 9ad6eab..0000000
--- a/alliance-tutorials-place_n_route.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur alliance-5.0/documentation/tutorials/place_and_route/src/amd2901/amd2901_chip.c test-64/tutorials/place_and_route/src/amd2901/amd2901_chip.c
---- alliance-5.0/documentation/tutorials/place_and_route/src/amd2901/amd2901_chip.c	2002-07-25 14:50:19.000000000 +0200
-+++ test-64/tutorials/place_and_route/src/amd2901/amd2901_chip.c	2009-06-14 02:27:03.000000000 +0200
-@@ -1,5 +1,5 @@
- #include <genlib.h>
--#define POWER "vdde","vdd","vsse","vss",0
-+#define POWER "vdde","vdd","vsse","vss",NULL
- 
- int main ()
-  {
-@@ -78,7 +78,7 @@
- 
- 	"vdd => vdd",
- 	"vss => vss",
--	0);
-+	NULL);
- 
-   GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER);
- 
-@@ -119,13 +119,13 @@
-   GENLIB_LOINS ("piot_sp","p_r3",
- 	"ram_o_up","sh_left","ram_i_up","r3","cki", POWER );
- 
--  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",0);
--  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",0);
-+  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
-+  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
- 
--  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",0);
--  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",0);
--  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",0);
--  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",0);
-+  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
-+  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
-+  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
-+  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
- 
-   GENLIB_SAVE_LOFIG();
- 
diff --git a/alliance-tutorials-simulation.patch b/alliance-tutorials-simulation.patch
deleted file mode 100644
index 5d7daae..0000000
--- a/alliance-tutorials-simulation.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur alliance-5.0/documentation/tutorials/simulation/tex/simulation.tex test-64/tutorials/simulation/tex/simulation.tex
---- alliance-5.0/documentation/tutorials/simulation/tex/simulation.tex	2004-10-16 14:52:05.000000000 +0200
-+++ test-64/tutorials/simulation/tex/simulation.tex	2009-07-04 12:18:54.867711418 +0200
-@@ -171,7 +162,7 @@
-         }
- 
- All the files used in this part are located in the \\ 
--\texttt{/tutorial/simulation/src} directory.\\
-+\texttt{/usr/share/doc/alliance-doc-5.0/tutorial/simulation/src} directory.\\
- This directory contains two subdirectories and one Makefile : 
- \begin{itemize}
- \item The Makefile allows you to validate automatically the entire simulation part
-@@ -626,13 +617,13 @@
- \bf SXLIB }. For the functionality of the various cells and their
- interface, the sxlib man is available. The behavioral
- description of each cell is present in \\
--{\bf /alliance/cells/sxlib }.
-+{\bf \$ALLIANCE\_TOP/cells/sxlib }.
- 
- You must set the environment variable { \bf MBK\_CATA\_LIB }
- to be able to reach these cells.
- 
- \begin{commandline}
-- > MBK_CATA_LIB=/alliance/cells/sxlib
-+ > MBK_CATA_LIB=\$ALLIANCE\_TOP/cells/sxlib
-  > export MBK_CATA_LIB
- \end{commandline}
- 
diff --git a/alliance-tutorials-start.patch b/alliance-tutorials-start.patch
deleted file mode 100644
index a2a6344..0000000
--- a/alliance-tutorials-start.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur alliance-5.0/documentation/tutorials/start/start.tex test-64/tutorials/start/start.tex
---- alliance-5.0/documentation/tutorials/start/start.tex	2004-10-16 14:52:13.000000000 +0200
-+++ test-64/tutorials/start/start.tex	2009-07-04 12:17:35.389714653 +0200
-@@ -116,13 +116,13 @@
- try to run the following command :
- 
- \begin{phraseverbatim}
--~alp/addaccu %-) source /alliance/etc/alc_env.csh
-+~alp/addaccu %-) source /etc/profile.d/alc_env.csh
- \end{phraseverbatim}
- 
- Otherwise, if you run a \texttt{sh-like} shell, try to run the following 
- command :
- \begin{phraseverbatim}
--~alp/addaccu %-) source /alliance/alc_env.sh
-+~alp/addaccu %-) source /etc/profile.d/alc_env.sh
- \end{phraseverbatim}
- \\
- Before we proceed to the tutorial, you must make sure that the
-@@ -151,13 +151,13 @@
- MBK_CATAL_NAME=CATAL
- MBK_SCALE_X=100
- MBK_VSS=vss
--MBK_CATA_LIB=.:/alliance/cells/sxlib:/alliance/cells/padlib
-+MBK_CATA_LIB=.:\$ALLIANCE\_TOP/cells/sxlib:\$ALLIANCE\_TOP/cells/padlib
- MBK_WORK_LIB=.
- MBK_VDD=vdd
- MBK_C4_LIB=./cellsC4
- MBK_IN_LO=vst
- MBK_IN_PH=ap
--MBK_TARGET_LIB=/alliance/cells/sxlib
-+MBK_TARGET_LIB=\$ALLIANCE\_TOP/cells/sxlib
- MBK_OUT_LO=vst
- \end{framedverbatim}
- \caption{\label{mbk} \texttt{MBK} environment variables.}
diff --git a/alliance-tutorials-synthesis.patch b/alliance-tutorials-synthesis.patch
deleted file mode 100644
index d6702b9..0000000
--- a/alliance-tutorials-synthesis.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur alliance-5.0/documentation/tutorials/synthesis/src/amd2901/amd2901_chip.c test-64/tutorials/synthesis/src/amd2901/amd2901_chip.c
---- alliance-5.0/documentation/tutorials/synthesis/src/amd2901/amd2901_chip.c	2002-07-25 14:50:18.000000000 +0200
-+++ test-64/tutorials/synthesis/src/amd2901/amd2901_chip.c	2009-06-14 00:31:18.000000000 +0200
-@@ -78,7 +78,7 @@
- 
- 	"vdd => vdd",
- 	"vss => vss",
--	0);
-+	NULL);
- 
-   GENLIB_LOINS("pck_sp","p_ck","ck","cki", POWER);
- 
-@@ -119,13 +119,13 @@
-   GENLIB_LOINS ("piot_sp","p_r3",
- 	"ram_o_up","sh_left","ram_i_up","r3","cki", POWER );
- 
--  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",0);
--  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",0);
-+  GENLIB_LOINS("pvddick_sp","p_vddick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
-+  GENLIB_LOINS("pvssick_sp","p_vssick0","ckc","cki","vdde","vdd","vsse","vss",NULL);
- 
--  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",0);
--  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",0);
--  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",0);
--  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",0);
-+  GENLIB_LOINS("pvddeck_sp","p_vddeck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
-+  GENLIB_LOINS("pvddeck_sp","p_vddeck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
-+  GENLIB_LOINS("pvsseck_sp","p_vsseck0","ckc","cki","vdde","vdd","vsse","vss",NULL);
-+  GENLIB_LOINS("pvsseck_sp","p_vsseck1","ckc","cki","vdde","vdd","vsse","vss",NULL);
- 
-   GENLIB_SAVE_LOFIG();
- 
-diff -Naur alliance-5.0/documentation/tutorials/synthesis/tex/synthesis.tex test-64/tutorials/synthesis/tex/synthesis.tex
---- alliance-5.0/documentation/tutorials/synthesis/tex/synthesis.tex	2004-10-16 14:52:17.000000000 +0200
-+++ test-64/tutorials/synthesis/tex/synthesis.tex	2009-07-04 12:26:03.345711622 +0200
-@@ -220,7 +211,7 @@
-         }
- 
- All the files used in this part are located under \\
--\texttt{/tutorial/synthesis/src} directory.\\
-+\texttt{/usr/share/doc/alliance-doc-5.0/tutorials/synthesis/src} directory.\\
- This directory contents four subdirectories and one Makefile :
- \begin{itemize}\itemsep=-.8ex
- 
-
diff --git a/alliance-xgra-xgrerror-ld.patch b/alliance-xgra-xgrerror-ld.patch
deleted file mode 100644
index 48dc20a..0000000
--- a/alliance-xgra-xgrerror-ld.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- xgra/src/XGR_error.c	2007-11-27 21:41:32.000000000 +0100
-+++ XGR_error.c	2009-08-28 07:53:58.546631214 +0200
-@@ -270,7 +270,7 @@
- 
-   if ( XgraFigureGra != (autgraph *)NULL )
-   {
--    sprintf( Scan, "  FIGURE : %s\n\n  NODES : %d\n  ARCS : %d\n\n",
-+    sprintf( Scan, "  FIGURE : %s\n\n  NODES : %ld\n  ARCS : %ld\n\n",
-         XgraFigure->NAME,
-         XgraFigureGra->NUMBER_NODE,
-         XgraFigureGra->NUMBER_ARC );
-@@ -282,7 +282,7 @@
- 
-   Scan = Scan + strlen( Scan );
- 
--  sprintf( Scan, "  BOUNDING BOX : \n\n  XMIN : %d\n  YMIN : %d\n  XMAX : %d\n  YMAX : %d\n\n",
-+  sprintf( Scan, "  BOUNDING BOX : \n\n  XMIN : %ld\n  YMIN : %ld\n  XMAX : %ld\n  YMAX : %ld\n\n",
-            XgraBoundXmin / XGRA_UNIT, XgraBoundYmin / XGRA_UNIT,
-            XgraBoundXmax / XGRA_UNIT, XgraBoundYmax / XGRA_UNIT );
- 
diff --git a/alliance-xgra.patch b/alliance-xgra.patch
deleted file mode 100644
index 89bddda..0000000
--- a/alliance-xgra.patch
+++ /dev/null
@@ -1,147 +0,0 @@
---- /home/chitlesh/rpmbuild/BUILD/alliance-5.0/xgra/Makefile.am	2009-08-28 07:20:46.993629321 +0200
-+++ src/xgra/Makefile.am	2009-08-28 07:26:58.090631633 +0200
-@@ -1 +1,143 @@
--SUBDIRS = src etc
-+bin_PROGRAMS = \
-+	xgra
-+
-+xgra_CPPFLAGS = \
-+	$(GLIB_CFLAGS) \
-+	-DG_LOG_DOMAIN=\"xgra\" \
-+	$(MOTIF_CFLAGS) \
-+	-DXGRA_DEFAULT_PARAM_NAME=\"${sysconfdir}/xgra.par\" \
-+	-DXMS_FILE_NAME=\".xgra.cfg\" \
-+	-I$(top_srcdir)/mbk/src \
-+	-I$(top_srcdir)/aut/src
-+
-+xgra_SOURCES = \
-+	xgra.c \
-+	xgra.h \
-+	XGR_bound.c \
-+	XGR_bound.h \
-+	XGR_error.c \
-+	XGR_error.h \
-+	XGR_graph.c \
-+	XGR_graph.h \
-+	XGR_object.c \
-+	XGR_object.h \
-+	XGR_place.c \
-+	XGR_place.h \
-+	XGR_select.c \
-+	XGR_select.h \
-+	XGR.h \
-+	XME_dialog.c \
-+	XME_dialog.h \
-+	XME_edit.c \
-+	XME_edit.h \
-+	XME.h \
-+	XME_menu.c \
-+	XME_menu.h \
-+	XME_message.c \
-+	XME_message.h \
-+	XME_panel.c \
-+	XME_panel.h \
-+	XME_search.c \
-+	XME_search.h \
-+	XME_select.c \
-+	XME_select.h \
-+	XMF_dialog.c \
-+	XMF_dialog.h \
-+	XMF_file.c \
-+	XMF_file.h \
-+	XMF.h \
-+	XMF_menu.c \
-+	XMF_menu.h \
-+	XMF_panel.c \
-+	XMF_panel.h \
-+	XMH.h \
-+	XMH_help.c \
-+	XMH_help.h \
-+	XMH_menu.c \
-+	XMH_menu.h \
-+	XMH_panel.c \
-+	XMH_panel.h \
-+	XMS_dialog.c \
-+	XMS_dialog.h \
-+	XMS.h \
-+	XMS_menu.c \
-+	XMS_menu.h \
-+	XMS_panel.c \
-+	XMS_panel.h \
-+	XMS_setup.c \
-+	XMS_setup.h \
-+	XMT_dialog.c \
-+	XMT_dialog.h \
-+	XMT.h \
-+	XMT_menu.c \
-+	XMT_menu.h \
-+	XMT_message.c \
-+	XMT_message.h \
-+	XMT_panel.c \
-+	XMT_panel.h \
-+	XMT_tools.c \
-+	XMT_tools.h \
-+	XMV_dialog.c \
-+	XMV_dialog.h \
-+	XMV.h \
-+	XMV_map.c \
-+	XMV_map.h \
-+	XMV_menu.c \
-+	XMV_menu.h \
-+	XMV_message.c \
-+	XMV_message.h \
-+	XMV_panel.c \
-+	XMV_panel.h \
-+	XMV_view.c \
-+	XMV_view.h \
-+	XMX_color.c \
-+	XMX_color.h \
-+	XMX_cursor.c \
-+	XMX_cursor.h \
-+	XMX_dialog.c \
-+	XMX_dialog.h \
-+	XMX_event.c \
-+	XMX_event.h \
-+	XMX_graphic.c \
-+	XMX_graphic.h \
-+	XMX_grid.c \
-+	XMX_grid.h \
-+	XMX.h \
-+	XMX_icon.c \
-+	XMX_icon.h \
-+	XMX_menu.c \
-+	XMX_menu.h \
-+	XMX_message.c \
-+	XMX_message.h \
-+	XMX_motif.c \
-+	XMX_motif.h \
-+	XMX_panel.c \
-+	XMX_panel.h \
-+	XMX_view.c \
-+	XMX_view.h \
-+	XSB_error.c \
-+	XSB_error.h \
-+	XSB.h \
-+	XSB_parse.c \
-+	XSB_parse.h \
-+	XSB_share.c \
-+	XSB_share.h \
-+	XTB_cursor.c \
-+	XTB_cursor.h \
-+	XTB_dialog.c \
-+	XTB_dialog.h \
-+	XTB.h \
-+	XTB_icon.c \
-+	XTB_icon.h \
-+	XTB_menu.c \
-+	XTB_menu.h \
-+	XTB_panel.c \
-+	XTB_panel.h \
-+	XTB_pixmap.c \
-+	XTB_pixmap.h
-+
-+xgra_LDADD = \
-+	$(GLIB_CFLAGS) \
-+	$(MOTIF_LIBS) \
-+	$(top_builddir)/src/aut/libAut.la \
-+	$(top_builddir)/src/mbk/libMut.la
diff --git a/alliance.spec b/alliance.spec
index 546597c..bccda9f 100644
--- a/alliance.spec
+++ b/alliance.spec
@@ -1,10 +1,10 @@
 %define        prefix    %{_libdir}/%{name}
-%define        snapshot  20090827
+%define        snapshot  20090901
 %define        _default_patch_fuzz  2
 
 Name:          alliance
 Version:       5.0
-Release:       30.%{snapshot}snap%{?dist}
+Release:       31.%{snapshot}snap%{?dist}
 Summary:       VLSI EDA System
 
 License:       GPLv2
@@ -13,51 +13,16 @@ Group:         Applications/Engineering
 Source:        http://www-asim.lip6.fr/pub/alliance/distribution/5.0/%{name}-%{version}-%{snapshot}.tar.gz
 URL:           http://www-asim.lip6.fr/recherche/alliance/
 
-Patch0:        alliance-env.patch
-Patch1:        alliance-run.patch
-Patch2:        alliance-perms.patch
 
-# Improving autogeneration of documentation
-Patch3:        alliance-tutorials-place_n_route.patch
-Patch4:        alliance-tutorials-simulation.patch
-Patch5:        alliance-tutorials-start.patch
-Patch6:        alliance-tutorials-synthesis.patch
-Patch7:        alliance-tutorials-amd2901.patch
-
-# Improving examples
-Patch8:        alliance-examples.patch
-Patch9:        alliance-examples-adm2901.patch
-Patch10:       alliance-examples-mipsR3000.patch
-
-# upstream enhancements
-Patch11:       alliance-xgra.patch
-
-# Fixes warning: format '%%d' expects type 'int', but argument N has type 'long int'
-Patch12:       alliance-xgra-xgrerror-ld.patch
-
-Source1:       xsch.desktop
-Source2:       dreal.desktop
-Source3:       xpat.desktop
-Source4:       xfsm.desktop
-Source5:       xvpn.desktop
-Source6:       graal.desktop
-Source7:       xgra.desktop
-
-Source8:       alliance.fedora
+Source1:       alliance.fedora
 
 # Chitlesh's donated pictures to alliance
-Source9:       graal.png
-Source10:      dreal.png
-Source11:      xvpn.png
-Source12:      xfsm.png
-Source13:      xpat.png
-Source14:      xsch.png
-Source15:      xgra.png
-
-Source16:      alliance-tutorials-go-all.sh
-Source17:      alliance-tutorials-go-all-clean.sh
-Source18:      alliance-examples-go-all.sh
-Source19:      alliance-examples-go-all-clean.sh
+# 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
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libXt-devel byacc desktop-file-utils bison
@@ -72,7 +37,7 @@ BuildRequires: lesstif-devel
 %endif
 
 Requires:      xorg-x11-fonts-misc
-# 442379
+# RHBZ 442379
 Requires(post): %{name}-libs = %{version}-%{release}
 
 %description
@@ -137,31 +102,17 @@ Documentation and tutorials for the Alliance VLSI CAD Sytem.
 %setup -q
 %{__rm} -rf autom4te.cache
 
-%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} .
-sed -i "s|ALLIANCE_TOP|%{prefix}|" *.desktop
+%{__cp} -p %{SOURCE1} .
+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
 
-%patch11 -p1 -b .xgra-makefile.am
-%patch12 -p0 -b .xgra-long
-
-
-%patch0 -p0 -b .env
-%patch1 -p0 -b .run
-%patch2 -p0 -b .perms
-
-
 # ------------------------------------------------------------------------------
 # Description : 2008 March : TexLive introduction to Rawhide
 sed -i "s|tutorials||" documentation/Makefile.in
 sed -i "s|documentation/tutorials/Makefile||" configure*
-%patch3 -p1 -b .doc
-%patch4 -p1 -b .doc
-%patch5 -p1 -b .doc
-%patch6 -p1 -b .doc
-%patch7 -p0 -b .doc
 pushd documentation/tutorials
     # clean unneccessary files
     %{__rm} Makefile*
@@ -175,8 +126,8 @@ pushd documentation/tutorials
         %{__rm} -rf $folder
     done
     # Add automated scripts to tutorials
-    %{__install} -pm 755 %{SOURCE16} go-all.sh
-    %{__install} -pm 755 %{SOURCE17} go-all-clean.sh
+    %{__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
@@ -184,10 +135,6 @@ pushd documentation/tutorials
 popd
 # ------------------------------------------------------------------------------
 
-%patch8  -p0 -b .examples
-%patch9  -p1 -b .examples
-%patch10 -p1 -b .examples
-
 # 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
@@ -211,10 +158,14 @@ done
 sed -i 's/\r//' mipsR3000/asm/*
 popd
 
-# Fix xgra build 
-sed -i "s|AM_CFLAGS =|AM_CFLAGS = -I../../mbk/src -I../../aut/src/|g" xgra/src/Makefile*
-sed -i "s|xgra_LDADD =|xgra_LDADD = -L../../mbk/src -L../../aut/src/|g" xgra/src/Makefile*
-
+find documentation/tutorials/ \
+    -name *.vbe  -o \
+    -name *.pat  -o \
+    -name *.vhdl -o \
+    -name *.vst  -o \
+    -name *.c \
+    -exec chmod 0644 {} ';'
+    
 %build
 
 export ALLIANCE_TOP=%{prefix}
@@ -225,7 +176,7 @@ export ALLIANCE_TOP=%{prefix}
            --includedir=%{prefix}/include \
            --libdir=%{prefix}/lib         \
            --bindir=%{prefix}/bin         \
-           --mandir=%{_datadir}/%{name}/man         #252941
+           --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
@@ -244,7 +195,6 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 
 %{__make} INSTALL="install -p" DESTDIR=%{buildroot} install
 
-
 # Set execution rights on the alc_env.* batchs and adjust ALLIANCE_TOP.
 pushd %{buildroot}%{_sysconfdir}/profile.d
   chmod 0644 alc_env.*
@@ -262,8 +212,8 @@ popd
 %{__rm} -rf %{buildroot}%{prefix}/examples/
 
 # Add automated scripts to examples
-%{__install} -pm 755 %{SOURCE18} alliance-examples/go-all.sh
-%{__install} -pm 755 %{SOURCE19} alliance-examples/go-all-clean.sh
+%{__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
@@ -277,13 +227,13 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 # Adding icons for the menus
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
-%{__cp} -p %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} \
+%{__cp} -p distrib/*.png \
     %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 
 
 # desktop files with enhanced menu from electronics-menu now on Fedora
 # thanks Peter Brett
-for desktopfile in *.desktop; do
+for desktopfile in distrib/*.desktop; do
 desktop-file-install --vendor "" \
   --dir %{buildroot}%{_datadir}/applications/ \
   $desktopfile
@@ -327,6 +277,7 @@ sed -i "s|/bin/zsh|/bin/sh|" doc/alliance-run/bench.zsh
 %{_fixperms} %{buildroot}/*
 
 
+
 %post
 /sbin/ldconfig
 source %{_sysconfdir}/profile.d/alc_env.sh
@@ -349,8 +300,8 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %files
-%doc CHANGES LICENCE COPYING* FAQ alliance.fedora
 %defattr(-,root,root,-)
+%doc CHANGES LICENCE COPYING* FAQ alliance.fedora
 %{prefix}/
 %{_datadir}/%{name}/
 %{_datadir}/icons/hicolor/48x48/apps/*
@@ -381,6 +332,10 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %changelog
+* Wed Sep 02 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-31.20090901snap
+- updated to upstream's 20090901 snapshot
+- Removed all patches which are accepted by upstream
+
 * Thu Aug 27 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-30.20090827snap
 - updated to upstream's 20090828 snapshot
 - merged patches with upstream's snapshot: 64 bits stability patches and upstream enhancements
diff --git a/dreal.desktop b/dreal.desktop
deleted file mode 100644
index 73d12f0..0000000
--- a/dreal.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Alliance: Layout Viewer
-Exec=ALLIANCE_TOP/bin/dreal
-Icon=dreal.png
-Type=Application
-Terminal=false
-GenericName=dreal
-Categories=Electronics;Engineering;
-Comment=View the Real layout
diff --git a/dreal.png b/dreal.png
deleted file mode 100644
index 50e608a..0000000
Binary files a/dreal.png and /dev/null differ
diff --git a/graal.desktop b/graal.desktop
deleted file mode 100644
index 8dd4c6c..0000000
--- a/graal.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Alliance: Layout Editor
-Exec=ALLIANCE_TOP/bin/graal
-Icon=graal.png
-Type=Application
-Terminal=false
-GenericName=graal
-Categories=Electronics;Engineering;
-Comment=Edits physical layouts
diff --git a/graal.png b/graal.png
deleted file mode 100644
index fdd2a03..0000000
Binary files a/graal.png and /dev/null differ
diff --git a/import.log b/import.log
index 7ab6c7a..5cee237 100644
--- a/import.log
+++ b/import.log
@@ -2,3 +2,4 @@ alliance-5_0-21_20070718snap_fc9:HEAD:alliance-5.0-21.20070718snap.fc9.src.rpm:1
 alliance-5_0-24_20070718snap_fc10:HEAD:alliance-5.0-24.20070718snap.fc10.src.rpm:1233516213
 alliance-5_0-26_20070718snap_fc10:HEAD:alliance-5.0-26.20070718snap.fc10.src.rpm:1235508896
 alliance-5_0-30_20090827snap_fc11:F-11:alliance-5.0-30.20090827snap.fc11.src.rpm:1251455305
+alliance-5_0-31_20090901snap_fc11:F-11:alliance-5.0-31.20090901snap.fc11.src.rpm:1251954952
diff --git a/sources b/sources
index 21938b3..9af8cf1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8591c98de3f24a76e81b5ecb4cf60f7d  alliance-5.0-20090827.tar.gz
+f3b692c4ea9e54c040280f660b3cf170  alliance-5.0-20090901.tar.gz
diff --git a/xfsm.desktop b/xfsm.desktop
deleted file mode 100644
index 6dd425c..0000000
--- a/xfsm.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Alliance: FSM Viewer
-Exec=ALLIANCE_TOP/bin/xfsm
-Icon=xfsm.png
-Type=Application
-Terminal=false
-GenericName=xfsm
-Categories=Electronics;Engineering;
-Comment=View Finite State Machines
diff --git a/xfsm.png b/xfsm.png
deleted file mode 100644
index 414f153..0000000
Binary files a/xfsm.png and /dev/null differ
diff --git a/xgra.desktop b/xgra.desktop
deleted file mode 100644
index 6aedfb2..0000000
--- a/xgra.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Alliance: Graphic Graph Viewer
-Exec=ALLIANCE_TOP/bin/xgra
-Icon=xgra.png
-Type=Application
-Terminal=false
-GenericName=xpvn
-Categories=Electronics;Engineering;
-Comment=View the graphic graph
diff --git a/xgra.png b/xgra.png
deleted file mode 100644
index 3957935..0000000
Binary files a/xgra.png and /dev/null differ
diff --git a/xpat.desktop b/xpat.desktop
deleted file mode 100644
index c9f0375..0000000
--- a/xpat.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Alliance: Patterns Viewer
-Exec=ALLIANCE_TOP/bin/xpat
-Icon=xpat.png
-Type=Application
-Terminal=false
-GenericName=xpat
-Categories=Electronics;Engineering;
-Comment=View the Patterns
diff --git a/xpat.png b/xpat.png
deleted file mode 100644
index 3957935..0000000
Binary files a/xpat.png and /dev/null differ
diff --git a/xsch.desktop b/xsch.desktop
deleted file mode 100644
index 316f877..0000000
--- a/xsch.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Alliance: Schematic Viewer
-Exec=ALLIANCE_TOP/bin/xsch
-Icon=xsch.png
-Type=Application
-Terminal=false
-GenericName=Xsch
-Categories=Electronics;Engineering;
-Comment=View the Schematic
diff --git a/xsch.png b/xsch.png
deleted file mode 100644
index fc180e3..0000000
Binary files a/xsch.png and /dev/null differ
diff --git a/xvpn.desktop b/xvpn.desktop
deleted file mode 100644
index a6f870b..0000000
--- a/xvpn.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Alliance: Petri Nets Viewer
-Exec=ALLIANCE_TOP/bin/xvpn
-Icon=xvpn.png
-Type=Application
-Terminal=false
-GenericName=xpvn
-Categories=Electronics;Engineering;
-Comment=View the Petri Nets
diff --git a/xvpn.png b/xvpn.png
deleted file mode 100644
index 30c25db..0000000
Binary files a/xvpn.png and /dev/null differ