X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=FreeImage.spec;h=cfab90c5572ff23f918b505d8714bb8c7ca69696;hb=HEAD;hp=0e8447de939c37cd1896875636b08962fab80286;hpb=999684c52bcd718dcac5157fce00e7ce32ca2cbf;p=packages%2FFreeImage.git

diff --git a/FreeImage.spec b/FreeImage.spec
index 0e8447d..cfab90c 100644
--- a/FreeImage.spec
+++ b/FreeImage.spec
@@ -1,17 +1,28 @@
-%define	_ver	%(echo %{version} | tr -d .)
+# TODO: use system libraries (if possible):
+# libjpeg 9c
+# libpng 1.6.35
+# libtiff 4.0.9+git
+# libraw 0.19
+# openjpeg 2.1.0+svn
+# zlib 1.2.11
+# libwebp 1.0.0+git
+# LibJXR 1.1+git
+# OpenEXR 2.2.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.12.0
+Version:	3.18.0
 Release:	1
-License:	GPL and FIPL (see the license-fi.txt)
+License:	GPL and FIPL v1.0 (see the license-fi.txt)
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/freeimage/%{name}%{_ver}.zip
-# Source0-md5:	47b259102f776a4bcd7affc00942f3b4
-Source1:	http://dl.sourceforge.net/freeimage/%{name}%{_ver}.pdf
-# Source1-md5:	241b0d44f9e0fd84d91244ec4e050ab6
+Source0:	http://downloads.sourceforge.net/freeimage/%{name}%{fver}.zip
+# Source0-md5:	f8ba138a3be233a3eed9c456e42e2578
+Source1:	http://downloads.sourceforge.net/freeimage/%{name}%{fver}.pdf
+# Source1-md5:	01d2b93728273caec87f19949fcc4981
 URL:		http://freeimage.sourceforge.net/index.html
 BuildRequires:	libstdc++-devel
+BuildRequires:	rpmbuild(macros) >= 1.752
 BuildRequires:	unzip
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -32,6 +43,7 @@ Summary:	Header files for FreeImage library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki FreeImage
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	libstdc++-devel
 
 %description devel
 Header files for FreeImage library.
@@ -51,14 +63,33 @@ Static FreeImage library.
 %description static -l pl.UTF-8
 Statyczna biblioteka FreeImage.
 
+%package apidocs
+Summary:	Documentation for FreeImage library
+Summary(pl.UTF-8):	Dokumentacja do biblioteki FreeImage
+Group:		Documentation
+BuildArch:	noarch
+
+%description apidocs
+Documentation for FreeImage library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja do biblioteki FreeImage.
+
 %prep
 %setup -q -n %{name}
 
 %build
+CFLAGS="%{rpmcflags} -fPIC -fvisibility=hidden" \
+CXXFLAGS="%{rpmcxxflags} -fPIC -fvisibility=hidden -Wno-ctor-dtor-privacy" \
 %{__make} \
 	CC="%{__cc}" \
-	CXX="%{__cxx}" \
-	COMPILERFLAGS="%{rpmcflags} -fPIC"
+	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
@@ -71,8 +102,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,16 +116,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.linux Whatsnew.txt license-fi.txt
-%attr(755,root,root) %{_libdir}/libfreeimage-*.*.*.so
+%doc README.linux README.md Whatsnew.txt license-fi.txt
+%attr(755,root,root) %{_libdir}/libfreeimage-%{version}.so
+%attr(755,root,root) %ghost %{_libdir}/libfreeimage.so.3
+%attr(755,root,root) %{_libdir}/libfreeimageplus-%{version}.so
+%attr(755,root,root) %ghost %{_libdir}/libfreeimageplus.so.3
 
 %files devel
 %defattr(644,root,root,755)
-%doc FreeImage%{_ver}.pdf
 %attr(755,root,root) %{_libdir}/libfreeimage.so
+%attr(755,root,root) %{_libdir}/libfreeimageplus.so
 %{_includedir}/FreeImage.h
+%{_includedir}/FreeImagePlus.h
 %{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libfreeimage.a
+%{_libdir}/libfreeimageplus.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%doc FreeImage%{fver}.pdf