rpms/alliance/F-8 alliance-gcc43.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 alliance-env.patch, 1.2, 1.3 alliance.spec, 1.4, 1.5 sources, 1.2, 1.3 alliance-tutorials.patch, 1.1, NONE
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Mon May 26 21:01:27 UTC 2008
- Previous message: rpms/alliance/F-7 alliance-gcc43.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 alliance-env.patch, 1.1, 1.2 alliance.spec, 1.3, 1.4 dreal.desktop, 1.2, 1.3 graal.desktop, 1.2, 1.3 sources, 1.2, 1.3 xfsm.desktop, 1.2, 1.3 xpat.desktop, 1.2, 1.3 xsch.desktop, 1.2, 1.3 xvpn.desktop, 1.2, 1.3 alliance-tutorials.patch, 1.1, NONE
- Next message: rpms/alliance/F-9 alliance-env.patch, 1.2, 1.3 alliance.spec, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: chitlesh
Update of /cvs/pkgs/rpms/alliance/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14894/F-8
Modified Files:
.cvsignore alliance-env.patch alliance.spec sources
Added Files:
alliance-gcc43.patch
Removed Files:
alliance-tutorials.patch
Log Message:
bugfix
alliance-gcc43.patch:
--- NEW FILE alliance-gcc43.patch ---
diff -Nur alliance-5.0.old/nero/src/ADefs.h alliance-5.0/nero/src/ADefs.h
--- alliance-5.0.old/nero/src/ADefs.h 2002-10-29 19:46:03.000000000 +0100
+++ alliance-5.0/nero/src/ADefs.h 2008-03-19 03:16:12.000000000 +0100
@@ -138,7 +138,7 @@
// Allocators.
private: static void *operator new (size_t size);
- private: static void operator delete (void *zone);
+ public: static void operator delete (void *zone);
public: static void *operator new (size_t size, CNodeASSet &NS);
// Modifiers.
diff -Nur alliance-5.0.old/nero/src/MDefs.h alliance-5.0/nero/src/MDefs.h
--- alliance-5.0.old/nero/src/MDefs.h 2005-10-10 17:34:05.000000000 +0200
+++ alliance-5.0/nero/src/MDefs.h 2008-03-19 01:08:24.000000000 +0100
@@ -25,6 +25,8 @@
# include "UDefs.h"
+# include <limits.h>
+# include <string.h>
diff -Nur alliance-5.0.old/ocp/src/placer/PPlacement.h alliance-5.0/ocp/src/placer/PPlacement.h
--- alliance-5.0.old/ocp/src/placer/PPlacement.h 2006-03-30 21:07:47.000000000 +0200
+++ alliance-5.0/ocp/src/placer/PPlacement.h 2008-03-19 01:10:41.000000000 +0100
@@ -43,6 +43,7 @@
#include <fstream>
#include <vector>
#include <map>
+#include <string.h>
using namespace std;
#include "mut.h"
diff -Nur alliance-5.0.old/sea/src/DEF_grammar_lex.l alliance-5.0/sea/src/DEF_grammar_lex.l
--- alliance-5.0.old/sea/src/DEF_grammar_lex.l 2002-04-25 18:16:20.000000000 +0200
+++ alliance-5.0/sea/src/DEF_grammar_lex.l 2008-03-19 01:11:28.000000000 +0100
@@ -18,7 +18,7 @@
# define yylineno DEF_grammarlineno
- int yylineno = 1;
+ // int yylineno = 1;
static int yywrap(void);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 13 Aug 2007 21:02:23 -0000 1.2
+++ .cvsignore 26 May 2008 21:00:45 -0000 1.3
@@ -1 +1,2 @@
alliance-5.0-20070718.tar.gz
+alliance-5.0-tutorials.tar.bz2
alliance-env.patch:
Index: alliance-env.patch
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-8/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:00:45 -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/F-8/alliance.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- alliance.spec 23 Aug 2007 12:16:54 -0000 1.4
+++ alliance.spec 26 May 2008 21:00:45 -0000 1.5
@@ -3,7 +3,7 @@
Name: alliance
Version: 5.0
-Release: 10.%{snapshot}snap%{?dist}
+Release: 15.%{snapshot}snap%{?dist}
Summary: Alliance VLSI CAD Sytem
License: GPLv2
@@ -16,7 +16,7 @@
Patch1: alliance-examples.patch
Patch2: alliance-run.patch
Patch3: alliance-perms.patch
-Patch4: alliance-tutorials.patch
+Patch4: alliance-gcc43.patch
Source1: xsch.desktop
Source2: dreal.desktop
@@ -35,11 +35,16 @@
Source12: xpat.png
Source13: xsch.png
+Source14: %{name}-5.0-tutorials.tar.bz2
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: lesstif-devel libXt-devel byacc desktop-file-utils bison
BuildRequires: libXp-devel libXpm-devel libstdc++-devel flex m4
-BuildRequires: transfig ghostscript tetex-latex
+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
@@ -72,6 +77,20 @@
* Netlist extraction and verification
* Design rules checking
+%{name} is listed among Fedora Electronic Lab (FEL) packages.
+
+
+%package libs
+Summary: Alliance VLSI CAD Sytem - multilibs
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+Requires: electronics-menu
+Obsoletes: %{name} < 5.0-12
+
+
+%description libs
+Architecture dependent files for the Alliance VLSI CAD Sytem.
+
%package doc
Summary: Alliance VLSI CAD Sytem - Documentations
@@ -101,17 +120,12 @@
%patch3 -p0 -b .perms
-## Updating old tutorials
-%patch4 -p0 -b .tutorials
+### 2008 March: TexLive introduction to Rawhide
+sed -i "s|tutorials||" documentation/Makefile.in
+tar -xvf %{SOURCE14}
-pushd documentation/tutorials
- for folder in place_and_route/tex simulation/tex start synthesis/tex; do
- pushd $folder
- %{__make}
- popd
- done
-popd
+%patch4 -p1 -b .include
# make sure the man pages are UTF-8...
for nonUTF8 in distrib/doc/alc_origin.1 alcban/man1/alcbanner.1 \
@@ -165,11 +179,9 @@
# documentation
%{__cp} -pr %{buildroot}%{prefix}/doc/ .
-%{__cp} -pr %{buildroot}%{prefix}/tutorials/ .
%{__cp} -pr %{buildroot}%{prefix}/examples/alliance-examples/ .
%{__rm} -rf %{buildroot}%{prefix}/doc/
-%{__rm} -rf %{buildroot}%{prefix}/tutorials/
%{__rm} -rf %{buildroot}%{prefix}/examples/
# correcting minor documentation details
@@ -183,32 +195,28 @@
%{__cp} -p %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
-# desktop files
+
+# desktop files with enhanced menu from electronics-menu now on Fedora
+# thanks Peter Brett
for desktopfile in *.desktop; do
desktop-file-install --vendor fedora \
--add-category Engineering \
+ --add-category Electronics \
+ --remove-category Science \
--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
-popd
-
-
# Architecture independent files
%{__mv} %{buildroot}%{prefix}/cells %{buildroot}%{_datadir}/%{name}/
-%{__mv} %{buildroot}%{prefix}/etc %{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
+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
@@ -257,13 +265,15 @@
%defattr(-,root,root,-)
%{prefix}/
%{_datadir}/%{name}/
-%config %{_sysconfdir}/ld.so.conf.d/*
%{_datadir}/icons/hicolor/48x48/apps/*
+
+
+%files libs
+%config %{_sysconfdir}/ld.so.conf.d/*
%{_datadir}/applications/fedora-*.desktop
%{_sysconfdir}/profile.d/alc_env.*
-
%files doc
%doc doc/html/
%doc doc/design-flow
@@ -281,6 +291,35 @@
%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
+
+* Fri Mar 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-13.20070718snap
+- Requiring new FEL menu structure
+- Fixing previous desktop files
+- closing unconfirmed bug #427691
+- fixing multilibs issues #340621
+
+* Tue Mar 18 2008 Thibault North < tnorth [AT] fedoraproject DOT org> - 5.0-13.20070718snap
+- dropped patch4: alliance-tutorials.patch
+- fixed TexLive related issues for documentation
+- commenting previous make in directory tutorials
+- attached tutorials made in F8 Werewolf
+- dropped BR :tetex-latex
+- added patch4: including more useful includes to C files
+- fixed bug #434020 : alliance failed massrebuild attempt for GCC4.3
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 5.0-12.20070718snap
+- Autorebuild for GCC 4.3
+
+* Sun Feb 10 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-11.20070718snap
+- mass rebuild for gcc43 on rawhide
+- ensuring multilibs (#340621)
+
* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-10.20070718snap
- complying to freedesktop policies - categories
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 13 Aug 2007 21:02:23 -0000 1.2
+++ sources 26 May 2008 21:00:45 -0000 1.3
@@ -1 +1,2 @@
917f4493c09f6f5c49d5a606a5e9bbd8 alliance-5.0-20070718.tar.gz
+32cac3116f85713aec2e1e18379811eb alliance-5.0-tutorials.tar.bz2
--- alliance-tutorials.patch DELETED ---
- Previous message: rpms/alliance/F-7 alliance-gcc43.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 alliance-env.patch, 1.1, 1.2 alliance.spec, 1.3, 1.4 dreal.desktop, 1.2, 1.3 graal.desktop, 1.2, 1.3 sources, 1.2, 1.3 xfsm.desktop, 1.2, 1.3 xpat.desktop, 1.2, 1.3 xsch.desktop, 1.2, 1.3 xvpn.desktop, 1.2, 1.3 alliance-tutorials.patch, 1.1, NONE
- Next message: rpms/alliance/F-9 alliance-env.patch, 1.2, 1.3 alliance.spec, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list