X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dx.spec;h=badd822a215b41620c4c632160ac6ddafadf4a7f;hb=2227a7593bf054d063b4f85b2d55a33898ee7ee8;hp=6a7d10f5111a6e54ca26274427d0b0801cf42613;hpb=8f58c35454bce0faff4044bc6481533ff9a00b87;p=packages%2Fdx.git

diff --git a/dx.spec b/dx.spec
index 6a7d10f..badd822 100644
--- a/dx.spec
+++ b/dx.spec
@@ -2,9 +2,9 @@ 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:	2
+Release:	20
 License:	IPL
-Group:		Applications
+Group:		Applications/Science
 Source0:	http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz
 # Source0-md5:	6da0c4cd21d3c08f97b7662e3aee5b7b
 Source1:	http://opendx.npaci.edu/source/%{name}samples-4.4.0.tar.gz
@@ -12,26 +12,47 @@ Source1:	http://opendx.npaci.edu/source/%{name}samples-4.4.0.tar.gz
 Source2:	%{name}.desktop
 Patch0:		%{name}-DESTDIR.patch
 Patch1:		%{name}-nolibs.patch
-Patch2:		dxsamples-DESTDIR.patch
-Patch3:		dxsamples-unused_bin.patch
+Patch2:		%{name}samples-DESTDIR.patch
+Patch3:		%{name}samples-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
+Patch10:	%{name}-narrowing.patch
+Patch11:	%{name}-conversion.patch
 URL:		http://www.opendx.org/
 BuildRequires:	ImageMagick-devel >= 1:6.2.4.0
+BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	OpenGL-devel
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	bison
+BuildRequires:	cdflib-devel
 BuildRequires:	flex
 BuildRequires:	hdf-devel
 BuildRequires:	libjpeg-devel
-BuildRequires:	libtool
 BuildRequires:	libtiff-devel
+BuildRequires:	libstdc++-devel
+BuildRequires:	libtool
 BuildRequires:	motif-devel
 BuildRequires:	netcdf-devel
+BuildRequires:	xorg-lib-libICE-devel
+BuildRequires:	xorg-lib-libSM-devel
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXinerama-devel
+BuildRequires:	xorg-lib-libXmu-devel
+BuildRequires:	xorg-lib-libXp-devel
+BuildRequires:	xorg-lib-libXpm-devel
+BuildRequires:	xorg-lib-libXt-devel
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	openssh-clients
 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
@@ -44,8 +65,8 @@ creating visualizations.
 OpenDX jest w pełni funkcjonalnym, o unikalnych możliwościach,
 pakietem do wizualizacji danych naukowych, inżynierskich i
 analitycznych. Został zaprojektowany w sposób otwarty, w oparciu o
-standardowe środowiska interfejsów. Jego przemyślany model danych
-daje użytkownikom dużą elastyczność w tworzeniu wizualizacji.
+standardowe środowiska interfejsów. Jego przemyślany model danych daje
+użytkownikom dużą elastyczność w tworzeniu wizualizacji.
 
 %package libs
 Summary:	OpenDX shared libraries
@@ -86,6 +107,9 @@ Biblioteki statyczne OpenDX.
 Summary:	OpenDX documentation
 Summary(pl.UTF-8):	Dokumentacja OpenDX
 Group:		Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description doc
 Online help and html documentation for OpenDX.
@@ -97,6 +121,9 @@ Podręczna pomoc oraz dokumentacja html dla OpenDX.
 Summary:	OpenDX Examples
 Summary(pl.UTF-8):	Przykłady dla OpenDX
 Group:		Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description examples
 Examples for OpenDX.
@@ -111,13 +138,21 @@ Przykłady dla OpenDX.
 %patch2 -p0
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoheader}
 %{__autoconf}
 %{__automake}
+CPPFLAGS="%{rpmcppflags} -I/usr/include/cdf"
 %configure \
 	--prefix=%{_datadir} \
 	--enable-shared \
@@ -125,7 +160,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 +173,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
@@ -153,17 +189,17 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir},%{_mandir},%{_desktopdir},%{_pixmapsdir}}
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
-install src/uipp/ui/icon50.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/dx.xpm
-mv $RPM_BUILD_ROOT%{_datadir}/bin/dx $RPM_BUILD_ROOT%{_bindir}
-mv $RPM_BUILD_ROOT%{_datadir}/dx/man/manl $RPM_BUILD_ROOT%{_mandir}
-mv $RPM_BUILD_ROOT%{_datadir}/dx/include/* $RPM_BUILD_ROOT%{_includedir}
-mv $RPM_BUILD_ROOT%{_datadir}/dx/lib_linux $RPM_BUILD_ROOT%{_libdir}/dx
-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}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p src/uipp/ui/icon50.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/dx.xpm
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/bin/dx $RPM_BUILD_ROOT%{_bindir}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/dx/man/manl $RPM_BUILD_ROOT%{_mandir}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/dx/include/* $RPM_BUILD_ROOT%{_includedir}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/dx/lib_linux $RPM_BUILD_ROOT%{_libdir}/dx
+%{__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
@@ -171,7 +207,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc doc/README*
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/dx
 %dir %{_datadir}/dx
 %attr(755,root,root) %{_datadir}/dx/bin
 %{_datadir}/dx/bin_linux
@@ -179,30 +215,36 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dx/lib
 %{_datadir}/dx/lib_linux
 %{_datadir}/dx/ui
-%{_mandir}/manl/*
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
+# FIXME: should be dx(1)
+%{_mandir}/manl/dx.l*
+%{_desktopdir}/dx.desktop
+%{_pixmapsdir}/dx.xpm
 
 %files libs
 %defattr(644,root,root,755)
 %dir %{_libdir}/dx
-%attr(755,root,root) %{_libdir}/dx/bin_linux
-%attr(755,root,root) %{_libdir}/dx/lib*.so.*
+%dir %{_libdir}/dx/bin_linux
+%attr(755,root,root) %{_libdir}/dx/bin_linux/*
+%attr(755,root,root) %{_libdir}/dx/libDX*.so.*
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/*
-%{_libdir}/dx/*.mak
-%{_libdir}/dx/*.la
-%{_libdir}/dx/*.so
+%attr(755,root,root) %{_libdir}/dx/libDX*.so
+%{_includedir}/dx
+%{_includedir}/dxconfig.h
+%{_includedir}/dxl.h
+%{_includedir}/dxstereo.h
+%{_libdir}/dx/libDX*.la
+%{_libdir}/dx/arch.mak
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/dx/*.a
+%{_libdir}/dx/libDX*.a
 
 %files doc
 %defattr(644,root,root,755)
-%{_datadir}/dx/h*
+%{_datadir}/dx/help
+%{_datadir}/dx/html
 
 %files examples
 %defattr(644,root,root,755)