import UBI jbigkit-2.1-31.el10

.gitignore

@@ -1 +1 @@
-SOURCES/jbigkit-2.1.tar.gz
+jbigkit-2.1.tar.gz

.jbigkit.metadata

@@ -1 +0,0 @@
-4864646df004e8331d19f2fa103ed731fdb6c099 SOURCES/jbigkit-2.1.tar.gz

jbigkit-2.1-shlib.patch

@@ -20,7 +20,7 @@ diff -Naur jbigkit-2.1.old/libjbig/Makefile jbigkit-2.1/libjbig/Makefile
 -tstcodec85: tstcodec85.o jbig85.o jbig_ar.o
 -	$(CC) $(CFLAGS) -o tstcodec85 tstcodec85.o jbig85.o jbig_ar.o
 +tstcodec85: tstcodec85.o libjbig85.so
-+	$(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig
++	$(CC) $(CFLAGS) -o tstcodec85 $< -L. -ljbig85
  
 -libjbig.a: jbig.o jbig_ar.o
 -	rm -f libjbig.a

jbigkit-ldflags.patch

@@ -9,8 +9,8 @@ diff -up jbigkit-2.1/libjbig/Makefile.ldflags jbigkit-2.1/libjbig/Makefile
 +	$(CC) $(CFLAGS) -o tstcodec $< -L. -ljbig $(LDFLAGS)
  
  tstcodec85: tstcodec85.o libjbig85.so
--	$(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig
-+	$(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig $(LDFLAGS)
+-	$(CC) $(CFLAGS) -o tstcodec85 $< -L. -ljbig85
++	$(CC) $(CFLAGS) -o tstcodec85 $< -L. -ljbig85 $(LDFLAGS)
  
  %.so: %.so.$(VERSION)
  	ln -sf $< $@

jbigkit.spec

@@ -1,19 +1,25 @@
 Name:           jbigkit
 Version:        2.1
-Release:        14%{?dist}
+Release:        31%{?dist}
 Summary:        JBIG1 lossless image compression tools
 
-License:        GPLv2+
+License:        GPL-2.0-or-later
 URL:            http://www.cl.cam.ac.uk/~mgk25/jbigkit/
 Source0:        http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-%{version}.tar.gz
 Patch0:         jbigkit-2.1-shlib.patch
 Patch1:         jbigkit-2.0-warnings.patch
+# jbigkit: Partial Fedora build flags injection (bug #1548546)
 Patch2:         jbigkit-ldflags.patch
+# patch for coverity issues - backported from upstream
 Patch3:         jbigkit-covscan.patch
 
 # gcc is no longer in buildroot by default
 # gcc needed for libjbig library and several filters - jbigtopbm, pbmtojbig e.g.
 BuildRequires: gcc
+# uses make
+BuildRequires: make
+# uses autosetup
+BuildRequires: git-core
 
 Requires:       jbigkit-libs%{?_isa} = %{version}-%{release}
 
@@ -48,13 +54,8 @@ formats.
 
 
 %prep
-%setup -q -n jbigkit-2.1
-%patch0 -p1 -b .shlib
-%patch1 -p1 -b .warnings
-# jbigkit: Partial Fedora build flags injection (bug #1548546)
-%patch2 -p1 -b .ldflags
-# 1602563 - covscan review - patch taken from upstream
-%patch3 -p1 -b .covscan
+%autosetup -n jbigkit-2.1 -S git
+
 
 %build
 # get the correct redhat build flags
@@ -83,27 +84,83 @@ install -p -m0644 pbmtools/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 %check
 make test
 
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
+%ldconfig_scriptlets libs
 
 %files
-%{_bindir}/???to*
-%{_mandir}/man1/*
+%{_bindir}/jbgtopbm
+%{_bindir}/jbgtopbm85
+%{_bindir}/pbmtojbg
+%{_bindir}/pbmtojbg85
+%{_mandir}/man1/jbgtopbm.1.gz
+%{_mandir}/man1/pbmtojbg.1.gz
 %license COPYING
 
 %files libs
-%{_libdir}/libjbig*.so.%{version}
+%{_libdir}/libjbig.so.2.1
+%{_libdir}/libjbig85.so.2.1
 %doc ANNOUNCE TODO CHANGES
 %license COPYING
 
 %files devel
-%{_libdir}/libjbig*.so
+%{_libdir}/libjbig.so
+%{_libdir}/libjbig85.so
 %{_includedir}/jbig*.h
 
 %changelog
-* Thu Oct 25 2018 Zdenek Dohnal <zdohnal@redhat.com> - 2.1-14
-- 1602563 - Please review important issues found by covscan in "jbigkit-2.1-12.el8+7" package
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.1-31
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.1-30
+- Bump release for June 2024 mass rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Nov 23 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2.1-27
+- SPDX migration, spec update
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2.1-20
+- make is no longer in buildroot by default
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Oct 25 2018 Zdenek Dohnal <zdohnal@redhat.com> - 2.1-15
+- fixed typo found by coverity
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Wed Jul 11 2018 Zdenek Dohnal <zdohnal@redhat.com> - 2.1-13
 - ship license in correct tag

sources

@@ -0,0 +1 @@
+SHA512 (jbigkit-2.1.tar.gz) = c4127480470ef90db1ef3bd2caa444df10b50ed8df0bc9997db7612cb48b49278baf44965028f1807a21028eb965d677e015466306b44683c4ec75a23e1922cf