diff --git a/0013-GCC-10-fixes.patch b/0013-GCC-10-fixes.patch deleted file mode 100644 index 0a33546..0000000 --- a/0013-GCC-10-fixes.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 87faa08f9a1d3f55e3430a68acb0f898adc75a2d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= -Date: Fri, 7 Feb 2020 08:51:41 +0100 -Subject: [PATCH 13/13] GCC-10 fixes - ---- - alliance/src/elp/src/elp.c | 1 - - alliance/src/elp/src/elp.h | 3 ++- - alliance/src/elp/src/elp_y.y | 1 - - alliance/src/nero/src/MDRGrid.cpp | 1 + - alliance/src/pat/src/Makefile.am | 1 + - 5 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/alliance/src/elp/src/elp.c b/alliance/src/elp/src/elp.c -index d279e6cfc..e516f1ee6 100644 ---- a/alliance/src/elp/src/elp.c -+++ b/alliance/src/elp/src/elp.c -@@ -33,7 +33,6 @@ double elpVoltage[elpVOLTNUM] ; - double elpCapa[elpTRANSNUM][elpCAPANUM] ; - double elpGeneral[elpGENERALNUM] = {0.0,0.0,1000.0} ; - char elpLang = elpDEFLANG ; --int elpyylineno ; - - /*****************************************************************************/ - /* function elpenv() */ -diff --git a/alliance/src/elp/src/elp.h b/alliance/src/elp/src/elp.h -index b1d4930f1..b1f284aed 100644 ---- a/alliance/src/elp/src/elp.h -+++ b/alliance/src/elp/src/elp.h -@@ -106,7 +106,8 @@ extern double elpGeneral[elpGENERALNUM] ; - #define elpACM 0 /* methode de calcul des capacites dynamiques */ - #define elpTEMP 1 /* temperature de simulation et d'analyse */ - #define elpSLOPE 2 /* front sur les connecteurs d'entree */ -- -+extern int yylineno ; -+extern int elpyylineno ; - - /* les fonctions externes */ - extern int elpenv() ; -diff --git a/alliance/src/elp/src/elp_y.y b/alliance/src/elp/src/elp_y.y -index 904ce7f02..fb5db214a 100644 ---- a/alliance/src/elp/src/elp_y.y -+++ b/alliance/src/elp/src/elp_y.y -@@ -100,7 +100,6 @@ elpvar : - ; - %% - --extern int yylineno ; - extern char yytext[] ; - - void yyerror() -diff --git a/alliance/src/nero/src/MDRGrid.cpp b/alliance/src/nero/src/MDRGrid.cpp -index b7e9fb9f3..f8095ab3b 100644 ---- a/alliance/src/nero/src/MDRGrid.cpp -+++ b/alliance/src/nero/src/MDRGrid.cpp -@@ -17,6 +17,7 @@ - - - # include "MDefs.h" -+template class TMatrix; - - - -diff --git a/alliance/src/pat/src/Makefile.am b/alliance/src/pat/src/Makefile.am -index d8875fb83..f93af2822 100644 ---- a/alliance/src/pat/src/Makefile.am -+++ b/alliance/src/pat/src/Makefile.am -@@ -28,6 +28,7 @@ pat_decl_y.c pat_decl_y.h : $(srcdir)/pat_decl_y.y - && sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.c \ - | sed -e "s/int[ ]*pat_decl_y_char;/extern int pat_decl_y_char;/" \ - | sed -e "s/int[ ]*pat_decl_y_nerrs;/extern int pat_decl_y_nerrs;/" \ -+ | sed -e "s/^PAT_DECL_Y_STYPE pat_decl_y_lval;//" \ - > pat_decl_y.c \ - && sed -e "s/yy/pat_decl_y_/g" -e "s/YY/PAT_DECL_Y_/g" y.tab.h > pat_decl_y.h - --- -2.24.1 - diff --git a/alliance.spec b/alliance.spec index ad65a1a..34ca424 100644 --- a/alliance.spec +++ b/alliance.spec @@ -4,9 +4,9 @@ Name: alliance Version: 5.1.1 -Release: 37.%{snapdate}git%{shortcommit}%{?dist} +Release: 8.%{snapdate}git%{shortcommit}%{?dist} Summary: VLSI EDA System -License: GPL-2.0-only +License: GPLv2 URL: https://soc-extras.lip6.fr/en/alliance-abstract-en/ Source: http://www-asim.lip6.fr/pub/alliance/distribution/latest/alliance-%{version}.tar.bz2 Source1: alliance.fedora @@ -20,30 +20,29 @@ Source5: alliance-examples-go-all-clean.sh # https://www-soc.lip6.fr/git/alliance.git Patch00: 0000-alliance-5.1.1-git%{shortcommit}.patch -Patch01: 0001-Remove-stray-files.patch -Patch02: 0002-Update-autostuff.patch -Patch03: 0003-Consolidate-installation-dirs.patch -Patch04: 0004-Misc-installation-dirs-fixes.patch -Patch05: 0005-Use-inttypes-macros-to-print-int32_t.patch -Patch06: 0006-Use-ring_yy-instead-of-yy.patch -Patch07: 0007-Eliminate-CFLAGS.patch -Patch08: 0008-Rework-Makefile.ams.patch -Patch09: 0009-Misc.-doc-fixes.patch -Patch10: 0010-Fedora-profiles.patch +Patch11: 0001-Remove-stray-files.patch +Patch12: 0002-Update-autostuff.patch +Patch13: 0003-Consolidate-installation-dirs.patch +Patch14: 0004-Misc-installation-dirs-fixes.patch +Patch15: 0005-Use-inttypes-macros-to-print-int32_t.patch +Patch16: 0006-Use-ring_yy-instead-of-yy.patch +Patch17: 0007-Eliminate-CFLAGS.patch +Patch18: 0008-Rework-Makefile.ams.patch +Patch19: 0009-Misc.-doc-fixes.patch +Patch20: 0010-Fedora-profiles.patch # Bashisms in /etc/profile.d/alc_env.csh -Patch11: 0011-Use-setenv-instead-of-set-RHBZ-1337691.patch +Patch21: 0011-Use-setenv-instead-of-set-RHBZ-1337691.patch # Flex compatibility issues -Patch12: 0012-Remove-yylineno.patch -# GCC-10 incompatibilities -Patch13: 0013-GCC-10-fixes.patch +Patch22: 0012-Remove-yylineno.patch -BuildRequires: gcc-c++ BuildRequires: bison BuildRequires: byacc BuildRequires: desktop-file-utils BuildRequires: flex +BuildRequires: ghostscript BuildRequires: libstdc++-devel +BuildRequires: libXp-devel BuildRequires: libXpm-devel BuildRequires: libXt-devel BuildRequires: m4 @@ -54,14 +53,17 @@ BuildRequires: tex(subfigure.sty) BuildRequires: tex(wrapfig.sty) BuildRequires: transfig BuildRequires: /usr/bin/convert -BuildRequires: /usr/bin/dvipdf BuildRequires: autoconf automake libtool %if 0%{?rhel} BuildRequires: openmotif-devel BuildRequires: pkgconfig %else +%if 0%{?fedora} >= 23 BuildRequires: motif-devel +%else +BuildRequires: lesstif-devel +%endif %endif Requires: xorg-x11-fonts-misc # RHBZ 442379 @@ -111,28 +113,25 @@ Summary: Alliance VLSI CAD System - Documentations BuildArch: noarch Requires: gnuplot BuildRequires: tetex-latex -BuildRequires: make %description doc Documentation and tutorials for the Alliance VLSI CAD Sytem. %prep %setup -qn %{name} -%patch -P00 -p2 - -%patch -P01 -p2 -%patch -P02 -p2 -%patch -P03 -p2 -%patch -P04 -p2 -%patch -P05 -p2 -%patch -P06 -p2 -%patch -P07 -p2 -%patch -P08 -p2 -%patch -P09 -p2 -%patch -P10 -p2 -%patch -P11 -p2 -%patch -P12 -p2 -%patch -P13 -p2 +%patch00 -p2 +%patch11 -p2 +%patch12 -p2 +%patch13 -p2 +%patch14 -p2 +%patch15 -p2 +%patch16 -p2 +%patch17 -p2 +%patch18 -p2 +%patch19 -p2 +%patch20 -p2 +%patch21 -p2 +%patch22 -p2 pushd src > /dev/null @@ -190,11 +189,6 @@ find documentation/tutorials/ \ popd > /dev/null %build -# The C parts use implicit ints, implicit function declarations, -# and old-style function declarations heavily. -%global build_type_safety_c 0 -export CFLAGS="%build_cflags -std=gnu89" -export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" pushd src > /dev/null %configure --enable-alc-shared \ --disable-static \ @@ -267,12 +261,22 @@ EOF %{_fixperms} %{buildroot}/* popd > /dev/null +%post libs +/sbin/ldconfig + %post source %{_sysconfdir}/profile.d/alc_env.sh +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -%post libs -p /sbin/ldconfig +%postun libs +/sbin/ldconfig + +%postun +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -%postun libs -p /sbin/ldconfig %files %{_pkgdocdir}/README @@ -309,96 +313,6 @@ source %{_sysconfdir}/profile.d/alc_env.sh %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 5.1.1-37.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jul 23 2025 Fedora Release Engineering - 5.1.1-36.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 5.1.1-35.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 5.1.1-34.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 5.1.1-33.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 5.1.1-32.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Aug 16 2023 Florian Weimer - 5.1.1-31.20160506gitd8c05cd -- Set build_type_safety_c to 0 (#2187002) - -* Wed Jul 19 2023 Fedora Release Engineering - 5.1.1-30.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Apr 15 2023 Florian Weimer - 5.1.1-29.20160506gitd8c05cd -- Build in C89 mode (#2187002) - -* Wed Jan 18 2023 Fedora Release Engineering - 5.1.1-28.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Dec 05 2022 Ralf Corsépius - 5.1.1-27.20160506gitd8c05cd -- Convert license to SPDX. - -* Wed Jul 20 2022 Fedora Release Engineering - 5.1.1-26.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 5.1.1-25.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 5.1.1-24.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jan 25 2021 Fedora Release Engineering - 5.1.1-23.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Sep 30 2020 Adam Jackson - 5.1.1-22.20160506gitd8c05cd -- Remove unused BuildRequires: libXp-devel - -* Fri Jul 31 2020 Fedora Release Engineering - 5.1.1-21.20160506gitd8c05cd -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Jeff Law - 5.1.1-20.20160506gitd8c05cd -- Force C++14 as the code is not ready for C++17 - -* Mon Jul 27 2020 Fedora Release Engineering - 5.1.1-19.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Feb 22 2020 Ralf Corsépius - 5.1.1-18.20160506gitd8c05cd -- Drop lesstif. -- Spec file cleanup. -- Add 0013-GCC-10-fixes.patch (F32FTBFS, RHBZ#1799147). - -* Tue Jan 28 2020 Fedora Release Engineering - 5.1.1-17.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 5.1.1-16.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 5.1.1-15.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 5.1.1-14.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Mar 15 2018 Ralf Corsépius - 5.1.1-13.20160506gitd8c05cd -- BR: /usr/bin/dvipdf instead of ghostscript (F28FTBFS). - -* Wed Feb 07 2018 Fedora Release Engineering - 5.1.1-12.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Jan 07 2018 Igor Gnatenko - 5.1.1-11.20160506gitd8c05cd -- Remove obsolete scriptlets - -* Wed Aug 02 2017 Fedora Release Engineering - 5.1.1-10.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 5.1.1-9.20160506gitd8c05cd -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - * Mon May 15 2017 Fedora Release Engineering - 5.1.1-8.20160506gitd8c05cd - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild