From 58e36f435b91e7d6cda4aaa2b552a142d3f67a74be700667bf1f5cce615b0831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 29 May 2012 16:32:59 +0000 Subject: [PATCH] Accepting request 122795 from home:aljex:branches:graphics Enable jbig support for > 1210, Fix building for *suse versions 10.0 to current. Jbig is in factory now. OBS-URL: https://build.opensuse.org/request/show/122795 OBS-URL: https://build.opensuse.org/package/show/graphics/tiff?expand=0&rev=43 --- tiff.changes | 6 ++++++ tiff.spec | 14 +++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/tiff.changes b/tiff.changes index 7575933..1a3769b 100644 --- a/tiff.changes +++ b/tiff.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 10 17:37:25 UTC 2012 - brian@aljex.com + +- Fix building on older targets from SUSE 10.0 to current. +- Add jbig support + ------------------------------------------------------------------- Thu Mar 29 09:51:49 UTC 2012 - idonmez@suse.com diff --git a/tiff.spec b/tiff.spec index dbef2c3..2156921 100644 --- a/tiff.spec +++ b/tiff.spec @@ -20,19 +20,28 @@ Name: tiff BuildRequires: gcc-c++ BuildRequires: libjpeg-devel BuildRequires: libtool +%if 0%{?suse_version} > 1030 BuildRequires: lzma-devel +%endif +%if 0%{?suse_version} <= 1000 +BuildRequires: pkgconfig +%endif +%if 0%{?suse_version} > 1000 BuildRequires: pkg-config +%endif BuildRequires: zlib-devel # bug437293 %ifarch ppc64 Obsoletes: tiff-64bit %endif +%if 0%{?suse_version} > 1210 +BuildRequires: libjbig-devel +%endif Version: 4.0.1 Release: 0 Summary: Tools for Converting from and to the Tiff Format License: HPND Group: Productivity/Graphics/Convertors -# Url: http://www.remotesensing.org/libtiff Source: tiff-%{version}.tar.bz2 Source2: README.SUSE @@ -53,7 +62,6 @@ image format. Summary: The Tiff Library (with JPEG and compression support) Group: System/Libraries Provides: libtiff = %{version} -Obsoletes: libtiff < %{version} # bug437293 %ifarch ppc64 Obsoletes: libtiff-64bit @@ -94,7 +102,7 @@ make %{?_smp_mflags} %install mkdir -p %{buildroot}/{%{_mandir}/{man1,man3},usr/{bin,lib,include}} -%make_install +%makeinstall for f in `find %{buildroot}/%{_mandir} -type f -print ` ; do if [ `wc -l <$f` -eq 1 ] && grep -q "^\.so " $f ; then linkto=`sed -e "s|^\.so ||" $f`