Accepting request 648715 from home:scarabeus_iv:branches:graphics

- Support only SLE12+ and remove the no longer needed conditions

OBS-URL: https://build.opensuse.org/request/show/648715
OBS-URL: https://build.opensuse.org/package/show/graphics/tiff?expand=0&rev=131
This commit is contained in:
Michael Vetter 2018-11-13 11:18:03 +00:00 committed by Git OBS Bridge
parent 477879b0e1
commit dbdcd8bdbf
2 changed files with 12 additions and 35 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 13 10:20:45 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>
- Support only SLE12+ and remove the no longer needed conditions
-------------------------------------------------------------------
Tue Nov 13 08:18:54 UTC 2018 - Petr Gajdos <pgajdos@suse.com>

View File

@ -18,14 +18,13 @@
%define asan_build 0
%define debug_build 0
Name: tiff
Version: 4.0.10
Release: 0
Summary: Tools for Converting from and to the Tagged Image File Format
License: HPND
Group: Productivity/Graphics/Convertors
Url: http://www.simplesystems.org/libtiff/
URL: http://www.simplesystems.org/libtiff/
Source: http://download.osgeo.org/libtiff/tiff-%{version}.tar.gz
Source2: README.SUSE
Source3: baselibs.conf
@ -36,26 +35,12 @@ Patch1: tiff-4.0.3-compress-warning.patch
# https://gitlab.com/libtiff/libtiff/merge_requests/44
Patch2: tiff-CVE-2018-12900.patch
BuildRequires: gcc-c++
BuildRequires: libjbig-devel
BuildRequires: libjpeg-devel
BuildRequires: libtool
BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%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
# bug437293
%ifarch ppc64
Obsoletes: tiff-64bit
%endif
%if 0%{?suse_version} > 1210
BuildRequires: libjbig-devel
%endif
BuildRequires: pkgconfig(zlib)
%description
This package contains the library and support programs for the TIFF
@ -65,11 +50,6 @@ image format.
Summary: The Tiff Library (with JPEG and compression support)
Group: System/Libraries
Provides: libtiff = %{version}
# bug437293
%ifarch ppc64
Obsoletes: libtiff-64bit
%endif
#
%description -n libtiff5
This package includes the tiff libraries. To link a program with
@ -82,11 +62,6 @@ Group: Development/Libraries/C and C++
Requires: glibc-devel
Requires: libstdc++-devel
Requires: libtiff5 = %{version}
# bug437293
%ifarch ppc64
Obsoletes: tiff-devel-64bit
%endif
#
%description -n libtiff-devel
This package contains the header files and static libraries for
@ -112,7 +87,7 @@ make %{?_smp_mflags} LDFLAGS="-pie"
%install
mkdir -p %{buildroot}/{%{_mandir}/{man1,man3},usr/{bin,lib,include}}
make DESTDIR=%{buildroot} install %{?_smp_mflags}
%make_install
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`
@ -141,23 +116,20 @@ for i in tools test; do
done
%post -n libtiff5 -p /sbin/ldconfig
%postun -n libtiff5 -p /sbin/ldconfig
%files
%defattr(-,root,root)
%{_bindir}/*
%doc html
%doc README.md COPYRIGHT VERSION ChangeLog TODO RELEASE-DATE
%doc README.md VERSION ChangeLog TODO RELEASE-DATE
%{_mandir}/man1/*
%files -n libtiff5
%defattr(-,root,root)
%doc README.md COPYRIGHT README.SUSE
%license COPYRIGHT
%doc README.md README.SUSE
%{_libdir}/*.so.*
%files -n libtiff-devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc