- unified MinGW32 caps

[packages/crossmingw32-libtiff.git] / crossmingw32-libtiff.spec

diff --git a/crossmingw32-libtiff.spec b/crossmingw32-libtiff.spec
index 995a44d6267d6514ffb1e7ec8086486ddec1eaa8..e54574f099280284f2927e62a3d2f7a0616ebc1e 100644 (file)
--- a/crossmingw32-libtiff.spec
+++ b/crossmingw32-libtiff.spec
@@ -1,18 +1,20 @@
-Summary:       Library for handling TIFF files - cross Mingw32 version
-Summary(pl.UTF-8):     Biblioteka do manipulacji plikami w formacie TIFF - wersja skrośna Mingw32
-%define                _realname   libtiff
-Name:          crossmingw32-%{_realname}
-Version:       3.8.2
+Summary:       Library for handling TIFF files - cross MinGW32 version
+Summary(pl.UTF-8):     Biblioteka do manipulacji plikami w formacie TIFF - wersja skrośna MinGW32
+%define                realname   libtiff
+Name:          crossmingw32-%{realname}
+Version:       3.9.4
 Release:       1
 License:       BSD-like
 Group:         Development/Libraries
 Source0:       ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
-# Source0-md5: fbb6f446ea4ed18955e2714934e5b698
-Patch0:                %{_realname}-sec.patch
+# Source0-md5: 2006c1bdd12644dbf02956955175afd6
+Patch0:                %{realname}-sec.patch
+Patch1:                %{realname}-glut.patch
+Patch2:                %{realname}-CVE-2009-2285.patch
 URL:           http://www.remotesensing.org/libtiff/
 BuildRequires: autoconf >= 2.59
-BuildRequires: automake
-BuildRequires: crossmingw32-gcc
+BuildRequires: automake >= 1:1.11
+BuildRequires: crossmingw32-gcc-c++
 BuildRequires: crossmingw32-libjpeg
 BuildRequires: crossmingw32-zlib
 BuildRequires: libtool
@@ -24,33 +26,40 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                target                  i386-mingw32
 %define                target_platform         i386-pc-mingw32
-%define                arch                    %{_prefix}/%{target}
 
 %define                _sysprefix              /usr
 %define                _prefix                 %{_sysprefix}/%{target}
+%define                _libdir                 %{_prefix}/lib
 %define                _dlldir                 /usr/share/windows/wine/system
 %define                __cc                    %{target}-gcc
 %define                __cxx                   %{target}-g++
 
+%ifnarch %{ix86}
+# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
+%define                optflags        -O2
+%endif
+# -z options are invalid for mingw linker
+%define                filterout_ld    -Wl,-z,.*
+
 %description
 This package is a library of functions that manipulate TIFF images
-(cross mingw32 version).
+(cross MinGW32 version).
 
 %description -l pl.UTF-8
 Ten pakiet zawiera bibliotekę pozwalającą manipulować plikami w
-formacie TIFF (w wersji skrośnej mingw32).
+formacie TIFF (w wersji skrośnej MinGW32).
 
 %package static
-Summary:       Static libtiff library (cross mingw32 version)
-Summary(pl.UTF-8):     Statyczna biblioteka libtiff (wersja skrośna mingw32)
+Summary:       Static libtiff library (cross MinGW32 version)
+Summary(pl.UTF-8):     Statyczna biblioteka libtiff (wersja skrośna MinGW32)
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 
 %description static
-Static libtiff library (cross mingw32 version).
+Static libtiff library (cross MinGW32 version).
 
 %description static -l pl.UTF-8
-Statyczna biblioteka libtiff (wersja skrośna mingw32).
+Statyczna biblioteka libtiff (wersja skrośna MinGW32).
 
 %package dll
 Summary:       DLL libtiff library for Windows
@@ -67,29 +76,29 @@ DLL libtiff library for Windows.
 Biblioteka DLL libtiff dla Windows.
 
 %package cxx
-Summary:       libtiff C++ streams library (cross mingw32 version)
-Summary(pl.UTF-8):     Biblioteka strumieni C++ dla libtiff (wersja skrośna mingw32)
+Summary:       libtiff C++ streams library (cross MinGW32 version)
+Summary(pl.UTF-8):     Biblioteka strumieni C++ dla libtiff (wersja skrośna MinGW32)
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 
 %description cxx
-libtiff C++ streams library (cross mingw32 version).
+libtiff C++ streams library (cross MinGW32 version).
 
 %description cxx -l pl.UTF-8
-Biblioteka strumieni C++ dla libtiff (wersja skrośna mingw32).
+Biblioteka strumieni C++ dla libtiff (wersja skrośna MinGW32).
 
 %package cxx-static
-Summary:       Static libtiff C++ streams library (cross mingw32 version)
-Summary(pl.UTF-8):     Statyczna biblioteka strumieni C++ dla libtiff (wersja skrośna mingw32)
+Summary:       Static libtiff C++ streams library (cross MinGW32 version)
+Summary(pl.UTF-8):     Statyczna biblioteka strumieni C++ dla libtiff (wersja skrośna MinGW32)
 Group:         Development/Libraries
 Requires:      %{name}-cxx = %{version}-%{release}
 
 %description cxx-static
-Static libtiff C++ streams library (cross mingw32 version).
+Static libtiff C++ streams library (cross MinGW32 version).
 
 %description cxx-static -l pl.UTF-8
 Statyczna biblioteka strumieni C++ dla libtiff (wersja skrośna
-mingw32).
+MinGW32).
 
 %package cxx-dll
 Summary:       DLL libtiff C++ streams library for Windows
@@ -106,8 +115,10 @@ Biblioteka DLL strumieni C++ libtiff dla Windows.
 %prep
 %setup -q -n tiff-%{version}
 %patch0 -p1
+%patch1 -p0
+%patch2 -p1
 
-rm -f m4/{libtool,lt*}.m4
+%{__rm} m4/{libtool,lt*}.m4
 
 %build
 %{__libtoolize}