X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=enblend-enfuse.spec;h=672d527862a17b70637d159d39154d4abfd001aa;hb=9d3dced97018170b4318e837d95c0e07d4fe026d;hp=afa70bd56689d31e24cb3c195a296f3d97d7bb96;hpb=dd442f7e33ed713a94b53894f2137d63e2c10b02;p=packages%2Fenblend-enfuse.git

diff --git a/enblend-enfuse.spec b/enblend-enfuse.spec
index afa70bd..672d527 100644
--- a/enblend-enfuse.spec
+++ b/enblend-enfuse.spec
@@ -1,14 +1,19 @@
-# NOTE: g++ eats 600+MB of memory
+# NOTE: g++ eats 700+MB of memory
+#
+# Conditional build:
+%bcond_with	gomp	# OpenMP support (incompatible with image-cache)
+#
 Summary:	Image blending with multiresolution splines
 Summary(pl.UTF-8):	Łączenie zdjęć przy użyciu splajnów wielokrotnej rozdzielczości
 Name:		enblend-enfuse
-Version:	4.0
-Release:	1
+Version:	4.1.2
+Release:	5
 License:	GPL v2+
 Group:		Applications/Graphics
-Source0:	http://dl.sourceforge.net/enblend/%{name}-%{version}.tar.gz
-# Source0-md5:	2e7c950061e0085fd75d94576130250f
-Patch0:		%{name}-libpng.patch
+Source0:	http://downloads.sourceforge.net/enblend/%{name}-%{version}.tar.gz
+# Source0-md5:	5b609ddfc9fae5fadf65d29c08e0340e
+Patch0:		%{name}-info.patch
+Patch1:		%{name}-texinfo.patch
 URL:		http://enblend.sourceforge.net/
 BuildRequires:	OpenEXR-devel >= 1.0
 BuildRequires:	OpenGL-GLU-devel
@@ -16,16 +21,23 @@ BuildRequires:	OpenGL-glut-devel
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 BuildRequires:	boost-devel >= 1.35.0
+%{?with_gomp:BuildRequires:	gcc-c++ >= 6:4.2}
 BuildRequires:	glew-devel
+BuildRequires:	gsl-devel
 BuildRequires:	help2man
-BuildRequires:	lcms-devel
+BuildRequires:	lcms2-devel >= 2
+%{?with_gomp:BuildRequires:	libgomp-devel}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel >= 5:3.4
 BuildRequires:	libtiff-devel
 BuildRequires:	libxmi-devel
 BuildRequires:	pkgconfig
+BuildRequires:	texinfo
+BuildRequires:	transfig
+BuildRequires:	vigra-devel >= 1.8
 BuildRequires:	zlib-devel
+Requires:	vigra >= 1.8
 Provides:	enblend = %{version}
 Obsoletes:	enblend
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -45,15 +57,19 @@ przynajmniej bardzo trudne do zobaczenia. Enblend nie wyrównuje zdjęć
 - do tego można użyć narzędzia takiego jak Hugin.
 
 %prep
-%setup -q -n %{name}-%{version}-753b534c819d
+%setup -q
 %patch0 -p1
+%patch1 -p1
+
+%{__sed} -i -e 's/src:://g;s/CFG::/CFG_/g' doc/*.texi doc/define2set.pl configure.in
 
 %build
 %{__aclocal} -I m4
 %{__autoheader}
 %{__automake}
 %{__autoconf}
-%configure
+%configure \
+	%{?with_gomp:--enable-openmp --disable-image-cache}
 %{__make}
 
 %install
@@ -65,10 +81,18 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%postun	-p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README VIGRA_LICENSE
+%doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/enblend
 %attr(755,root,root) %{_bindir}/enfuse
 %{_mandir}/man1/enblend.1*
 %{_mandir}/man1/enfuse.1*
+%{_infodir}/enblend.info*
+%{_infodir}/enfuse.info*