dist-git conversion

#2781)

.gitignore

@@ -1,2 +1,2 @@
 compface-1.5.2.tar.gz
-libcompface_1.5.2-4.diff.gz
+libcompface_1.5.2-3.diff.gz

compface-c99.patch

@@ -1,29 +0,0 @@
-Include <unistd.h> 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 <unistd.h>
-+
- #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 <unistd.h>
-+
- #include "compface.h"
- 
- /* the buffer is longer than needed to handle sparse input formats */

compface-configure-c99.patch

@@ -1,27 +0,0 @@
-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 <stdlib.h>' \
-    '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

compface.spec

@@ -1,48 +1,42 @@
 Name:           compface
 Version:        1.5.2
-Release:        46%{?dist}
-Summary:        Library and tools for handling X-Face data
+Release:        9
+Summary:        Utilities for handling X-Faces
 
-License:        LicenseRef-compface
+Group:          Applications/Multimedia
+License:        MIT
 URL:            http://ftp.xemacs.org/pub/xemacs/aux/
 Source0:        http://ftp.xemacs.org/pub/xemacs/aux/%{name}-%{version}.tar.gz
 Source1:        compface-test.xbm
 Source2:        compface-README.copyright
-# originally from http://ftp.debian.org/debian/pool/main/libc/libcompface/libcompface_1.5.2-4.diff.gz
-# libcompface_1.5.2-5.diff.gz adds a different fix for the stack-smashing
-Patch0:         libcompface_1.5.2-4.diff.gz
-# originally sent upstream
+# originally from http://ftp.debian.org/debian/pool/main/libc/libcompface/libcompface_1.5.2-3.diff.gz
+Patch0:         libcompface_1.5.2-3.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
+Patch2:         %{name}-1.5.2-build.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  diffutils
-BuildRequires:  gcc
-BuildRequires: make
 
 %description
-This is the Compface image compression and decompression library and its
-user tools. Compface converts 48x48 .xbm format (X bitmap) images to a
-compressed format that can be placed in the X-Face: mail header. Some mail
-programs are able to display such images when opening messages.
+Compface is a filter for generating highly compressed representations
+of 48x48x1 face image files, which can be used in mail clients and mail
+notification programs. Uncompface is an inverse filter, which performs
+an inverse transformation with no loss of data.
+
 
 %package        devel
-Summary:        Library and development files for handling X-Face data 
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Summary:        Development files for handling X-Faces
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
-These files are needed when building software that uses the Compface
-library.
+%{summary}.
 
 
 %prep
 %setup -q
-%patch -P0 -p1
-%patch -P1 -p1 -b .stack-smashing
-%patch -P2 -p0
-%patch -P3 -p1
-%patch -P4 -p1
+%patch0 -p1
+%patch1 -p1 -b .stack-smashing
+%patch2 -p0
 
 
 %build
@@ -51,6 +45,7 @@ make %{?_smp_mflags}
 
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT STRIP=/bin/true
 mkdir -p _extdoc && install -p -m 0644 %{SOURCE2} _extdoc/README.copyright
 
@@ -61,9 +56,19 @@ export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}:$LD_LIBRARY_PATH
 cmp %{SOURCE1} __test.xbm
 
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
 %files
+%defattr(-,root,root,-)
 %doc ChangeLog README xbm2xface.pl
-%license _extdoc/README.copyright
+%doc _extdoc/README.copyright
 %{_bindir}/compface
 %{_bindir}/uncompface
 %{_libdir}/libcompface.so.*
@@ -71,6 +76,7 @@ cmp %{SOURCE1} __test.xbm
 %{_mandir}/man1/uncompface.1*
 
 %files devel
+%defattr(-,root,root,-)
 %{_includedir}/compface.h
 %{_libdir}/libcompface.so
 %{_mandir}/man3/compface.3*
@@ -78,122 +84,6 @@ cmp %{SOURCE1} __test.xbm
 
 
 %changelog
-* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-46
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-45
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-44
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-43
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-42
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Aug  7 2024 Michael Schwendt <mschwendt@fedoraproject.org> - 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 <releng@fedoraproject.org> - 1.5.2-40
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-39
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-38
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-37
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Feb 06 2023 Florian Weimer <fweimer@redhat.com> - 1.5.2-36
-- Fix C99 compatibility issues (#2167369)
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-35
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat Feb 21 2015 Till Maas <opensource@till.name> - 1.5.2-19
-- Rebuilt for Fedora 23 Change
-  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan  6 2012 Michael Schwendt <mschwendt@fedoraproject.org> - 1.5.2-13
-- rebuild for GCC 4.7 as requested
-- drop obsolete items from spec file, plus use %%?dist and %%?_isa
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri May 15 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 1.5.2-10
-- Minor spec updates.
-- Sync with Debian's most recent 1.5.2-4 patchset, although it doesn't
-  add anything for us compared with 1.5.2-3.
-
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
 62f4f79c0861ad292ba3cf77b4c48319  compface-1.5.2.tar.gz
-1c805b94cbf31feda738fa1ceb0a6a80  libcompface_1.5.2-4.diff.gz
+330b8a78bf18d8cb46b3c23252f6ff9b  libcompface_1.5.2-3.diff.gz