diff --git a/libtiff-am-version.patch b/libtiff-am-version.patch deleted file mode 100644 index c94c2e0055b927a7eae8b692db58d112348a94da..0000000000000000000000000000000000000000 --- a/libtiff-am-version.patch +++ /dev/null @@ -1,31 +0,0 @@ -Back off the minimum required automake version to 1.11. There isn't -anything in libtiff currently that actually requires 1.12, and changing -this allows the package to be built on pre-F18 machines for easier testing. - -This patch can go away once we no longer care about testing on pre-F18. - - -diff -Naur tiff-4.0.3.orig/Makefile.am tiff-4.0.3/Makefile.am ---- tiff-4.0.3.orig/Makefile.am 2012-09-20 09:22:47.000000000 -0400 -+++ tiff-4.0.3/Makefile.am 2012-10-30 11:33:30.312823564 -0400 -@@ -25,7 +25,7 @@ - - docdir = $(LIBTIFF_DOCDIR) - --AUTOMAKE_OPTIONS = 1.12 dist-zip foreign -+AUTOMAKE_OPTIONS = 1.11 dist-zip foreign - ACLOCAL_AMFLAGS = -I m4 - - docfiles = \ -diff -Naur tiff-4.0.3.orig/test/Makefile.am tiff-4.0.3/test/Makefile.am ---- tiff-4.0.3.orig/test/Makefile.am 2012-09-20 09:22:28.000000000 -0400 -+++ tiff-4.0.3/test/Makefile.am 2012-10-30 11:33:17.109696812 -0400 -@@ -23,7 +23,7 @@ - - # Process this file with automake to produce Makefile.in. - --AUTOMAKE_OPTIONS = 1.12 color-tests parallel-tests foreign -+AUTOMAKE_OPTIONS = 1.11 color-tests parallel-tests foreign - - LIBTIFF = $(top_builddir)/libtiff/libtiff.la - diff --git a/libtiff-make-check.patch b/libtiff-make-check.patch deleted file mode 100644 index e79dc94d1908e3282641ac5fc14afcaf7052957f..0000000000000000000000000000000000000000 --- a/libtiff-make-check.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/html/man/Makefile.am b/html/man/Makefile.am -index 587296c..696005e 100644 ---- a/html/man/Makefile.am -+++ b/html/man/Makefile.am -@@ -92,7 +92,6 @@ docfiles = \ - tiffcrop.1.html \ - tiffdither.1.html \ - tiffdump.1.html \ -- tiffgt.1.html \ - tiffinfo.1.html \ - tiffmedian.1.html \ - tiffset.1.html \ diff --git a/libtiff.spec b/libtiff.spec index 4f125f007d670af6d0a8704cd228ebf9d431664b..b45e07fd1438e0a905061a9372115270c4804473 100644 --- a/libtiff.spec +++ b/libtiff.spec @@ -1,20 +1,17 @@ -%define anolis_release 2 +%define anolis_release 1 Summary: Library of functions for manipulating TIFF format image files Name: libtiff -Version: 4.4.0 +Version: 4.5.0 Release: %{anolis_release}%{?dist} License: libtiff URL: http://www.simplesystems.org/libtiff/ -Source: http://download.osgeo.org/libtiff/tiff-%{version}.tar.gz - -Patch0: libtiff-am-version.patch -Patch1: libtiff-make-check.patch +Source: http://download.osgeo.org/libtiff/tiff-%{version}.tar.xz BuildRequires: gcc, gcc-c++ -BuildRequires: zlib-devel libjpeg-devel jbigkit-devel libzstd-devel libwebp-devel -BuildRequires: libtool automake autoconf pkgconfig -BuildRequires: make +BuildRequires: zlib-devel libjpeg-devel jbigkit-devel libzstd-devel libwebp-devel glut-devel xz-devel +BuildRequires: python3-sphinx +BuildRequires: cmake %description The libtiff package contains a library of functions for manipulating @@ -36,7 +33,6 @@ The %{name}-doc package contains documentation files for %{name}. %package devel Summary: Development tools for programs which will use the libtiff library Requires: %{name} = %{version}-%{release} -Requires: pkgconfig %description devel This package contains the header files and documentation necessary for @@ -64,57 +60,37 @@ Requires: %{name} = %{version}-%{release} This package contains command-line programs for manipulating TIFF format image files using the libtiff library. -%prep -%autosetup -p1 -n tiff-%{version} +%package opengl +Summary: Command-line utility programs for manipulating TIFF files +Requires: %{name} = %{version}-%{release} -# Use build system's libtool.m4, not the one in the package. -rm -f libtool.m4 +%description opengl +This package contains command-line programs for manipulating TIFF format +image files using the libtiff library. It complements the libtiff-tools +package, which contains the libtiff tools that don't depend upon opengl. -libtoolize --force --copy -aclocal -I . -I m4 -automake --add-missing --copy -autoconf -autoheader +%prep +%autosetup -p1 -n tiff-%{version} %build export CFLAGS="%{optflags} -fno-strict-aliasing" -%configure --enable-ld-version-script -%make_build +%cmake +%cmake_build %install -%make_install +%cmake_install # remove what we didn't want installed -rm $RPM_BUILD_ROOT%{_libdir}/*.la rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/ -# no libGL dependency, please -rm -f $RPM_BUILD_ROOT%{_bindir}/tiffgt - -# no sgi2tiff or tiffsv, either -rm -f $RPM_BUILD_ROOT%{_bindir}/sgi2tiff -rm -f $RPM_BUILD_ROOT%{_bindir}/tiffsv - -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/tiffgt.1 -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/sgi2tiff.1 -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/tiffsv.1 -rm -f html/man/tiffgt.1.html -rm -f html/man/sgi2tiff.1.html -rm -f html/man/tiffsv.1.html - %generate_compatibility_deps -%ldconfig_scriptlets - %check -LD_LIBRARY_PATH=$PWD:$LD_LIBRARY_PATH make check - -# don't include documentation Makefiles, they are a multilib hazard -find html -name 'Makefile*' | xargs rm +%ctest %files %dir %{abidir} -%license COPYRIGHT +%license LICENSE.md %{_libdir}/libtiff.so.* %{_libdir}/libtiffxx.so.* %{abidir}/libtiff*.dump @@ -123,22 +99,82 @@ find html -name 'Makefile*' | xargs rm %doc README.md RELEASE-DATE VERSION %files devel -%doc TODO ChangeLog html +%doc TODO ChangeLog doc/html-prebuilt/* %{_includedir}/* %{_libdir}/libtiff.so %{_libdir}/libtiffxx.so %{_libdir}/pkgconfig/libtiff*.pc +%dir %{_libdir}/cmake +%{_libdir}/cmake/tiff %{_mandir}/man3/* -%files static -%{_libdir}/*.a - %files tools -%{_bindir}/* -%{abidir}/*-option.list -%{_mandir}/man1/* +%{_bindir}/fax2ps +%{_bindir}/fax2tiff +%{_bindir}/pal2rgb +%{_bindir}/ppm2tiff +%{_bindir}/raw2tiff +%{_bindir}/tiff2bw +%{_bindir}/tiff2pdf +%{_bindir}/tiff2ps +%{_bindir}/tiff2rgba +%{_bindir}/tiffcmp +%{_bindir}/tiffcp +%{_bindir}/tiffcrop +%{_bindir}/tiffdither +%{_bindir}/tiffdump +%{_bindir}/tiffinfo +%{_bindir}/tiffmedian +%{_bindir}/tiffset +%{_bindir}/tiffsplit +%{abidir}/fax2ps-option.list +%{abidir}/fax2tiff-option.list +%{abidir}/pal2rgb-option.list +%{abidir}/ppm2tiff-option.list +%{abidir}/raw2tiff-option.list +%{abidir}/tiff2bw-option.list +%{abidir}/tiff2pdf-option.list +%{abidir}/tiff2rgba-option.list +%{abidir}/tiffcmp-option.list +%{abidir}/tiffcp-option.list +%{abidir}/tiffcrop-option.list +%{abidir}/tiffdither-option.list +%{abidir}/tiffinfo-option.list +%{abidir}/tiffmedian-option.list +%{abidir}/tiffsplit-option.list +%{_mandir}/man1/fax2ps.1* +%{_mandir}/man1/fax2tiff.1* +%{_mandir}/man1/pal2rgb.1* +%{_mandir}/man1/ppm2tiff.1* +%{_mandir}/man1/raw2tiff.1* +%{_mandir}/man1/rgb2ycbcr.1* +%{_mandir}/man1/thumbnail.1* +%{_mandir}/man1/tiff2bw.1* +%{_mandir}/man1/tiff2pdf.1* +%{_mandir}/man1/tiff2ps.1* +%{_mandir}/man1/tiff2rgba.1* +%{_mandir}/man1/tiffcmp.1* +%{_mandir}/man1/tiffcp.1* +%{_mandir}/man1/tiffcrop.1* +%{_mandir}/man1/tiffdither.1* +%{_mandir}/man1/tiffdump.1* +%{_mandir}/man1/tiffinfo.1* +%{_mandir}/man1/tiffmedian.1* +%{_mandir}/man1/tiffset.1* +%{_mandir}/man1/tiffsplit.1* + +%files opengl +%{_bindir}/tiffgt +%{abidir}/tiffgt-option.list +%{_mandir}/man1/tiffgt.1* %changelog +* Wed Jan 18 2023 Funda Wang - 4.5.0-1 +- New version 4.5.0 +- Build using cmake +- Drop static as cmake does not support building it right now +- Split out tiffgt as what debian does + * Wed Oct 19 2022 mgb01105731 - 4.4.0-2 - optimise spec file & add doc package diff --git a/tiff-4.4.0.tar.gz b/tiff-4.4.0.tar.gz deleted file mode 100644 index 22df21a1fd95da532edf8b61387a21ec3b9fb438..0000000000000000000000000000000000000000 Binary files a/tiff-4.4.0.tar.gz and /dev/null differ diff --git a/tiff-4.5.0.tar.xz b/tiff-4.5.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..9c855698192f825adb7b141715e05776e8c4d9a5 Binary files /dev/null and b/tiff-4.5.0.tar.xz differ