- fixed cdflib detection, more verbose files

[packages/dx.git] / dx.spec

diff --git a/dx.spec b/dx.spec
index 2e17bbadcb0484e8be397dd04a2fc7c08d5dd5d1..badd822a215b41620c4c632160ac6ddafadf4a7f 100644 (file)
--- 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:       18
+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
@@ -20,6 +20,8 @@ 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
@@ -27,15 +29,24 @@ BuildRequires:      OpenGL-devel
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
 BuildRequires: bison
+BuildRequires: cdflib-devel
 BuildRequires: flex
 BuildRequires: hdf-devel
 BuildRequires: libjpeg-devel
 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)
@@ -132,6 +143,8 @@ Przykłady dla OpenDX.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 %{__libtoolize}
@@ -139,6 +152,7 @@ Przykłady dla OpenDX.
 %{__autoheader}
 %{__autoconf}
 %{__automake}
+CPPFLAGS="%{rpmcppflags} -I/usr/include/cdf"
 %configure \
        --prefix=%{_datadir} \
        --enable-shared \
@@ -177,12 +191,12 @@ install -d $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}
+%{__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} -r $RPM_BUILD_ROOT%{_datadir}/{bin,dx/{bin/dx,man,include,doc}}
@@ -193,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
@@ -201,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)