- BR: autoconf,automake; moved making links from post to install

Changed files:
    dx.spec -> 1.12

diff --git a/dx.spec b/dx.spec
index 198abe081de294bc5fc74b676444b6506a9f9f3f..65955e718ca6a651badbeb2f63a6bd9d648bb075 100644 (file)
--- a/dx.spec
+++ b/dx.spec
@@ -10,8 +10,10 @@ Source1:     http://opendx.npaci.edu/source/%{name}samples-%{version}.tar.gz
 Patch0:                %{name}-DESTDIR.patch
 #Patch1:               %{name}-acfix.patch
 URL:           http://www.opendx.org/
-BuildRequires: flex
 BuildRequires: ImageMagick-devel
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: flex
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define         _prefix         /usr/X11R6
@@ -39,9 +41,9 @@ daje u
 %build
 rm -f missing
 autoheader
-aclocal
-autoconf
-automake -a -c
+%{__aclocal}
+%{__autoconf}
+%{__automake} -a
 %configure2_13 \
        --prefix=%{_prefix} \
        --datadir=%{_datadir} \
@@ -55,21 +57,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
 
 %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}/*
 %dir %{_datadir}/dx
+%{_datadir}/dx/bin
+%{_datadir}/dx/bin_linux
 %{_datadir}/dx/fonts
 %{_datadir}/dx/help
 %{_datadir}/dx/ui