- fix format string errors

[packages/dx.git] / dx.spec

diff --git a/dx.spec b/dx.spec
index 796a222869df7fb49179bbf5b8eb32141e126b87..ed00fddebc47762ff6f021cfd4d1dd3efea2b42a 100644 (file)
--- a/dx.spec
+++ b/dx.spec
@@ -1,22 +1,29 @@
 Summary:       Excellent tool for making visualization of data
-Summary(pl.UTF-8):   Doskonałe narzędzie do wizualizacji danych
+Summary(pl.UTF-8):     Doskonałe narzędzie do wizualizacji danych
 Name:          dx
-Version:       4.4.0
-Release:       1
+Version:       4.4.4
+Release:       15
 License:       IPL
 Group:         Applications
 Source0:       http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz
-# Source0-md5: 8fe6a09faea4aa713a1540f51371b719
-Source1:       http://opendx.npaci.edu/source/%{name}samples-%{version}.tar.gz
+# Source0-md5: 6da0c4cd21d3c08f97b7662e3aee5b7b
+Source1:       http://opendx.npaci.edu/source/%{name}samples-4.4.0.tar.gz
 # Source1-md5: e8f43722ca0a66282608bded7c0e4f93
 Source2:       %{name}.desktop
 Patch0:                %{name}-DESTDIR.patch
 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-base
+BuildRequires: OpenGL-devel
+BuildRequires: OpenGL-GLU-devel
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
 BuildRequires: bison
@@ -27,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
@@ -48,7 +59,7 @@ daje użytkownikom dużą elastyczność w tworzeniu wizualizacji.
 
 %package libs
 Summary:       OpenDX shared libraries
-Summary(pl.UTF-8):   Biblioteki współdzielone OpenDX
+Summary(pl.UTF-8):     Biblioteki współdzielone OpenDX
 Group:         Libraries
 
 %description libs
@@ -59,7 +70,7 @@ Biblioteki współdzielone OpenDX.
 
 %package devel
 Summary:       OpenDX development files
-Summary(pl.UTF-8):   Pliki nagłówkowe OpenDX
+Summary(pl.UTF-8):     Pliki nagłówkowe OpenDX
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 
@@ -71,7 +82,7 @@ Pliki nagłówkowe OpenDX oraz inne pliki, potrzebne do budowania.
 
 %package static
 Summary:       OpenDX static libraries
-Summary(pl.UTF-8):   Biblioteki statyczne OpenDX
+Summary(pl.UTF-8):     Biblioteki statyczne OpenDX
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
@@ -83,7 +94,7 @@ Biblioteki statyczne OpenDX.
 
 %package doc
 Summary:       OpenDX documentation
-Summary(pl.UTF-8):   Dokumentacja OpenDX
+Summary(pl.UTF-8):     Dokumentacja OpenDX
 Group:         Documentation
 
 %description doc
@@ -94,7 +105,7 @@ Podręczna pomoc oraz dokumentacja html dla OpenDX.
 
 %package examples
 Summary:       OpenDX Examples
-Summary(pl.UTF-8):   Przykłady dla OpenDX
+Summary(pl.UTF-8):     Przykłady dla OpenDX
 Group:         Documentation
 
 %description examples
@@ -109,10 +120,16 @@ Przykłady dla OpenDX.
 %patch1 -p1
 %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}
@@ -123,9 +140,10 @@ Przykłady dla OpenDX.
        --disable-dependency-tracking \
        --enable-smp-linux \
        --enable-new-keylayout \
-       --without-javadx
+       --without-javadx \
+       --with-rsh=%{_bindir}/ssh
 
-cd %{name}samples-%{version}
+cd %{name}samples-4.4.0
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
@@ -135,9 +153,9 @@ cd %{name}samples-%{version}
        --without-javadx
 cd ..
 
-%{__make}
+%{__make} -j1
 
-%{__make} -C %{name}samples-%{version}
+%{__make} -j1 -C %{name}samples-4.4.0
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -145,7 +163,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__make} -C %{name}samples-%{version} install \
+%{__make} -C %{name}samples-4.4.0 install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir},%{_mandir},%{_desktopdir},%{_pixmapsdir}}
@@ -161,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