rpms/alliance/devel alliance-env.patch, NONE, 1.1 alliance.spec, 1.2, 1.3 dreal.desktop, 1.1, 1.2 graal.desktop, 1.1, 1.2 xfsm.desktop, 1.1, 1.2 xpat.desktop, 1.1, 1.2 xsch.desktop, 1.1, 1.2 xvpn.desktop, 1.1, 1.2 alliance-log3.patch, 1.1, NONE
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Sun Aug 19 15:14:01 UTC 2007
Author: chitlesh
Update of /cvs/extras/rpms/alliance/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10277/devel
Modified Files:
alliance.spec dreal.desktop graal.desktop xfsm.desktop
xpat.desktop xsch.desktop xvpn.desktop
Added Files:
alliance-env.patch
Removed Files:
alliance-log3.patch
Log Message:
alliance-env.patch:
--- NEW FILE alliance-env.patch ---
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"
# System environment variables.
- 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 LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:$LD_LIBRARY_PATH"
- 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"
+ setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man"
+
+# 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 @@
# 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
- LD_LIBRARY_PATH=$ALLIANCE_TOP/lib:$LD_LIBRARY_PATH
- fi
- export LD_LIBRARY_PATH
-
- if [ -z "${MANPATH}" ]; then
- MANPATH=$ALLIANCE_TOP/man
- else
- MANPATH=$ALLIANCE_TOP/man:$MANPATH
- 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
Index: alliance.spec
===================================================================
RCS file: /cvs/extras/rpms/alliance/devel/alliance.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alliance.spec 16 Aug 2007 12:19:36 -0000 1.2
+++ alliance.spec 19 Aug 2007 15:13:28 -0000 1.3
@@ -3,7 +3,7 @@
Name: alliance
Version: 5.0
-Release: 8.%{snapshot}snap%{?dist}
+Release: 9.%{snapshot}snap%{?dist}
Summary: Alliance VLSI CAD Sytem
License: GPLv2
@@ -12,11 +12,11 @@
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-examples.patch
Patch2: alliance-run.patch
Patch3: alliance-perms.patch
Patch4: alliance-tutorials.patch
-Patch5: alliance-log3.patch
Source1: xsch.desktop
Source2: dreal.desktop
@@ -87,23 +87,14 @@
%prep
%setup -q
-%{__cp} -p %{SOURCE7} .
-
-# using the formal %%{_sysconfdir} in favor of $${ALLIANCE_TOP}/etc
-sed -i "s|sysconfdir='\${prefix}/etc'|sysconfdir=%{_sysconfdir}/%{name}|" configure
-
-sed -i "s|\${ALLIANCE_TOP}/etc|%{_sysconfdir}/%{name}|" {xfsm,xvpn,xpat,xsch}/src/Makefile*
-
-sed -i "s|etcdir=\$(prefix)/etc|etcdir=%{_sysconfdir}/%{name}|" \
- {attila,dreal,elp,graal,mbkspice,rds,scapin,sea,xfsm,xvpn,xpat,xsch}/etc/Makefile.am
-
-sed -i "s|etcdir = \$(prefix)/etc|etcdir = %{_sysconfdir}/%{name}|" \
- {attila,dreal,elp,graal,mbkspice,rds,scapin,sea,xfsm,xvpn,xpat,xsch}/etc/Makefile.in
-
-sed -i "s|etcdir=\$(prefix)/etc|etcdir=%{_sysconfdir}/profile.d|" distrib/etc/Makefile.am
-sed -i "s|etcdir = \$(prefix)/etc|etcdir = %{_sysconfdir}/profile.d|" distrib/etc/Makefile.in
+%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
+sed -i "s|ALLIANCE_TOP|%{prefix}|" *.desktop
+%patch0 -p0 -b .env
+# removing 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
%patch1 -p0 -b .examples
%patch2 -p0 -b .run
# fixing permissions
@@ -114,32 +105,19 @@
%patch4 -p0 -b .tutorials
pushd documentation/tutorials
- for folder in place_and_route/tex simulation/tex start synthesis/tex; do
- pushd $folder
- %{__make}
- popd
- done
+ for folder in place_and_route/tex simulation/tex start synthesis/tex; do
+ pushd $folder
+ %{__make}
+ popd
+ done
popd
-#conflicts with man-pages and is a duplicate of log.1.gz
-#%patch5 -p0 -b .duplicate
-
-
-# removing 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
-pushd documentation/alliance-examples
- for cadence in adder4/adder4.ioc divcas4/divcas4.ioc mipsR3000/sce/mips_core.ioc \
- amd2901/amd2901_core.ioc amd2901-vasy/amd2901.ioc ; do
- sed -i "s|# Copyright (c) 1997 by Cadence. All rights reserved.|#|" $cadence
- done
-popd
# make sure the man pages are UTF-8...
for nonUTF8 in 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
+ %{_bindir}/iconv -f ISO-8859-1 -t utf-8 $nonUTF8 > $nonUTF8.conv
+ %{__mv} -f $nonUTF8.conv $nonUTF8
done
#wrong-file-end-of-line-encoding
@@ -156,7 +134,7 @@
--includedir=%{prefix}/include \
--libdir=%{prefix}/lib \
--bindir=%{prefix}/bin \
- --mandir=%{prefix}/man #252941
+ --mandir=%{_datadir}/%{name}/man #252941
# disabling rpath
sed -i 's|^hardcode_libdir_flag_spec="\\${wl}--rpath \\${wl}\\$libdir"|hardcode_libdir_flag_spec=""|g' libtool
@@ -178,15 +156,10 @@
# 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*
- # fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
- echo "MBK_SPI_MODEL=\$ALLIANCE_TOP/etc/spimodel.cfg; export MBK_SPI_MODEL" >> alc_env.sh
- echo "setenv MBK_SPI_MODEL \"\${ALLIANCE_TOP}/etc/spimodel.cfg\"" >> alc_env.csh
- #don't override $MANPATH
- sed -i "s|\$ALLIANCE_TOP/man|\$MANPATH|" alc_env*
- sed "s|ALLIANCE_TOP *= *\([^;]*\)|ALLIANCE_TOP=%{prefix}|" alc_env.sh
- sed "s|setenv *ALLIANCE_TOP *\([^;]*\)|setenv ALLIANCE_TOP %{prefix}|" alc_env.csh
+ 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
@@ -202,7 +175,6 @@
# correcting minor documentation details
sed -i "s|/bin/zsh|/bin/sh|" doc/alliance-run/bench.zsh
-
find %{buildroot} -name '*.la' -exec rm -f {} ';'
@@ -212,30 +184,35 @@
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
# desktop files
-for desktopfile in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6}; do
-desktop-file-install --vendor fedora \
- --add-category Engineering \
- --dir %{buildroot}%{_datadir}/applications/ \
- $desktopfile
+for desktopfile in *.desktop; do
+desktop-file-install --vendor fedora \
+ --add-category Engineering \
+ --dir %{buildroot}%{_datadir}/applications/ \
+ $desktopfile
done
## Makefiles and tex folder cleanups
pushd tutorials
- for folder in place_and_route/tex simulation/tex start synthesis/tex; do
- %{__rm} -rf $folder
- done
+ for folder in place_and_route/tex simulation/tex start synthesis/tex; do
+ %{__rm} -rf $folder
+ done
popd
# Architecture independent files
-%{__mkdir} -p %{buildroot}%{_datadir}/%{name}/
%{__mv} %{buildroot}%{prefix}/cells %{buildroot}%{_datadir}/%{name}/
+%{__mv} %{buildroot}%{prefix}/etc %{buildroot}%{_datadir}/%{name}/
# protecting hardcoded links
-ln -sf ../../..%{_sysconfdir}/%{name} %{buildroot}%{prefix}/etc
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/
@@ -256,6 +233,7 @@
%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 || :
@@ -278,17 +256,9 @@
%doc CHANGES LICENCE COPYING* FAQ alliance.fedora
%defattr(-,root,root,-)
%{prefix}/
-%{_datadir}/%{name}
-%dir %{_sysconfdir}/%{name}
-%config(noreplace) %{_sysconfdir}/%{name}/prol.elp
-%config(noreplace) %{_sysconfdir}/%{name}/se_defaults.mac
-%config(noreplace) %{_sysconfdir}/%{name}/spimodel.cfg
-%config(noreplace) %{_sysconfdir}/%{name}/sxlib.scapin
-%config %{_sysconfdir}/%{name}/cmos.*
-%config %{_sysconfdir}/%{name}/*.par
+%{_datadir}/%{name}/
%config %{_sysconfdir}/ld.so.conf.d/*
%{_datadir}/icons/hicolor/48x48/apps/*
-#%{_mandir}/man?/*
%{_datadir}/applications/fedora-*.desktop
%{_sysconfdir}/profile.d/alc_env.*
@@ -311,6 +281,10 @@
%changelog
+* Sat Aug 18 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-9.20070718snap
+- fixing desktop files
+- fixing MANPATH and PATH for proper priority
+
* Thu Aug 16 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-8.20070718snap
- fixing conflicts with QuantLib-doc package (#252941)
- update license macro to comply with new guidelines)
Index: dreal.desktop
===================================================================
RCS file: /cvs/extras/rpms/alliance/devel/dreal.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dreal.desktop 13 Aug 2007 21:02:23 -0000 1.1
+++ dreal.desktop 19 Aug 2007 15:13:28 -0000 1.2
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Name=Alliance: Dreal
-Exec=dreal
+Exec=ALLIANCE_TOP/bin/dreal
Icon=dreal.png
Type=Application
Terminal=false
Index: graal.desktop
===================================================================
RCS file: /cvs/extras/rpms/alliance/devel/graal.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- graal.desktop 13 Aug 2007 21:02:23 -0000 1.1
+++ graal.desktop 19 Aug 2007 15:13:28 -0000 1.2
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Name=Alliance: Graal
-Exec=graal
+Exec=ALLIANCE_TOP/bin/graal
Icon=graal.png
Type=Application
Terminal=false
Index: xfsm.desktop
===================================================================
RCS file: /cvs/extras/rpms/alliance/devel/xfsm.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfsm.desktop 13 Aug 2007 21:02:23 -0000 1.1
+++ xfsm.desktop 19 Aug 2007 15:13:28 -0000 1.2
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Name=Alliance: Xfsm
-Exec=xfsm
+Exec=ALLIANCE_TOP/bin/xfsm
Icon=xfsm.png
Type=Application
Terminal=false
Index: xpat.desktop
===================================================================
RCS file: /cvs/extras/rpms/alliance/devel/xpat.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xpat.desktop 13 Aug 2007 21:02:23 -0000 1.1
+++ xpat.desktop 19 Aug 2007 15:13:28 -0000 1.2
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Name=Alliance: Xpat
-Exec=xpat
+Exec=ALLIANCE_TOP/bin/xpat
Icon=xpat.png
Type=Application
Terminal=false
Index: xsch.desktop
===================================================================
RCS file: /cvs/extras/rpms/alliance/devel/xsch.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsch.desktop 13 Aug 2007 21:02:23 -0000 1.1
+++ xsch.desktop 19 Aug 2007 15:13:28 -0000 1.2
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Name=Alliance: Xsch
-Exec=xsch
+Exec=ALLIANCE_TOP/bin/xsch
Icon=xsch.png
Type=Application
Terminal=false
Index: xvpn.desktop
===================================================================
RCS file: /cvs/extras/rpms/alliance/devel/xvpn.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xvpn.desktop 13 Aug 2007 21:02:23 -0000 1.1
+++ xvpn.desktop 19 Aug 2007 15:13:28 -0000 1.2
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Name=Alliance: Xvpn
-Exec=xvpn
+Exec=ALLIANCE_TOP/bin/xvpn
Icon=xvpn.png
Type=Application
Terminal=false
--- alliance-log3.patch DELETED ---
More information about the fedora-extras-commits
mailing list