- x32 rebuild

[packages/FreeImage.git] / FreeImage.spec

diff --git a/FreeImage.spec b/FreeImage.spec
index c7e77828b23223c082a8519563bcb3da190afca9..a028027cd7fe56ed91df415d66d0b7255de62781 100644 (file)
--- a/FreeImage.spec
+++ b/FreeImage.spec
@@ -1,15 +1,26 @@
-%define        _ver    %(echo %{version} | tr -d .)
+# TODO: use system libraries (if possible):
+# libjpeg 9a
+# libpng 1.6.10
+# libtiff 4.0.3+CVS
+# libraw 0.16.0
+# openjpeg 2.1.0+svn
+# zlib 1.2.8
+# libwebp 0.4.0+git
+# LibJXR 1.1+git
+# OpenEXR 1.7.1
+%define        fver    %(echo %{version} | tr -d .)
 Summary:       Library for handling different graphics files formats
 Summary(pl.UTF-8):     Biblioteka do manipulacji różnymi formatami plików graficznych
 Name:          FreeImage
-Version:       3.9.3
-Release:       1
-License:       GPL and FIPL (see the license-fi.txt)
+Version:       3.16.0
+Release:       2
+License:       GPL and FIPL v1.0 (see the license-fi.txt)
 Group:         Libraries
-Source0:       http://dl.sourceforge.net/freeimage/%{name}%{_ver}.zip
-# Source0-md5: bf3574fa4e6135cf511d5ff4bc871ec3
-Source1:       http://dl.sourceforge.net/freeimage/%{name}%{_ver}.pdf
-# Source1-md5: 5a59f1d2c380da666f1cd42e082e8041
+Source0:       http://downloads.sourceforge.net/freeimage/%{name}%{fver}.zip
+# Source0-md5: 1a2d1fff6204adbd479cc98818892fc1
+Source1:       http://downloads.sourceforge.net/freeimage/%{name}%{fver}.pdf
+# Source1-md5: f8df04e0c5fb7a9af850a23df7ac244e
+Patch0:                %{name}-includes.patch
 URL:           http://freeimage.sourceforge.net/index.html
 BuildRequires: libstdc++-devel
 BuildRequires: unzip
@@ -53,10 +64,20 @@ Statyczna biblioteka FreeImage.
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1
 
 %build
+CFLAGS="%{rpmcflags} -fPIC -fvisibility=hidden" \
+CXXFLAGS="%{rpmcxxflags} -fPIC -fvisibility=hidden -Wno-ctor-dtor-privacy" \
 %{__make} \
-       RPM_OPT_FLAGS="%{rpmcflags}"
+       CC="%{__cc}" \
+       CXX="%{__cxx}"
+
+CFLAGS="%{rpmcflags} -fPIC -fvisibility=hidden" \
+CXXFLAGS="%{rpmcxxflags} -fPIC -fvisibility=hidden -Wno-ctor-dtor-privacy" \
+%{__make} -f Makefile.fip \
+       CC="%{__cc}" \
+       CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -69,8 +90,11 @@ install Dist/*.h $RPM_BUILD_ROOT%{_includedir}
 cp -rf Examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -f %{SOURCE1} .
 
+/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
 ln -sf libfreeimage-%{version}.so \
        $RPM_BUILD_ROOT%{_libdir}/libfreeimage.so
+ln -sf libfreeimageplus-%{version}.so \
+       $RPM_BUILD_ROOT%{_libdir}/libfreeimageplus.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,14 +106,20 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README.linux Whatsnew.txt license-fi.txt
 %attr(755,root,root) %{_libdir}/libfreeimage-*.*.*.so
+%attr(755,root,root) %ghost %{_libdir}/libfreeimage.so.3
+%attr(755,root,root) %{_libdir}/libfreeimageplus-*.*.*.so
+%attr(755,root,root) %ghost %{_libdir}/libfreeimageplus.so.3
 
 %files devel
 %defattr(644,root,root,755)
-%doc FreeImage%{_ver}.pdf
+%doc FreeImage%{fver}.pdf
 %attr(755,root,root) %{_libdir}/libfreeimage.so
-%{_includedir}/*
+%attr(755,root,root) %{_libdir}/libfreeimageplus.so
+%{_includedir}/FreeImage.h
+%{_includedir}/FreeImagePlus.h
 %{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libfreeimage.a
+%{_libdir}/libfreeimageplus.a