diff --git a/compface-c99.patch b/compface-c99.patch new file mode 100644 index 0000000..2868738 --- /dev/null +++ b/compface-c99.patch @@ -0,0 +1,29 @@ +Include for the read and write functions, to avoid implicit +function declarations and build failures with future compilers. + +diff --git a/cmain.c b/cmain.c +index ec0558d11cdd325d..aced8300d55d17fd 100644 +--- a/cmain.c ++++ b/cmain.c +@@ -19,6 +19,8 @@ + #include "config.h" + #endif + ++#include ++ + #include "compface.h" + + /* the buffer is longer than needed to handle sparse input formats */ +diff --git a/uncmain.c b/uncmain.c +index a94279df1ff73223..e52831d0c0f117e1 100644 +--- a/uncmain.c ++++ b/uncmain.c +@@ -19,6 +19,8 @@ + #include "config.h" + #endif + ++#include ++ + #include "compface.h" + + /* the buffer is longer than needed to handle sparse input formats */ diff --git a/compface-configure-c99.patch b/compface-configure-c99.patch new file mode 100644 index 0000000..c3778ab --- /dev/null +++ b/compface-configure-c99.patch @@ -0,0 +1,27 @@ +Fix historic C99 incompatibilites that would go away if autoconf is +re-run. + +diff --git a/configure b/configure +index 5b6327937cb0aa69..4183e8677260324f 100755 +--- a/configure ++++ b/configure +@@ -2128,7 +2128,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ +- '' \ ++ '#include ' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ +@@ -2821,8 +2821,8 @@ main () + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ return 2; ++ return 0; + } + _ACEOF + rm -f conftest$ac_exeext diff --git a/compface.spec b/compface.spec index fb3fecc..b7ae279 100644 --- a/compface.spec +++ b/compface.spec @@ -1,9 +1,9 @@ Name: compface Version: 1.5.2 -Release: 29%{?dist} +Release: 46%{?dist} Summary: Library and tools for handling X-Face data -License: MIT +License: LicenseRef-compface URL: http://ftp.xemacs.org/pub/xemacs/aux/ Source0: http://ftp.xemacs.org/pub/xemacs/aux/%{name}-%{version}.tar.gz Source1: compface-test.xbm @@ -15,8 +15,11 @@ Patch0: libcompface_1.5.2-4.diff.gz Patch1: compface-1.5.2-stack-smashing.patch # Patch2: compface-1.5.2-build.patch +Patch3: compface-configure-c99.patch +Patch4: compface-c99.patch BuildRequires: diffutils BuildRequires: gcc +BuildRequires: make %description This is the Compface image compression and decompression library and its @@ -35,9 +38,11 @@ library. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -b .stack-smashing -%patch2 -p0 +%patch -P0 -p1 +%patch -P1 -p1 -b .stack-smashing +%patch -P2 -p0 +%patch -P3 -p1 +%patch -P4 -p1 %build @@ -58,7 +63,7 @@ cmp %{SOURCE1} __test.xbm %files %doc ChangeLog README xbm2xface.pl -%doc _extdoc/README.copyright +%license _extdoc/README.copyright %{_bindir}/compface %{_bindir}/uncompface %{_libdir}/libcompface.so.* @@ -73,6 +78,58 @@ cmp %{SOURCE1} __test.xbm %changelog +* Wed Jul 15 2026 Fedora Release Engineering - 1.5.2-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Fri Jan 16 2026 Fedora Release Engineering - 1.5.2-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jan 16 2026 Fedora Release Engineering - 1.5.2-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Wed Jul 23 2025 Fedora Release Engineering - 1.5.2-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Jan 16 2025 Fedora Release Engineering - 1.5.2-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Aug 7 2024 Michael Schwendt - 1.5.2-41 +- migrated to SPDX license based on license review ticket #555 +- include README.copyright file as license + +* Wed Jul 17 2024 Fedora Release Engineering - 1.5.2-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 1.5.2-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.5.2-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 1.5.2-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Feb 06 2023 Florian Weimer - 1.5.2-36 +- Fix C99 compatibility issues (#2167369) + +* Thu Jan 19 2023 Fedora Release Engineering - 1.5.2-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 1.5.2-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jan 19 2022 Fedora Release Engineering - 1.5.2-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1.5.2-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.5.2-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.5.2-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 1.5.2-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild