- updated to 4.0.4 (security fixes)

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

diff --git a/crossmingw32-libtiff.spec b/crossmingw32-libtiff.spec
index 42d3f03039a9fe87bde57b6cbfb24886b11b2a22..5e9cf4ace99fb208af49ae92ceac725c359587eb 100644 (file)
--- a/crossmingw32-libtiff.spec
+++ b/crossmingw32-libtiff.spec
@@ -1,24 +1,24 @@
+# TODO: jbigkit support
 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.5
+Version:       4.0.4
 Release:       1
 License:       BSD-like
 Group:         Development/Libraries
-Source0:       ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
-# Source0-md5: 8fc7ce3b4e1d0cc8a319336967815084
-Patch0:                %{realname}-sec.patch
-Patch1:                %{realname}-glut.patch
-Patch2:                %{realname}-CVE-2009-2285.patch
+Source0:       http://download.osgeo.org/libtiff/tiff-%{version}.tar.gz
+# Source0-md5: 9aee7107408a128c0c7b24286c0db900
+Patch0:                %{realname}-glut.patch
 URL:           http://www.remotesensing.org/libtiff/
-BuildRequires: autoconf >= 2.59
+BuildRequires: autoconf >= 2.64
 BuildRequires: automake >= 1:1.11
 BuildRequires: crossmingw32-gcc-c++
 BuildRequires: crossmingw32-libjpeg
 BuildRequires: crossmingw32-zlib
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2.2
 Requires:      crossmingw32-libjpeg
+Requires:      crossmingw32-xz
 Requires:      crossmingw32-zlib
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -30,16 +30,21 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _sysprefix              /usr
 %define                _prefix                 %{_sysprefix}/%{target}
 %define                _libdir                 %{_prefix}/lib
-%define                _dlldir                 /usr/share/windows/wine/system
+%define                _pkgconfigdir           %{_prefix}/lib/pkgconfig
+%define                _dlldir                 /usr/share/wine/windows/system
 %define                __cc                    %{target}-gcc
 %define                __cxx                   %{target}-g++
+%define                __pkgconfig_provides    %{nil}
+%define                __pkgconfig_requires    %{nil}
 
 %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
+# -z options are invalid for mingw linker, most of -f options are Linux-specific
 %define                filterout_ld    -Wl,-z,.*
+%define                filterout_c     -f[-a-z0-9=]*
+%define                filterout_cxx   -f[-a-z0-9=]*
 
 %description
 This package is a library of functions that manipulate TIFF images
@@ -67,6 +72,7 @@ Summary(pl.UTF-8):    Biblioteka DLL libtiff dla Windows
 Group:         Applications/Emulators
 Requires:      wine
 Requires:      crossmingw32-libjpeg-dll
+Requires:      crossmingw32-xz-dll
 Requires:      crossmingw32-zlib-dll
 
 %description dll
@@ -115,10 +121,6 @@ Biblioteka DLL strumieni C++ libtiff dla Windows.
 %prep
 %setup -q -n tiff-%{version}
 %patch0 -p1
-%patch1 -p0
-%patch2 -p1
-
-%{__rm} m4/{libtool,lt*}.m4
 
 %build
 %{__libtoolize}
@@ -147,7 +149,8 @@ mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/{doc,man}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{doc,man}
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/*.exe
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -158,6 +161,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libtiff.dll.a
 %{_libdir}/libtiff.la
 %{_includedir}/tiff*.h
+%{_pkgconfigdir}/libtiff-4.pc
 
 %files static
 %defattr(644,root,root,755)