rpms/alliance/devel alliance-gcc43.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 alliance.spec, 1.6, 1.7 sources, 1.2, 1.3 alliance-tutorials.patch, 1.1, NONE
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Fri Mar 21 17:11:56 UTC 2008
Author: chitlesh
Update of /cvs/pkgs/rpms/alliance/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8042/devel
Modified Files:
.cvsignore alliance.spec sources
Added Files:
alliance-gcc43.patch
Removed Files:
alliance-tutorials.patch
Log Message:
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/devel/.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 21 Mar 2008 17:11:17 -0000 1.3
@@ -1 +1,2 @@
alliance-5.0-20070718.tar.gz
+alliance-5.0-tutorials.tar.bz2
Index: alliance.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alliance/devel/alliance.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alliance.spec 18 Feb 2008 22:36:24 -0000 1.6
+++ alliance.spec 21 Mar 2008 17:11:17 -0000 1.7
@@ -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,12 +35,15 @@
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}
-Obsoletes: %{name} < 5.0-11.20070718
%description
Alliance is a complete set of free CAD tools and portable libraries for
@@ -73,6 +76,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
@@ -84,14 +101,6 @@
%description doc
Documentation and tutorials for the Alliance VLSI CAD Sytem.
-%package libs
-Summary: Alliance VLSI CAD Sytem - libraries for multilibs
-Group: Applications/Engineering
-Requires: %{name} = %{version}-%{release}
-
-
-%description libs
-libraries for the Alliance VLSI CAD Sytem.
%prep
%setup -q
@@ -110,17 +119,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 \
@@ -174,11 +178,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
@@ -192,32 +194,27 @@
%{__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 \
+ --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
@@ -269,6 +266,11 @@
%{_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/
@@ -284,19 +286,23 @@
%doc alliance-examples/
%doc doc/alliance-run/
-%files libs
-%{_datadir}/applications/fedora-*.desktop
-%{_sysconfdir}/profile.d/alc_env.*
-%config %{_sysconfdir}/ld.so.conf.d/*
%changelog
-* 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)
+* Fri Mar 21 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 5.0-12.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-11.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
* 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/devel/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 21 Mar 2008 17:11:17 -0000 1.3
@@ -1 +1,2 @@
917f4493c09f6f5c49d5a606a5e9bbd8 alliance-5.0-20070718.tar.gz
+32cac3116f85713aec2e1e18379811eb alliance-5.0-tutorials.tar.bz2
--- alliance-tutorials.patch DELETED ---
More information about the fedora-extras-commits
mailing list