X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dx.spec;h=ed00fddebc47762ff6f021cfd4d1dd3efea2b42a;hb=1798cd757234c546b4d4a797f7edeb5523638ea2;hp=1336ec8b796ea153dbdd69390de8d1de0c90e02f;hpb=3bf128c81357bd3d9e97e3da04980d7f51a16b1a;p=packages%2Fdx.git

diff --git a/dx.spec b/dx.spec
index 1336ec8..ed00fdd 100644
--- a/dx.spec
+++ b/dx.spec
@@ -2,7 +2,7 @@ Summary:	Excellent tool for making visualization of data
 Summary(pl.UTF-8):	Doskonałe narzędzie do wizualizacji danych
 Name:		dx
 Version:	4.4.4
-Release:	4
+Release:	15
 License:	IPL
 Group:		Applications
 Source0:	http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz
@@ -15,9 +15,15 @@ Patch1:		%{name}-nolibs.patch
 Patch2:		dxsamples-DESTDIR.patch
 Patch3:		dxsamples-unused_bin.patch
 Patch4:		%{name}-include.patch
+Patch5:		%{name}-ac.patch
+Patch6:		%{name}-ImageMagic.patch
+Patch7:		%{name}-open.patch
+Patch8:		%{name}-gcc43.patch
+Patch9:		format-security.patch
 URL:		http://www.opendx.org/
 BuildRequires:	ImageMagick-devel >= 1:6.2.4.0
 BuildRequires:	OpenGL-devel
+BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	bison
@@ -28,10 +34,14 @@ BuildRequires:	libtool
 BuildRequires:	libtiff-devel
 BuildRequires:	motif-devel
 BuildRequires:	netcdf-devel
+BuildRequires:	xorg-lib-libXinerama-devel
+BuildRequires:	xorg-lib-libXpm-devel
+Requires:	openssh-clients
 Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags_ia32	-fomit-frame-pointer
+%define		skip_post_check_so	libDXL.so.*
 
 %description
 OpenDX is a uniquely powerful, full-featured software package for the
@@ -111,10 +121,15 @@ Przykłady dla OpenDX.
 %patch2 -p0
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoheader}
 %{__autoconf}
 %{__automake}
@@ -125,7 +140,8 @@ Przykłady dla OpenDX.
 	--disable-dependency-tracking \
 	--enable-smp-linux \
 	--enable-new-keylayout \
-	--without-javadx
+	--without-javadx \
+	--with-rsh=%{_bindir}/ssh
 
 cd %{name}samples-4.4.0
 %{__aclocal}
@@ -137,9 +153,9 @@ cd %{name}samples-4.4.0
 	--without-javadx
 cd ..
 
-%{__make}
+%{__make} -j1
 
-%{__make} -C %{name}samples-4.4.0
+%{__make} -j1 -C %{name}samples-4.4.0
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -163,7 +179,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/dx/bin_linux $RPM_BUILD_ROOT%{_libdir}/dx
 mv $RPM_BUILD_ROOT%{_examplesdir}/dx/samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 ln -s %{_libdir}/dx $RPM_BUILD_ROOT%{_datadir}/dx/lib_linux
 ln -s %{_libdir}/dx/bin_linux $RPM_BUILD_ROOT%{_datadir}/dx
-rm -rf $RPM_BUILD_ROOT%{_datadir}/{bin,dx/{bin/dx,man,include,doc}}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{bin,dx/{bin/dx,man,include,doc}}
 
 %clean
 rm -rf $RPM_BUILD_ROOT