update to 2.1 [release 2.1-1mamba;Sun Feb 14 2021]

README.md

@@ -3,5 +3,3 @@
 JBIG-KIT provides a portable library of compression and decompression functions with a documented interfaces that you can include very easily into your image or document processing software.
 In addiction, JBIG-KIT provides ready-to-use compression adn decompression programs with a simple command line interface (similar to the converters found in netpbm).
 
-JBIG-KIT zawiera implementację wydajnego algorytmu kompresji dla 2-kolorowych obrazków wysokiej rozdzielczości, takich jak faksy albo skanowane dokumenty.
-

libjbig.spec

@@ -1,50 +1,59 @@
 Name:          libjbig
-Version:       2.0
+Version:       2.1
-Release:       2mamba
+Release:       1mamba
 Summary:       JBIG-KIT lossless image compression library
 Group:         System/Libraries
 Vendor:        openmamba
 Distribution:  openmamba
-Packager:      Tiziana Ferro <tiziana.ferro@email.it>
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://www.cl.cam.ac.uk/~mgk25/jbigkit
+URL:           https://www.cl.cam.ac.uk/~mgk25/jbigkit
 Source:        http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-%{version}.tar.gz
+Source1:       http://deb.debian.org/debian/pool/main/j/jbigkit/jbigkit_%{version}-3.1.debian.tar.xz
 Patch0:        %{name}-2.0-shlib.patch
 License:       GPL
-BuildRequires: libtool
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
 ## AUTOBUILDREQ-END
+BuildRequires: libtool
+%ifarch x86_64 aarch64
+Provides:      libjbig.so.2.0()(64bit)
+%else
+Provides:      libjbig.so.2.0
+%endif
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 JBIG-KIT provides a portable library of compression and decompression functions with a documented interfaces that you can include very easily into your image or document processing software.
 In addiction, JBIG-KIT provides ready-to-use compression adn decompression programs with a simple command line interface (similar to the converters found in netpbm).
 
-%description -l pl.UTF-8
-JBIG-KIT zawiera implementację wydajnego algorytmu kompresji dla 2-kolorowych obrazków wysokiej rozdzielczości, takich jak faksy albo skanowane dokumenty.
-
 %package -n libjbig-devel
 Summary:      Header files and static library for development with JBIG
 Group:        Development/Libraries
-Requires:     %{name} = %{version}-%{release} 
+Requires:     %{name} = %{?epoch:%epoch:}%{version}-%{release}
 
 %description -n libjbig-devel
 This package is only needed if you plan to develop or compile applications which requires the libjbig library.
 
-%description -n libjbig-devel
+%package -n libjbig-tools
-JBIG-KIT provides a portable library of compression and decompression functions with a documented interfaces that you can include very easily into your image or document processing software.
+Summary:      Tools provided with %{name}
-In addiction, JBIG-KIT provides ready-to-use compression adn decompression programs with a simple command line interface (similar to the converters found in netpbm).
+Group:        Applications/Graphics
+Requires:     %{name} = %{?epoch:%epoch:}%{version}-%{release}
 
-%description -n libjbig-devel -l pl.UTF-8
+%description -n libjbig-tools
-JBIG-KIT zawiera implementację wydajnego algorytmu kompresji dla 2-kolorowych obrazków wysokiej rozdzielczości, takich jak faksy albo skanowane dokumenty.
+This package contains the tools provided with %{name}.
+
+%debug_package
 
 %prep
-%setup -q -n jbigkit
+%setup -q -n jbigkit-%{version} -a1
-%patch0 -p1
+patch --forward --strip=1 -i debian/patches/allNewMainMakefile.diff
+patch --forward --strip=1 -i debian/patches/pbmtoolsMakefile.diff
+patch --forward --strip=1 -i debian/patches/shared-lib.diff
 
 %build
 %make
 make test
+
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 mkdir -p %{buildroot}%{_bindir} \
@@ -58,10 +67,12 @@ install -m 755 pbmtools/jbgtopbm %{buildroot}%{_bindir}
 install -m 755 pbmtools/pbmtojbg %{buildroot}%{_bindir}
 install -m 644 libjbig/jbig.h %{buildroot}%{_includedir}
 install -m 644 libjbig/jbig_ar.h %{buildroot}%{_includedir}
-install -m 755 libjbig/libjbig.so.2.0 %{buildroot}%{_libdir}
+install -m 644 libjbig/libjbig85.a %{buildroot}%{_libdir}
-ln -s libjbig.so.2.0 %{buildroot}%{_libdir}/libjbig.so
+install -m 755 libjbig/libjbig.so.0 %{buildroot}%{_libdir}
-install -m 755 libjbig/libjbig85.so.2.0 %{buildroot}%{_libdir}
+ln -s libjbig.so.0 %{buildroot}%{_libdir}/libjbig.so
-ln -s libjbig85.so.2.0 %{buildroot}%{_libdir}/libjbig85.so
+ln -s libjbig.so.0 %{buildroot}%{_libdir}/libjbig.so.2.0
+#install -m 755 libjbig/libjbig85.so.%{version} %{buildroot}%{_libdir}
+#ln -s libjbig85.so.2.0 %{buildroot}%{_libdir}/libjbig85.so
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -71,21 +82,26 @@ ln -s libjbig85.so.2.0 %{buildroot}%{_libdir}/libjbig85.so
 
 %files
 %defattr(-,root,root)
-%{_bindir}/*
 %{_libdir}/libjbig.so.*
-%{_libdir}/libjbig85.so.*
-%{_mandir}/man1/*
 %doc COPYING
 
-%files -n libjbig-devel
+%files devel
 %defattr(-,root,root)
 %{_includedir}/jbig.h
 %{_includedir}/jbig_ar.h
 %{_libdir}/libjbig.so
-%{_libdir}/libjbig85.so
+%{_libdir}/libjbig85.a
 %doc ANNOUNCE TODO libjbig/jbig.txt
 
+%files tools
+%defattr(-,root,root)
+%{_bindir}/*
+%{_mandir}/man1/*
+
 %changelog
+* Sun Feb 14 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2.1-1mamba
+- update to 2.1
+
 * Mon Dec 19 2011 Silvan Calarco <silvan.calarco@mambasoft.it> 2.0-2mamba
 - added patch to build shared library
 - install required header file jbig_ar.h