From 91eda6fdc6d530ed3d080089d93f086ea73ca1c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:07:51 +0000 Subject: [PATCH 01/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index b035e9c..87c5090 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -385,6 +385,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 4.4.3.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 4.4.3.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 74d01b5b28ba9730d3f88123b64d4e62638135b7 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 26 Jul 2023 21:16:18 +0200 Subject: [PATCH 02/11] Fix dat2c bug causing FTBFS of allegro using packages (rhbz#2225996) Trim changelog --- allegro-4.4.3-dat2c-buffer-overflow.patch | 32 ++ allegro.rpmlintrc | 7 +- allegro.spec | 353 +--------------------- 3 files changed, 43 insertions(+), 349 deletions(-) create mode 100644 allegro-4.4.3-dat2c-buffer-overflow.patch diff --git a/allegro-4.4.3-dat2c-buffer-overflow.patch b/allegro-4.4.3-dat2c-buffer-overflow.patch new file mode 100644 index 0000000..118fd4d --- /dev/null +++ b/allegro-4.4.3-dat2c-buffer-overflow.patch @@ -0,0 +1,32 @@ +tools/dat2c: Fix a buffer overlow + +When prefix is set and datafile_name is not set then +strlen(prefix) + 6 bytes are necessary, not strlen(prefix) 5, +because then we get: "$(prefix)_data\0" which requires 6 bytes +extra for "_data\0". + +This fixes dat2c crashing like this: + + dat2c mbdata.dat -o mbdata.c -h mbdata.h -p mb -g + *** buffer overflow detected ***: terminated + make: *** [Makefile:45: mbdata.c] Aborted (core dumped) + +When compiled with a recent gcc version + a high FORTIFY_SOURCE setting. + +Link: https://bugzilla.redhat.com/show_bug.cgi?id=2225996 +diff -up allegro-4.4.3.1/tools/dat2c.c~ allegro-4.4.3.1/tools/dat2c.c +--- allegro-4.4.3.1/tools/dat2c.c~ 2019-03-04 02:30:11.000000000 +0100 ++++ allegro-4.4.3.1/tools/dat2c.c 2023-07-26 20:12:52.250765448 +0200 +@@ -1641,9 +1641,10 @@ int do_conversion(struct dat2c *dat2c) + int result = 0; + char *prefixed_name = 0; + +- prefixed_name = malloc(5 + ++ /* 2 for '_' + '\0' */ ++ prefixed_name = malloc(2 + + (dat2c->prefix ? (signed)strlen(dat2c->prefix) : 0) + +- (dat2c->datafile_name ? (signed)strlen(dat2c->datafile_name) : 0)); ++ (dat2c->datafile_name ? (signed)strlen(dat2c->datafile_name) : 4)); + if (!prefixed_name) + out_of_memory(); + sprintf(prefixed_name, "%s%s%s", diff --git a/allegro.rpmlintrc b/allegro.rpmlintrc index e1ba769..bb33462 100644 --- a/allegro.rpmlintrc +++ b/allegro.rpmlintrc @@ -1,8 +1,7 @@ -# Silence silly information messages about dicts not being found -addFilter("I: enchant-dictionary-not-found .*") # Some of our sub-packages do not contain docs addFilter("W: no-documentation") # Some of our tools do not have a manpage addFilter("W: no-manual-page-for-binary .*") -# Ignore warnings about manpage groff macros -addFilter("W: manual-page-warning .*") +# Ignore warnings about some manpages being shared between functions +addFilter("W: files-duplicate /usr/share/man/man3/.*") +addFilter("W: package-with-huge-docs.*") diff --git a/allegro.spec b/allegro.spec index 87c5090..4386a6c 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -32,6 +32,9 @@ Patch12: allegro-4.4.3-datafile-double-free.patch # starting texinfo-6.7 the default encoding is UTF-8 and because allegro's # source .texi file is encoded in ISO-8859-1, additional command is needed Patch13: allegro-4.4.3-texinfo-non-utf8-input-fix.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2225996 +# Fix a buffer overflow in dat2c tool causing FTBFS of allegro using packages +Patch14: allegro-4.4.3-dat2c-buffer-overflow.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -385,6 +388,10 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Wed Jul 26 2023 Hans de Goede - 4.4.3.1-11 +- Fix dat2c bug causing FTBFS of allegro using packages (rhbz#2225996) +- Trim changelog + * Wed Jul 19 2023 Fedora Release Engineering - 4.4.3.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild @@ -419,347 +426,3 @@ install -pm 644 addons/jpgalleg/readme.txt \ - Use CMake3 on epel - Use dedicated CMake 'build' directory - Patched for texinfo-6.7 (rhbz#1767827) - -* Wed Jul 24 2019 Fedora Release Engineering - 4.4.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Feb 26 2019 Hans de Goede - 4.4.3-2 -- The 4.4.3 update broke the dat and grabber tools, fix them (rhbz#1682921) - -* Mon Feb 18 2019 Hans de Goede - 4.4.3-1 -- New upstream release 4.4.3 - -* Sat Feb 16 2019 Hans de Goede - 4.4.2-23 -- Fix FTBFS (rhbz#1674575) - -* Thu Jan 31 2019 Fedora Release Engineering - 4.4.2-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 4.4.2-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue May 29 2018 Hans de Goede - 4.4.2-20 -- Fix PPC allegro app builds failing due to alcompat.h defining aliases for - fadd / fdiv / fmull which conflict with system headers (#1582916, #1582917) -- Modernize spec-file a bit - -* Wed Feb 07 2018 Fedora Release Engineering - 4.4.2-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 4.4.2-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 4.4.2-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Mar 15 2017 Hans de Goede - 4.4.2-16 -- Fix FBTFS - -* Fri Feb 10 2017 Fedora Release Engineering - 4.4.2-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 4.4.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jun 23 2015 Hans de Goede - 4.4.2-13 -- Fix allegro apps which start fullscreen failing to start from gnome-shell - with a "Can not grab keyboard" error message - -* Tue Jun 16 2015 Fedora Release Engineering - 4.4.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Oct 29 2014 Hans de Goede - 4.4.2-11 -- Replace racy recursive mutex implementation with proper recursive mutexes -- Use XPending instead of XSync + XeventsQueued to avoid a deadlock - -* Fri Aug 15 2014 Fedora Release Engineering - 4.4.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 4.4.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Sep 15 2013 Hans de Goede - 4.4.2-8 -- Fix docdir for unversioned docdir F-20 change (rhbz#993664) - -* Sat Aug 03 2013 Fedora Release Engineering - 4.4.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Apr 29 2013 Hans de Goede - 4.4.2-6 -- Add /usr/share/aclocal/allegro.m4 to -devel package - -* Wed Feb 13 2013 Fedora Release Engineering - 4.4.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 4.4.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 4.4.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Nov 15 2011 Peter Robinson 4.4.2-2 -- Make pre/post dependencies for all non i686 arches sane - -* Tue Jul 12 2011 Hans de Goede 4.4.2-1 -- New upstream release -- Partially based on spec file update by Brandon McCaig -- Drop a number of no longer relevant patches -- Now comes with alleggl, jpgalleg, loadpng and logg bundled - -* Mon Feb 07 2011 Fedora Release Engineering - 4.2.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jan 7 2011 Hans de Goede 4.2.3-4 -- Fix a format string bug in the pack utility reported on bugtraq - (but without security implications) - -* Thu Sep 9 2010 Hans de Goede 4.2.3-3 -- Fix FTBFS (#631099) - -* Mon Jun 21 2010 Hans de Goede 4.2.3-2 -- Fix multilib conflict in -devel (#603836) - -* Mon Oct 5 2009 Jindrich Novy 4.2.3-1 -- update to 4.2.3 - -* Thu Sep 10 2009 Hans de Goede 4.2.2-14 -- Fix (workaround) viewport issues in fullscreen mode (#522116) - -* Fri Jul 24 2009 Fedora Release Engineering - 4.2.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Feb 23 2009 Fedora Release Engineering - 4.2.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Jan 25 2009 Hans de Goede 4.2.2-11 -- Fix wrong file path in semanage call in scriptlets (#481407) - -* Mon May 5 2008 Hans de Goede 4.2.2-10 -- Look for /etc/timidity.cfg instead of /usr/share/timidity/timidity.cfg, - as the latter is no longer available now that Fedora has switched from - timidity++-patches to PersonalCopy-Lite-patches - -* Tue Apr 1 2008 Hans de Goede 4.2.2-9 -- Fix i386 asm code compilation with latest binutils -- Remove -fomit-frame-pointer from the compile flags of the default build, so - that we get a usefull debuginfo even for the normal (non debug/profile) lib - -* Tue Feb 19 2008 Fedora Release Engineering - 4.2.2-8 -- Autorebuild for GCC 4.3 - -* Mon Jan 21 2008 Hans de Goede 4.2.2-7 -- Add makedoc utility to allegro-devel as allegro-makedoc (bz 429450) -- Fix sound when using pulseaudio -- Fix compilation of inline asm with gcc 4.3 - -* Sun Oct 14 2007 Hans de Goede 4.2.2-6 -- Require timidity++-patches instead of timidity++ itself so that we don't - drag in arts and through arts, qt and boost -- Add BuildRequires: glib2-devel to workaround RH bug 331841 - -* Wed Aug 22 2007 Hans de Goede 4.2.2-5 -- Update to pristine upstream sources instead of using allegro.cc pre-release - -* Tue Aug 21 2007 Hans de Goede 4.2.2-4 -- Rebuild for buildId - -* Sun Aug 12 2007 Hans de Goede 4.2.2-3 -- Enable building of JACK (Jack Audio Connection Kit) sound output plugin -- Put non default sound output plugins in their own subpackage to avoid - dragging in unwanted deps (allegro-esound-plugin, allegro-arts-plugin, - allegro-jack-plugin) (bz 250736) -- Make man pages and info file UTF-8 - -* Tue Jul 24 2007 Hans de Goede 4.2.2-2 -- sync .libdir patch to 4.2.2 and use it again for multilib devel goodness - (make allegro-devel i386 and x86_64 parallel installable again) - -* Mon Jul 23 2007 Jindrich Novy 4.2.2-1 -- update to 4.2.2 -- drop .libdir patch -- sync .multilib patch - -* Fri Jul 6 2007 Hans de Goede 4.2.1-3 -- Silence output of chcon command in %%post, because otherwise users get this: - "chcon: can't apply partial context to unlabeled file" when installing with - selinux disabled (bz 246820) - -* Fri Dec 22 2006 Hans de Goede 4.2.1-2 -- Restore multilib devel goodness patch (make allegro-devel i386 and x86_64 - parallel installable) -- Restore execstack patch so that binaries linked against allegro do not - require an execstack and thus work under selinux (without this - liballeg_unshareable.a contains object files which require an executable - stack which will end up in any app linked against allegro) -- Make alleg-dga2.so plugin 100% PIC so it can load with selinux enabled -- Mark alleg-vga.so plugin as textrel_shlib_t as it isn't 100% PIC and cannot - be fixed (easily) to be 100% PIC - -* Tue Nov 28 2006 Jindrich Novy 4.2.1-1 -- update to 4.2.1 - -* Sun Oct 15 2006 Hans de Goede 4.2.0-18 -- Multilib devel goodness (make allegro-devel i386 and x86_64 parallel - installable) - -* Sat Sep 2 2006 Hans de Goede 4.2.0-17 -- FE6 Rebuild - -* Fri Jul 14 2006 Hans de Goede 4.2.0-16 -- Don't package the main allegro lib in -devel as its already in the main - package, iow only put the debug and profile versions -devel. - -* Thu Jul 6 2006 Hans de Goede 4.2.0-15 -- Stop allegro from making applications linked against it claim that they - need an executable stack (Patch11). Unfortunatly this requires a rebuild of - all applications linked against allegro. - -* Mon Jun 26 2006 Jindrich Novy 4.2.0-14 -- compile alld and allp debuging/profiling libraries (#196616) -- fix typo in release caused by recent changes - -* Sat Jun 10 2006 Hans de Goede 4.2.0-13 -- Add autoconf BR for missing autoheader with the new mock config. - -* Tue Mar 21 2006 Hans de Goede 4.2.0-12 -- Sleep in xwindows vsync emulation, instead of busy waiting. -- Add %%{dist} to Release - -* Mon Mar 13 2006 Hans de Goede 4.2.0-11 -- really, _really_ fix asm stretch code on i386 with NX processors, long - story see bugzilla bug 185214 . - -* Sat Mar 11 2006 Hans de Goede 4.2.0-10 -- really fix asm stretch code on i386 with NX processors, on OpenBSD mprotects - first argument does not need to be page-aligned, but on Linux it does. - Note that for this to work you may also need to disable selinux (rh 185214) - -* Wed Mar 8 2006 Hans de Goede 4.2.0-9 -- fix fullscreen <-> window switching bug (bz 183645) -- fix asm stretch code on i386 with NX processors, thanks to openBSD. - -* Mon Feb 27 2006 Hans de Goede 4.2.0-8 -- fix sound not working on PPC (bz 183112) -- fix allegro not finding and loading plugins/modules on x86_64 (bz 183113) - -* Wed Feb 8 2006 Jindrich Novy 4.2.0-7 -- set timidity++ as Requires instead of BuildRequires - -* Tue Feb 7 2006 Jindrich Novy 4.2.0-6 -- fix digmid loading of timidity midi patches (#180154) - -* Wed Jan 25 2006 Jindrich Novy 4.2.0-5 -- update default allegro configuration to use sound successfully, - thanks to Hans de Goede (#178383) -- add timidity++ dependency - -* Mon Jan 23 2006 Hans de Goede 4.2.0-4 -- add allegro-4.2.0-nostrip.patch, so that the main .so file - doesn't get stripped and we actually get debuginfo for it in - allegro-debuginfo - -* Fri Jan 20 2006 Hans de Goede 4.2.0-3 -- update / fix BuildRequires for modular X (bz 178245) - -* Fri Dec 16 2005 Jindrich Novy 4.2.0-2 -- update dependencies for the new modular X -- disable _smp_mflags to workaround build failure caused - by bad dependencies - -* Wed May 25 2005 Jindrich Novy 4.2.0-1 -- update to 4.2.0 -- package dat2c, allegro.m4 -- replace XFree86-devel Buildrequires with xorg-x11-devel -- drop mmaptest, novga, gcc4 patches - -* Wed May 25 2005 Jindrich Novy 4.0.3-13 -- fix compilation on x86_64 (#158648) - -* Sun May 22 2005 Jeremy Katz - 4.0.3-12 -- rebuild on all arches - -* Mon May 2 2005 Jindrich Novy 0:4.0.3-11 -- fix build failures with gcc4 (#156224) -- don't use %%{name} in patch names -- add Czech translation to package description/summary - -* Thu Apr 7 2005 Michael Schwendt -- rebuilt - -* Fri Mar 4 2005 Ville Skyttä -- Split context marked dependency syntax to work around #118773. - -* Sun Feb 13 2005 Ville Skyttä - 0:4.0.3-9 -- Disable vga and vbeaf on all non-%%{ix86}. -- Fix lib paths in allegro-config for 64-bit archs. -- Use *nix commands in allegrorc's [grabber] section. - -* Sun Feb 13 2005 Ville Skyttä - 0:4.0.3-8 -- Build without vga and vbeaf on non-x86-like archs. -- Apply upstream patch to fix build without vga. - -* Fri Nov 12 2004 Ville Skyttä - 0:4.0.3-7 -- Explicitly disable svgalib for now. -- Let rpm take care of all stripping. -- Build with whatever the compiler supports, MMX and friends are detected - at runtime. -- Minor specfile style improvements. - -* Wed Nov 10 2004 Michael Schwendt - 0:4.0.3-6 -- Fix build for FC3 via fixed mmap test in configure script. - -* Mon Nov 10 2003 Ville Skyttä - 0:4.0.3-0.fdr.5 -- Use MMX/SSE where appropriate (bug 959). - -* Mon May 26 2003 Ville Skyttä - 0:4.0.3-0.fdr.4 -- Include *.so.* symlink. -- Re-introduce ldconfigs. -- *grumble* - -* Mon May 26 2003 Ville Skyttä - 0:4.0.3-0.fdr.3 -- -devel Requires XFree86-devel. - -* Mon May 26 2003 Ville Skyttä - 0:4.0.3-0.fdr.2 -- Handle --excludedocs installs gracefully. -- BuildRequires arts-devel. -- Make *.so executable so RPM groks autodependencies. -- Update to accordance with current Fedora spec template. - -* Sat Apr 26 2003 Ville Skyttä - 0:4.0.3-0.fdr.1 -- Update to 4.0.3. -- Make build honor optflags. -- Remove redundant ldconfigs. - -* Sat Apr 5 2003 Ville Skyttä - 0:4.0.3-0.fdr.0.1.rc3 -- Update to 4.0.3RC3. - -* Thu Mar 20 2003 Ville Skyttä - 0:4.0.3-0.fdr.0.1.rc2 -- Update to 4.0.3RC2, and to current Fedora guidelines. -- make -jX works again. -- Don't remove info files on -devel upgrade. - -* Wed Feb 19 2003 Warren Togami 4.0.3-0.beta2.fedora.2 -- Disable smp make flags, Makefile needs fixing - -* Wed Feb 12 2003 Ville Skyttä - 4.0.3-0.beta2.fedora.1 -- First Fedora release, based on upstream source RPM. - -* Fri Dec 07 2001 Angelo Mottola 4.0.0-1 -- added italian translation - -* Tue Oct 02 2001 Peter Wang 3.9.39-1 -- icon courtesy of Johan Peitz - -* Mon Sep 24 2001 Peter Wang -- remaining translations by Eric Botcazou and Grzegorz Adam Hankiewicz - -* Sun Sep 23 2001 Peter Wang -- translations by Eric Botcazou and Javier González -- language.dat and keyboard.dat moved to main package -- devel split into devel and tools packages -- makedoc added to tools package - -* Sun Sep 16 2001 Peter Wang -- merged Osvaldo's spec file with gfoot's spec and some other changes - -* Wed Sep 27 2000 Osvaldo Santana Neto -- updated to 3.9.33 From 551b78696b549505f793922a8f0b57aaa61fab90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:42:43 +0000 Subject: [PATCH 03/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index 4386a6c..3fc1a72 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -388,6 +388,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 4.4.3.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 26 2023 Hans de Goede - 4.4.3.1-11 - Fix dat2c bug causing FTBFS of allegro using packages (rhbz#2225996) - Trim changelog From 2f12f09bab398ad5c6b38d4cded950d5b7bbe567 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:54:32 +0000 Subject: [PATCH 04/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index 3fc1a72..bdd9bec 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -388,6 +388,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 4.4.3.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 4.4.3.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c3876b3aae8fb2282c21d0c4c7e54e4e2b8d071c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:51:00 +0000 Subject: [PATCH 05/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index bdd9bec..7d5ca77 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -388,6 +388,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 4.4.3.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 4.4.3.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2f1070e9365cc45c296e965dae92fe47264816f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 16 Jan 2025 06:59:50 +0000 Subject: [PATCH 06/11] Migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- allegro.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/allegro.spec b/allegro.spec index 7d5ca77..f1ce40a 100644 --- a/allegro.spec +++ b/allegro.spec @@ -149,7 +149,7 @@ sound through JACK (Jack Audio Connection Kit). %package -n alleggl Summary: OpenGL support library for Allegro -License: zlib or GPL+ +License: Zlib OR GPL-1.0-or-later URL: http://allegrogl.sourceforge.net/ Requires: %{name}%{?_isa} = %{version}-%{release} @@ -162,7 +162,7 @@ that things like glut do. %package -n alleggl-devel Summary: Development files for alleggl -License: zlib or GPL+ +License: Zlib OR GPL-1.0-or-later Requires: alleggl%{?_isa} = %{version}-%{release} %description -n alleggl-devel @@ -172,7 +172,7 @@ developing applications that use alleggl. %package -n jpgalleg Summary: JPEG library for the Allegro game library -License: zlib +License: Zlib URL: http://www.ecplusplus.com/index.php?page=projects&pid=1 Requires: %{name}%{?_isa} = %{version}-%{release} @@ -182,7 +182,7 @@ using JPEG's as Allegro bitmaps. %package -n jpgalleg-devel Summary: Development files for jpgalleg -License: zlib +License: Zlib Requires: jpgalleg%{?_isa} = %{version}-%{release} %description -n jpgalleg-devel @@ -192,7 +192,7 @@ developing applications that use jpgalleg. %package loadpng Summary: OGG/Vorbis library for the Allegro game library -License: Public Domain +License: LicenseRef-Fedora-Public-Domain URL: http://wiki.allegro.cc/index.php?title=LoadPNG Requires: %{name}%{?_isa} = %{version}-%{release} @@ -202,7 +202,7 @@ save bitmaps from Allegro programs. %package loadpng-devel Summary: Development files for loadpng -License: Public Domain +License: LicenseRef-Fedora-Public-Domain Requires: %{name}-loadpng%{?_isa} = %{version}-%{release} %description loadpng-devel From c52cd73b4c6a3f8d0d92ed065ced668bfb53a1bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:52:13 +0000 Subject: [PATCH 07/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index 7d5ca77..b925b87 100644 --- a/allegro.spec +++ b/allegro.spec @@ -3,7 +3,7 @@ Name: allegro Version: 4.4.3.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -388,6 +388,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 4.4.3.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 4.4.3.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 8937f92105d1f28798c25489cc2efdce2f9c9cce Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Fri, 30 May 2025 16:22:24 +0200 Subject: [PATCH 08/11] Allow to build with CMake 4.0 --- allegro.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/allegro.spec b/allegro.spec index f77cc18..41468ae 100644 --- a/allegro.spec +++ b/allegro.spec @@ -1,9 +1,6 @@ -# Force out of source build -%undefine __cmake_in_source_build - Name: allegro Version: 4.4.3.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -38,7 +35,7 @@ Patch14: allegro-4.4.3-dat2c-buffer-overflow.patch BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: texinfo cmake3 +BuildRequires: texinfo cmake BuildRequires: xorg-x11-proto-devel libX11-devel libXpm-devel libXcursor-devel BuildRequires: libXxf86vm-devel libXxf86dga-devel libGL-devel libGLU-devel BuildRequires: alsa-lib-devel jack-audio-connection-kit-devel @@ -232,9 +229,10 @@ developing applications that use logg. %autosetup -p1 %build -%cmake3 -DOpenGL_GL_PREFERENCE:STRING=LEGACY -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \ +export CMAKE_POLICY_VERSION_MINIMUM=3.5 +%cmake -DOpenGL_GL_PREFERENCE:STRING=LEGACY -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \ -DDOCDIR:STRING=%{_pkgdocdir} -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE -%cmake3_build +%cmake_build pushd %{_vpath_builddir} # Converting text documentation to UTF-8 encoding. @@ -248,7 +246,7 @@ done popd %install -%cmake3_install +%cmake_install pushd %{_vpath_builddir} # installation of these is broken, because they use a cmake GLOB, but @@ -388,6 +386,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Fri May 30 2025 Cristian Le - 4.4.3.1-16 +- Allow to build with CMake 4.0 + * Thu Jan 16 2025 Fedora Release Engineering - 4.4.3.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 60b3052206a97916dbae1b23f44d638b680e0943 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Thu, 17 Jul 2025 15:27:13 +0200 Subject: [PATCH 09/11] Add LIB_SUFFIX flag explicitly --- allegro.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/allegro.spec b/allegro.spec index 41468ae..e110580 100644 --- a/allegro.spec +++ b/allegro.spec @@ -1,6 +1,6 @@ Name: allegro Version: 4.4.3.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -230,7 +230,11 @@ developing applications that use logg. %build export CMAKE_POLICY_VERSION_MINIMUM=3.5 -%cmake -DOpenGL_GL_PREFERENCE:STRING=LEGACY -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \ +%cmake \ +%if "%{?_lib}" == "lib64" + %{?_cmake_lib_suffix64} \ +%endif + -DOpenGL_GL_PREFERENCE:STRING=LEGACY -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \ -DDOCDIR:STRING=%{_pkgdocdir} -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE %cmake_build @@ -386,6 +390,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Thu Jul 17 2025 Cristian Le - 4.4.3.1-17 +- Add LIB_SUFFIX flag explicitly (rhbz#2381173) + * Fri May 30 2025 Cristian Le - 4.4.3.1-16 - Allow to build with CMake 4.0 From fff1693034d88519e51be9369695eafc0362388d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:54:01 +0000 Subject: [PATCH 10/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index e110580..d31a292 100644 --- a/allegro.spec +++ b/allegro.spec @@ -1,6 +1,6 @@ Name: allegro Version: 4.4.3.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -390,6 +390,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 4.4.3.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jul 17 2025 Cristian Le - 4.4.3.1-17 - Add LIB_SUFFIX flag explicitly (rhbz#2381173) From 8698323496e235eaada3102e9ead0348f2c2f21d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:35:33 +0000 Subject: [PATCH 11/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- allegro.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/allegro.spec b/allegro.spec index d31a292..8005301 100644 --- a/allegro.spec +++ b/allegro.spec @@ -1,6 +1,6 @@ Name: allegro Version: 4.4.3.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -390,6 +390,9 @@ install -pm 644 addons/jpgalleg/readme.txt \ %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 4.4.3.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 4.4.3.1-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild