From a09f62f2645e725af23f0492f8b592104fb58455f2ea58ec51a817bba51f68d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Tue, 4 Aug 2015 09:54:51 +0000
Subject: [PATCH] Accepting request 320343 from
 home:kstreitova:branches:graphics

- use spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/320343
OBS-URL: https://build.opensuse.org/package/show/graphics/tiff?expand=0&rev=69
---
 tiff.changes |  5 +++++
 tiff.spec    | 51 +++++++++++++++++++++++++--------------------------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/tiff.changes b/tiff.changes
index e3bb023..e1847c2 100644
--- a/tiff.changes
+++ b/tiff.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Aug  4 08:17:35 UTC 2015 - kstreitova@suse.com
+
+- use spec-cleaner
+
 -------------------------------------------------------------------
 Wed Jul  1 07:17:13 UTC 2015 - pgajdos@suse.com
 
diff --git a/tiff.spec b/tiff.spec
index 2aa2986..eea9c22 100644
--- a/tiff.spec
+++ b/tiff.spec
@@ -17,26 +17,6 @@
 
 
 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.4
 Release:        0
 Summary:        Tools for Converting from and to the Tiff Format
@@ -49,11 +29,30 @@ Source3:        baselibs.conf
 Patch0:         tiff-4.0.3-seek.patch
 # http://bugzilla.maptools.org/show_bug.cgi?id=2442
 Patch1:         tiff-4.0.3-compress-warning.patch
-
+BuildRequires:  gcc-c++
+BuildRequires:  libjpeg-devel
+BuildRequires:  libtool
+BuildRequires:  zlib-devel
 # FYI: this issue is solved another way
 # http://bugzilla.maptools.org/show_bug.cgi?id=1985#c1
 # Patch9:         tiff-%{version}-lzw-CVE-2009-2285.patch
 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
 
 %description
 This package contains the library and support programs for the TIFF
@@ -97,13 +96,13 @@ the libtiff library.
 %patch1 -p1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS -fPIE"
+CFLAGS="%{optflags} -fPIE"
 %configure --disable-static --with-pic
 make %{?_smp_mflags} LDFLAGS="-pie"
 
 %install
 mkdir -p %{buildroot}/{%{_mandir}/{man1,man3},usr/{bin,lib,include}}
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 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`
@@ -113,7 +112,7 @@ done
 
 cp %{SOURCE2} .
 rm -rf %{buildroot}%{_datadir}/doc/tiff*
-rm -f %{buildroot}/%{_libdir}/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
 find html -name "Makefile*" | xargs rm
 
 %check
@@ -129,7 +128,7 @@ make %{?_smp_mflags} check
 %{_bindir}/*
 %doc html
 %doc README COPYRIGHT VERSION ChangeLog TODO RELEASE-DATE
-%doc %{_mandir}/man1/*
+%{_mandir}/man1/*
 
 %files -n libtiff5
 %defattr(-,root,root)
@@ -141,6 +140,6 @@ make %{?_smp_mflags} check
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
-%doc %{_mandir}/man3/*
+%{_mandir}/man3/*
 
 %changelog