- added missing BRs,

- switched from static to shared libraries,
- enabled SMP code and new keylayout,
- set prefix=%{_datadir}, need to set proper DXROOT by dx script;
  it could be done by fixing disabled DESTDIR patch,
- do not mess in %{_bindir}, put there only dx script, other
  executables are for internal use and require environment,
- put lib_linux as %{_libdir}/dx and bin_linux into it,
  make appropriate symlink to %{_datadir}/dx,
- moved back to original location $(prefix)/dx/lib dir,
- separated libs, devel and doc subpackages,
- added man page, typo, release 2.

Changed files:
    dx.spec -> 1.22

diff --git a/dx.spec b/dx.spec
index 37566d00e4365cc8fa1c96c4c89592458a9a5153..4b09ec580bb881008b51e30de2eb98b47e28044c 100644 (file)
--- a/dx.spec
+++ b/dx.spec
@@ -1,8 +1,8 @@
-Summary:       Excelent tool to making visualization of data
+Summary:       Excellent tool for making visualization of data
 Summary(pl):   Doskona³e narzêdzie do wizualizacji danych
 Name:          dx
 Version:       4.3.2
-Release:       1
+Release:       2
 License:       IPL
 Group:         Applications
 Source0:       http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz
@@ -15,7 +15,14 @@ BuildRequires:       ImageMagick-devel
 BuildRequires: OpenGL-devel-base
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: bison
 BuildRequires: flex
+BuildRequires: hdf-devel
+BuildRequires: libtool
+BuildRequires: libtiff-devel
+BuildRequires: motif-devel
+BuildRequires: netcdf-devel
+Requires:      %{name}-libs = %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -32,20 +39,58 @@ analitycznych. Zosta
 standardowe ¶rodowiska interfejstów. Jego przemy¶lany model danych
 daje u¿ytkownikom du¿± elastyczno¶æ w tworzeniu wizualizacji.
 
+%package libs
+Summary:       OpenDX shared libraries
+Summary(pl):   Biblioteki wspó³dzielone OpenDX
+Group:         Libraries
+
+%description libs
+OpenDX shared libraries.
+
+%description libs -l pl
+Biblioteki wspó³dzielone OpenDX.
+
+%package devel
+Summary:       OpenDX development files
+Summary(pl):   Pliki nag³ówkowe OpenDX
+Group:         Development/Libraries
+Requires:      %{name}-libs = %{version}
+
+%description devel
+OpenDX development files.
+
+%description devel -l pl
+Pliki nag³ówkowe OpenDX oraz inne pliki, potrzebne do budowania.
+
+%package doc
+Summary:       OpenDX documentation
+Summary(pl):   Dokumentacja OpenDX
+Group:         Documentation
+
+%description doc
+Online help and html documentation for OpenDX.
+
+%description doc -l pl
+Podrêczna pomoc oraz dokumentacja html dla OpenDX.
+
 %prep
 %setup  -q
-%patch0 -p1
+#%patch0 -p1
 
 %build
 rm -f missing aclocal.m4
+%{__libtoolize}
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
 %{__automake}
 %configure \
-       --prefix=%{_prefix} \
-       --datadir=%{_datadir} \
-       --mandir=%{_mandir} \
+       --prefix=%{_datadir} \
+       --enable-shared \
+       --disable-static \
+       --disable-dependency-tracking \
+       --enable-smp-linux \
+       --enable-new-keylayout \
        --without-javadx
 
 %{__make}
@@ -56,8 +101,20 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-ln -sf %{_bindir} $RPM_BUILD_ROOT%{_datadir}/dx/bin
-ln -sf %{_bindir} $RPM_BUILD_ROOT%{_datadir}/dx/bin_linux
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir},%{_mandir}} \
+       $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{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/h* $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}
+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
+#ln -s %{_libdir}/dx $RPM_BUILD_ROOT%{_datadir}/dx/lib_linux
+ln -s %{_libdir}/dx/bin_linux $RPM_BUILD_ROOT%{_datadir}/dx
+ln -s %{_docdir}/%{name}-doc-%{version}/help $RPM_BUILD_ROOT%{_datadir}/dx/help
+ln -s %{_docdir}/%{name}-doc-%{version}/html $RPM_BUILD_ROOT%{_datadir}/dx/html
+rm -rf $RPM_BUILD_ROOT%{_datadir}/{bin,dx/{bin/dx,man,include,doc}}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,12 +122,30 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
-%{_includedir}/*
-%{_libdir}/*
 %dir %{_datadir}/dx
-%{_datadir}/dx/bin
+%attr(755,root,root) %{_datadir}/dx/bin
 %{_datadir}/dx/bin_linux
 %{_datadir}/dx/fonts
-%{_datadir}/dx/help
+%{_datadir}/dx/lib
 %{_datadir}/dx/ui
-%doc %{_datadir}/doc/dx/*
+%doc doc/README*
+%{_mandir}/manl/*
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/*
+%exclude %{_libdir}/dx/*.mak
+%exclude %{_libdir}/dx/*.la
+%exclude %{_libdir}/dx/*.so
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/*
+%{_libdir}/dx/*.mak
+%{_libdir}/dx/*.la
+%{_libdir}/dx/*.so
+
+%files doc
+%defattr(644,root,root,755)
+%{_docdir}/%{name}-doc-%{version}
+%{_datadir}/dx/h*