rpms/alliance/F-9 alliance-env.patch, 1.4, 1.5 alliance.spec, 1.12, 1.13 import.log, 1.1, 1.2

[Chitlesh GOORAH]

Author: chitlesh

Update of /cvs/pkgs/rpms/alliance/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2695/F-9

Modified Files:
	alliance-env.patch alliance.spec import.log 
Log Message:
bug fix 2

alliance-env.patch:

Index: alliance-env.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-9/alliance-env.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- alliance-env.patch	30 May 2008 17:38:18 -0000	1.4
+++ alliance-env.patch	15 Sep 2008 16:29:11 -0000	1.5
@@ -5,7 +5,7 @@
  # System environment variables.
   if ( $?PATH ) then
 -   setenv PATH "${ALLIANCE_TOP}/bin:$PATH"
-+   setenv PATH "${PATH}:${ALLIANCE_TOP}/bin:"
++   setenv PATH "${PATH}:${ALLIANCE_TOP}/bin"
   else
     setenv PATH "${ALLIANCE_TOP}/bin"
   endif
@@ -13,7 +13,7 @@
  # 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:"
++   setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib"
   else
     setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib"
   endif
@@ -24,7 +24,7 @@
 +  setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man"
   else
 -   setenv MANPATH "${ALLIANCE_TOP}/man"
-+  setenv MANPATH "${ALLIANCE_TOP}/man"
++  setenv MANPATH ":${ALLIANCE_TOP}/man"
   endif
 +
 +# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
@@ -36,7 +36,7 @@
 
  # System environment variables.
 - PATH=$ALLIANCE_TOP/bin:$PATH
-+ PATH=$PATH:$ALLIANCE_TOP/bin:
++ PATH=$PATH:$ALLIANCE_TOP/bin
   export PATH
 
  # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
@@ -44,15 +44,16 @@
     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:
++   LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib
   fi
   export LD_LIBRARY_PATH
 
   if [ -z "${MANPATH}" ]; then
-    MANPATH=$ALLIANCE_TOP/man
+-   MANPATH=$ALLIANCE_TOP/man
++   MANPATH=:$ALLIANCE_TOP/man
   else
 -   MANPATH=$ALLIANCE_TOP/man:$MANPATH
-+   MANPATH=$MANPATH:$ALLIANCE_TOP/man:
++   MANPATH=$MANPATH:$ALLIANCE_TOP/man
   fi
   export MANPATH
 +


Index: alliance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-9/alliance.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- alliance.spec	10 Aug 2008 07:19:33 -0000	1.12
+++ alliance.spec	15 Sep 2008 16:29:11 -0000	1.13
@@ -4,7 +4,7 @@
 
 Name:          alliance
 Version:       5.0
-Release:       20.%{snapshot}snap%{?dist}
+Release:       21.%{snapshot}snap%{?dist}
 Summary:       Alliance VLSI CAD Sytem
 
 License:       GPLv2
@@ -43,7 +43,7 @@
 BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4
 BuildRequires: transfig ghostscript
 
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 # 442379
 Requires(post): %{name}-libs = %{version}-%{release}
 
@@ -292,6 +292,10 @@
 
 
 %changelog
+* Mon Sep 15 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-21.20070718snap
+- Bugfix : Alliance incorrectly mungs your path and adds the cwd to the path #459336
+- Bugfix : Latest alc_env fixes broken system man path #452645
+
 * Mon Aug 04 2008 Aanjhan Ranganathan <aanjhan [AT] tuxmaniac DOT com> - 5.0-20.20070718snap
 - Bumped release version to match changelog
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Aug 2008 07:19:33 -0000	1.1
+++ import.log	15 Sep 2008 16:29:11 -0000	1.2
@@ -1 +1,2 @@
 alliance-5_0-20_20070718snap_fc10:F-9:alliance-5.0-20.20070718snap.fc10.src.rpm:1218332940
+alliance-5_0-21_20070718snap_fc9:F-9:alliance-5.0-21.20070718snap.fc9.src.rpm:1221496105