Skip to content

Commit a677cd3

Browse files
authored
jbigkit :fixed build (#12774)
1 parent a3a1530 commit a677cd3

3 files changed

Lines changed: 17 additions & 13 deletions

File tree

SPECS-EXTENDED/jbigkit/jbigkit-2.1-shlib.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ diff -Naur jbigkit-2.1.old/libjbig/Makefile jbigkit-2.1/libjbig/Makefile
2020
-tstcodec85: tstcodec85.o jbig85.o jbig_ar.o
2121
- $(CC) $(CFLAGS) -o tstcodec85 tstcodec85.o jbig85.o jbig_ar.o
2222
+tstcodec85: tstcodec85.o libjbig85.so
23-
+ $(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig
23+
+ $(CC) $(CFLAGS) -o tstcodec85 $< -L. -ljbig85
2424

2525
-libjbig.a: jbig.o jbig_ar.o
2626
- rm -f libjbig.a

SPECS-EXTENDED/jbigkit/jbigkit-ldflags.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ diff -up jbigkit-2.1/libjbig/Makefile.ldflags jbigkit-2.1/libjbig/Makefile
99
+ $(CC) $(CFLAGS) -o tstcodec $< -L. -ljbig $(LDFLAGS)
1010

1111
tstcodec85: tstcodec85.o libjbig85.so
12-
- $(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig
13-
+ $(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig $(LDFLAGS)
12+
- $(CC) $(CFLAGS) -o tstcodec85 $< -L. -ljbig85
13+
+ $(CC) $(CFLAGS) -o tstcodec85 $< -L. -ljbig85 $(LDFLAGS)
1414

1515
%.so: %.so.$(VERSION)
1616
ln -sf $< $@

SPECS-EXTENDED/jbigkit/jbigkit.spec

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Vendor: Microsoft Corporation
22
Distribution: Azure Linux
33
Name: jbigkit
44
Version: 2.1
5-
Release: 19%{?dist}
5+
Release: 20%{?dist}
66
Summary: JBIG1 lossless image compression tools
77

88
License: GPLv2+
@@ -17,6 +17,8 @@ Patch3: jbigkit-covscan.patch
1717
# gcc is no longer in buildroot by default
1818
# gcc needed for libjbig library and several filters - jbigtopbm, pbmtojbig e.g.
1919
BuildRequires: gcc
20+
BuildRequires: make
21+
BuildRequires: git-core
2022

2123
Requires: jbigkit-libs%{?_isa} = %{version}-%{release}
2224

@@ -51,13 +53,7 @@ formats.
5153

5254

5355
%prep
54-
%setup -q -n jbigkit-2.1
55-
%patch 0 -p1 -b .shlib
56-
%patch 1 -p1 -b .warnings
57-
# jbigkit: Partial Fedora build flags injection (bug #1548546)
58-
%patch 2 -p1 -b .ldflags
59-
# covscan issues - backported from upstream
60-
%patch 3 -p1 -b .covscan
56+
%autosetup -n jbigkit-2.1 -S git
6157

6258
%build
6359
# get the correct redhat build flags
@@ -89,8 +85,12 @@ make test
8985
%ldconfig_scriptlets libs
9086

9187
%files
92-
%{_bindir}/???to*
93-
%{_mandir}/man1/*
88+
%{_bindir}/jbgtopbm
89+
%{_bindir}/jbgtopbm85
90+
%{_bindir}/pbmtojbg
91+
%{_bindir}/pbmtojbg85
92+
%{_mandir}/man1/jbgtopbm.1.gz
93+
%{_mandir}/man1/pbmtojbg.1.gz
9494
%license COPYING
9595

9696
%files libs
@@ -103,6 +103,10 @@ make test
103103
%{_includedir}/jbig*.h
104104

105105
%changelog
106+
* Tue Mar 04 2025 Jyoti Kanase <v-jykanase@microsoft.com> - 2.1-20
107+
- Updated patch to fix build
108+
- License Verified
109+
106110
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.1-19
107111
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
108112

0 commit comments

Comments
 (0)