- Many thinks done. Almoust finished

- Needs a fresh look.
- Dirty hack with links is neccessary due to the
  comliicity of sources and a way it was design.
- For me it works. And is really cool.

Changed files:
    dx.spec -> 1.11

diff --git a/dx.spec b/dx.spec
index 24aff5727a2333eae7a90ad16a47bad36a92934f..198abe081de294bc5fc74b676444b6506a9f9f3f 100644 (file)
--- a/dx.spec
+++ b/dx.spec
@@ -1,14 +1,14 @@
 Summary:       Excelent tool to making visualization of data
 Summary(pl):   Doskona³e narzêdzie do wizualizacji danych
 Name:          dx
-Version:       4.1.3
+Version:       4.2.0
 Release:       1
 License:       IPL
 Group:         Applications
 Source0:       http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz
 Source1:       http://opendx.npaci.edu/source/%{name}samples-%{version}.tar.gz
 Patch0:                %{name}-DESTDIR.patch
-Patch1:                %{name}-acfix.patch
+#Patch1:               %{name}-acfix.patch
 URL:           http://www.opendx.org/
 BuildRequires: flex
 BuildRequires: ImageMagick-devel
@@ -34,43 +34,43 @@ daje u
 %prep
 %setup  -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 
 %build
 rm -f missing
-#autoheader
-#aclocal
-#autoconf
-#automake -a -c
+autoheader
+aclocal
+autoconf
+automake -a -c
 %configure2_13 \
        --prefix=%{_prefix} \
        --datadir=%{_datadir} \
-       --mandir=%{_mandir}
+       --mandir=%{_mandir} \
+       --without-javadx
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-#install -d $RPM_BUILD_ROOT%{_docdir}/%{name}
-#install -d $RPM_BUILD_ROOT%{_includedir}/%{name}
-#install -d $RPM_BUILD_ROOT%{_libdir}/%{name}
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-gzip -9nf README ChangeLog
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+
+ln -sf %{_bindir} %{_datadir}/dx/bin
+ln -sf %{_bindir} %{_datadir}/dx/bin_linux
+
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
 %{_includedir}/*
 %{_libdir}/*
-%doc *.gz
 %dir %{_datadir}/dx
 %{_datadir}/dx/fonts
-%{_datadir}/dx/bin
 %{_datadir}/dx/help
 %{_datadir}/dx/ui
+%doc %{_datadir}/doc/dx/*