rpms/alliance/devel alliance-env.patch, 1.2, 1.3 alliance.spec, 1.9, 1.10
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Mon May 26 21:05:37 UTC 2008
Author: chitlesh
Update of /cvs/pkgs/rpms/alliance/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21506/devel
Modified Files:
alliance-env.patch alliance.spec
Log Message:
bugfix
alliance-env.patch:
Index: alliance-env.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/alliance-env.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alliance-env.patch 23 Aug 2007 12:16:54 -0000 1.2
+++ alliance-env.patch 26 May 2008 21:04:55 -0000 1.3
@@ -1,131 +1,64 @@
-diff -Naur distrib/etc/alc_env.csh.in etc/alc_env.csh.in
---- distrib/etc/alc_env.csh.in 2006-10-05 12:09:24.000000000 +0200
-+++ etc/alc_env.csh.in 2007-08-18 13:48:55.000000000 +0200
-@@ -1,4 +1,4 @@
--# -*- Mode: Shell-script -*-
-+# -*- Mode: Shell-script -*-
- # -*- vim: set filetype=csh: -*-
- # ,,,
- # (o o)
-@@ -28,17 +28,17 @@
- setenv MBK_OUT_LO vst
- setenv MBK_IN_PH ap
- setenv MBK_OUT_PH ap
--
-+
- setenv MBK_WORK_LIB .
- setenv MBK_CATAL_NAME CATAL
--
-+
- setenv MBK_SCALE_X 100
--
-+
- setenv VH_MAXERR 10
- setenv VH_BEHSFX vbe
- setenv VH_PATSFX pat
- setenv VH_DLYSFX dly
--
-+
- setenv MBK_CATA_LIB ".:${ALLIANCE_TOP}/cells/sxlib"
- setenv MBK_CATA_LIB "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/dp_sxlib"
- setenv MBK_CATA_LIB "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/rflib"
-@@ -48,42 +48,29 @@
- setenv MBK_CATA_LIB "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/pxlib"
- setenv MBK_CATA_LIB "${MBK_CATA_LIB}:${ALLIANCE_TOP}/cells/padlib"
- setenv MBK_TARGET_LIB "${ALLIANCE_TOP}/cells/sxlib"
-- setenv MBK_C4_LIB ./cellsC4
--
-+ setenv MBK_C4_LIB ./cellsC4
-+
- setenv MBK_VDD vdd
- setenv MBK_VSS vss
--
-+
- setenv XPAT_PARAM_NAME "${ALLIANCE_TOP}/etc/xpat.par"
- setenv XFSM_PARAM_NAME "${ALLIANCE_TOP}/etc/xfsm.par"
- setenv XSCH_PARAM_NAME "${ALLIANCE_TOP}/etc/xsch.par"
--
-+
- setenv RDS_IN cif
- setenv RDS_OUT cif
--
-+
- setenv DREAL_TECHNO_NAME "${ALLIANCE_TOP}/etc/cmos.dreal"
- setenv GRAAL_TECHNO_NAME "${ALLIANCE_TOP}/etc/cmos.graal"
- setenv GENVIEW_TECHNO_NAME "${ALLIANCE_TOP}/etc/cmos.genview"
--
-+
- setenv RDS_TECHNO_NAME "${ALLIANCE_TOP}/etc/cmos.rds"
- setenv ELP_TECHNO_NAME "${ALLIANCE_TOP}/etc/prol.elp"
-
-
+--- distrib/etc/alc_env.csh.in 2006-10-05 12:09:25.000000000 +0200
++++ etc/alc_env.csh.in 2008-05-26 22:37:15.000000000 +0200
+@@ -70,20 +70,23 @@
+
# System environment variables.
-- if ( $?PATH ) then
+ if ( $?PATH ) then
- setenv PATH "${ALLIANCE_TOP}/bin:$PATH"
-- else
-- setenv PATH "${ALLIANCE_TOP}/bin"
-- endif
--
--# Only needed on Solaris (included in /etc/ld.so.conf under Linux).
-- if ( $?LD_LIBRARY_PATH ) then
++ setenv PATH "$PATH:${ALLIANCE_TOP}/bin:"
+ else
+ setenv PATH "${ALLIANCE_TOP}/bin"
+ endif
+
+ # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
+ if ( $?LD_LIBRARY_PATH ) then
- setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:$LD_LIBRARY_PATH"
-- else
-- setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib"
-- endif
--
++ setenv LD_LIBRARY_PATH "$LD_LIBRARY_PATH:${ALLIANCE_TOP}/lib:"
+ else
+ setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib"
+ endif
+
- if ( $?MANPATH ) then
- setenv MANPATH "${ALLIANCE_TOP}/man:${MANPATH}"
-- else
-- setenv MANPATH "${ALLIANCE_TOP}/man"
-- endif
-+ setenv PATH "${PATH}:${ALLIANCE_TOP}/bin"
++ if ($?MANPATH) then
+ setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man"
+ else
+- setenv MANPATH "${ALLIANCE_TOP}/man"
++ setenv MANPATH "${ALLIANCE_TOP}/man"
+ endif
+
+# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
+ setenv MBK_SPI_MODEL "${ALLIANCE_TOP}/etc/spimodel.cfg"
-diff -Naur distrib/etc/alc_env.sh.in etc/alc_env.sh.in
---- distrib/etc/alc_env.sh.in 2006-10-05 12:09:24.000000000 +0200
-+++ etc/alc_env.sh.in 2007-08-18 13:47:04.000000000 +0200
-@@ -1,4 +1,4 @@
--# -*- Mode: Shell-script -*-
-+# -*- Mode: Shell-script -*-
- # -*- vim: set filetype=sh: -*-
- # ,,,
- # (o o)
-@@ -24,7 +24,7 @@
-
- # Alliance environment variables.
- MBK_IN_LO=vst; export MBK_IN_LO
-- MBK_OUT_LO=vst; export MBK_OUT_LO
-+ MBK_OUT_LO=vst; export MBK_OUT_LO
- MBK_IN_PH=ap; export MBK_IN_PH
- MBK_OUT_PH=ap; export MBK_OUT_PH
-
-@@ -70,20 +70,8 @@
-
-
+--- distrib/etc/alc_env.sh.in 2006-10-05 12:09:25.000000000 +0200
++++ etc/alc_env.sh.in 2008-05-26 22:41:30.000000000 +0200
+@@ -70,20 +70,23 @@
+
+
# System environment variables.
- PATH=$ALLIANCE_TOP/bin:$PATH
-- export PATH
-+ export PATH=$PATH:$ALLIANCE_TOP/bin
-+ export MANPATH=$MANPATH:$ALLIANCE_TOP/man
-
--# Only needed on Solaris (included in /etc/ld.so.conf under Linux).
-- if [ -z "${LD_LIBRARY_PATH}" ]; then
-- LD_LIBRARY_PATH=$ALLIANCE_TOP/lib
-- else
++ PATH=$PATH:$ALLIANCE_TOP/bin:
+ export PATH
+
+ # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
+ if [ -z "${LD_LIBRARY_PATH}" ]; then
+ LD_LIBRARY_PATH=$ALLIANCE_TOP/lib
+ else
- LD_LIBRARY_PATH=$ALLIANCE_TOP/lib:$LD_LIBRARY_PATH
-- fi
-- export LD_LIBRARY_PATH
--
-- if [ -z "${MANPATH}" ]; then
-- MANPATH=$ALLIANCE_TOP/man
-- else
++ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib:
+ fi
+ export LD_LIBRARY_PATH
+
+ if [ -z "${MANPATH}" ]; then
+ MANPATH=$ALLIANCE_TOP/man
+ else
- MANPATH=$ALLIANCE_TOP/man:$MANPATH
-- fi
-- export MANPATH
++ MANPATH=$MANPATH:$ALLIANCE_TOP/man:
+ fi
+ export MANPATH
++
+# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
+ MBK_SPI_MODEL=$ALLIANCE_TOP/etc/spimodel.cfg; export MBK_SPI_MODEL
+
diff -Naur distrib/etc/Makefile.am etc/Makefile.am
--- distrib/etc/Makefile.am 2002-06-25 16:09:38.000000000 +0200
+++ etc/Makefile.am 2007-08-18 13:58:38.000000000 +0200
Index: alliance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/alliance.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- alliance.spec 26 May 2008 12:44:22 -0000 1.9
+++ alliance.spec 26 May 2008 21:04:55 -0000 1.10
@@ -3,7 +3,7 @@
Name: alliance
Version: 5.0
-Release: 14.%{snapshot}snap%{?dist}
+Release: 15.%{snapshot}snap%{?dist}
Summary: Alliance VLSI CAD Sytem
License: GPLv2
@@ -43,7 +43,8 @@
BuildRequires: transfig ghostscript
Requires: %{name}-libs = %{version}-%{release}
-
+# 442379
+Requires(post): %{name}-libs = %{version}-%{release}
%description
Alliance is a complete set of free CAD tools and portable libraries for
@@ -200,7 +201,7 @@
for desktopfile in *.desktop; do
desktop-file-install --vendor fedora \
--add-category Engineering \
- --add-category Electronics \
+ --add-category Electronics \
--remove-category Science \
--dir %{buildroot}%{_datadir}/applications/ \
$desktopfile
@@ -290,6 +291,10 @@
%changelog
+* Mon May 26 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-15.20070718snap
+- Bugfix: error in postinstall scriptlet: /etc/profile.d/alc_env.sh not found #442379
+- Bugfix: /etc/profile.d/alc_env.csh assumes MANPATH is preset #440083
+
* Tue May 20 2008 Thibault North < tnorth [AT] fedoraproject DOT org> - 5.0-14.20070718snap
- Add to Electronics Menu
More information about the scm-commits
mailing list