Cleanup git merger.

2020-02-22 12:27:38 +01:00
1 changed files with 17 additions and 83 deletions
--- a/alliance.spec
+++ b/alliance.spec
@ -4,9 +4,9 @@

 Name:           alliance
 Version:        5.1.1
-Release:        37.%{snapdate}git%{shortcommit}%{?dist}
+Release:        18.%{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
@ -44,6 +44,7 @@ BuildRequires:  byacc
 BuildRequires:  desktop-file-utils
 BuildRequires:  flex
 BuildRequires:  libstdc++-devel
+BuildRequires:  libXp-devel
 BuildRequires:  libXpm-devel
 BuildRequires:  libXt-devel
 BuildRequires:  m4
@ -111,28 +112,27 @@ 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
+%patch00 -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
+%patch01 -p2
+%patch02 -p2
+%patch03 -p2
+%patch04 -p2
+%patch05 -p2
+%patch06 -p2
+%patch07 -p2
+%patch08 -p2
+%patch09 -p2
+%patch10 -p2
+%patch11 -p2
+%patch12 -p2
+%patch13 -p2

 pushd src > /dev/null

@ -190,11 +190,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                \
@ -309,72 +304,11 @@ source %{_sysconfdir}/profile.d/alc_env.sh


 %changelog
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-37.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-36.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-35.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-34.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-33.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-32.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Aug 16 2023 Florian Weimer <fweimer@redhat.com> - 5.1.1-31.20160506gitd8c05cd
- Set build_type_safety_c to 0 (#2187002)
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-30.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Apr 15 2023 Florian Weimer <fweimer@redhat.com> - 5.1.1-29.20160506gitd8c05cd
- Build in C89 mode (#2187002)
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-28.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Dec 05 2022 Ralf Corsépius <corsepiu@fedoraproject.org> - 5.1.1-27.20160506gitd8c05cd
- Convert license to SPDX.
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-26.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-25.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-24.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-23.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Sep 30 2020 Adam Jackson <ajax@redhat.com> - 5.1.1-22.20160506gitd8c05cd
- Remove unused BuildRequires: libXp-devel
-
-* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-21.20160506gitd8c05cd
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Jeff Law <law@redhat.com> - 5.1.1-20.20160506gitd8c05cd
- Force C++14 as the code is not ready for C++17
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-19.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
 * Sat Feb 22 2020 Ralf Corsépius <corsepiu@fedoraproject.org> - 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 <releng@fedoraproject.org> - 5.1.1-17.20160506gitd8c05cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-16.20160506gitd8c05cd
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild