diff --git a/0001-jbigkit-2.1-shlib.patch b/0001-jbigkit-2.1-shlib.patch index bf5b22a8e25d22503ce59d885f7cbd68cb5bfc1c..e2ae7027059689c04879373ebefc8dee984e2a23 100644 --- a/0001-jbigkit-2.1-shlib.patch +++ b/0001-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 diff --git a/0003-jbigkit-ldflags.patch b/0003-jbigkit-ldflags.patch index e527cb9c9aac02eda6d0a7d522c2341b98b7fab1..bb63ff504d39dce091d304e77c596442678db79b 100644 --- a/0003-jbigkit-ldflags.patch +++ b/0003-jbigkit-ldflags.patch @@ -6,11 +6,11 @@ diff -up jbigkit-2.1/libjbig/Makefile.ldflags jbigkit-2.1/libjbig/Makefile tstcodec: tstcodec.o libjbig.so - $(CC) $(CFLAGS) -o tstcodec $< -L. -ljbig -+ $(CC) $(CFLAGS) -o tstcodec $< -L. -ljbig $(LDFLAGS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -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) $(LDFLAGS) -o tstcodec85 $^ -L. -ljbig85 %.so: %.so.$(VERSION) ln -sf $< $@ diff --git a/jbigkit.spec b/jbigkit.spec index 259acaafa585cd993363c84f5a01208cb7868076..008ceaae9615a22c500f3f6c52b4e582312c3e78 100644 --- a/jbigkit.spec +++ b/jbigkit.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 15 Name: jbigkit Version: 2.1 Release: %{anolis_release}%{?dist} @@ -6,7 +6,7 @@ Summary: JBIG1 lossless image compression tools License: GPLv2+ URL: http://www.cl.cam.ac.uk/~mgk25/jbigkit/ -Source0: %{url}/download/jbigkit-%{version}.tar.gz +Source0: https://www.cl.cam.ac.uk/~mgk25/jbigkit/download/jbigkit-%{version}.tar.gz Patch0: 0001-jbigkit-2.1-shlib.patch Patch1: 0002-jbigkit-2.0-warnings.patch Patch2: 0003-jbigkit-ldflags.patch @@ -96,8 +96,6 @@ install -p -m0644 pbmtools/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 %check make test -%ldconfig_scriptlets libs - %files %{_bindir}/???to* %{_mandir}/man1/* @@ -117,6 +115,9 @@ make test %{_includedir}/jbig*.h %changelog +* Mon Jan 2 2023 Funda Wang - 2.1-15 +- Bump release for upgrading from anolis 8 + * Tue Oct 25 2022 mgb01105731 - 2.1-3 - optimise spec file