diff --git a/z88dk.spec b/z88dk.spec index 7ea05d0..a3ea8dc 100644 --- a/z88dk.spec +++ b/z88dk.spec @@ -6,10 +6,9 @@ Name: z88dk # what version it is supposed to be. (README.1st still claims to be from version # 1.9 when they already released 1.10 and 1.10.1.) Version: 1.10.1 -Release: 35%{?nightly:.%{nightly}cvs}%{?dist} +Release: 24%{?nightly:.%{nightly}cvs}%{?dist} Summary: A Z80 cross compiler -# Automatically converted from old format: Artistic clarified - review is highly recommended. -License: ClArtistic +License: Artistic clarified URL: http://www.z88dk.org/ %if 0%{?nightly} Source: http://nightly.z88dk.org/z88dk-%{nightly}.tgz @@ -35,11 +34,11 @@ calculators). %setup -q -n z88dk # Put files in %%{_datadir}/z88dk rather than /usr/lib/z88dk # Also support DESTDIR in install-libs -%patch -P0 -p1 +%patch0 -p1 # 64-bit fixes -%patch -P1 -p1 +%patch1 -p1 # Fix improper use of CFLAGS and LDFLAGS in the makefiles -%patch -P2 -p1 +%patch2 -p1 find . -depth -name CVS -type d -exec rm -rf {} \; # Separate manpages from other docs and fix their permissions mv doc/netman . @@ -52,8 +51,7 @@ find doc examples src -type f -exec chmod 644 {} \; export Z80_OZFILES=%{_builddir}/z88dk/lib/ export ZCCCFG=%{_builddir}/z88dk/lib/config/ export PATH=%{_builddir}/z88dk/bin:$PATH -%global build_type_safety_c 0 -export CC="gcc -std=gnu89" +export CC=gcc export CFLAGS="%{optflags}" %{?__global_ldflags:export LDFLAGS="%{__global_ldflags}"} # Note: do not use %%{?_smp_mflags} with make because the Makefiles don't support parallel builds @@ -91,39 +89,6 @@ cp -p netman/man3z/* %{buildroot}%{_mandir}/man3z %{_mandir}/man3z/ %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1.10.1-35.20150709cvs -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 1.10.1-34.20150709cvs -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.10.1-33.20150709cvs -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.10.1-32.20150709cvs -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Aug 7 2024 Miroslav Suchý - 1.10.1-31.20150709cvs -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.10.1-30.20150709cvs -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.10.1-29.20150709cvs -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Aug 31 2023 Florian Weimer - 1.10.1-2820150709:.%{nightly}cvs} -- Set build_type_safety_c to 0 (#2166990) - -* Sat Jul 22 2023 Fedora Release Engineering - 1.10.1-27.20150709cvs -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Feb 3 2023 DJ Delorie - 1.10.1-26.20150709cvs -- Build in C89 mode (#2166990) - -* Sat Jan 21 2023 Fedora Release Engineering - 1.10.1-25.20150709cvs -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - * Sat Jul 23 2022 Fedora Release Engineering - 1.10.1-24.20150709cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild