Just passed trough adapter

Changed files:
    dx.spec -> 1.2

diff --git a/dx.spec b/dx.spec
index e645430b92e30f2f13609fc2012c99cbd86f2735..0bc5f68470e0d1dc336fe0d51540702095acde10 100644 (file)
--- a/dx.spec
+++ b/dx.spec
@@ -4,19 +4,20 @@ Name:         dx
 Version:       4.1.0
 Release:       1
 Group:         -
+######         Unknown group!
 Group(de):     -
 Group(fr):     -
 Group(pl):     -
 Group(tr):     -
 Copyright:     IPL
-Vendor:         PLD
-Source0:       http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz        
-Source1:       http://opendx.npaci.edu/source/dxsamples-4.0.8.tar.gz   
-Patch0:                dx-DESTDIR.patch
+Vendor:                PLD
+Source0:       http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz
+Source1:       http://opendx.npaci.edu/source/%{name}samples-4.0.8.tar.gz
+Patch0:                %{name}-DESTDIR.patch
 URL:           http://www.opendx.org   
 #BuildPrereq:  
 #Requires:     
-#Prereq:               
+#Prereq:       
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define         _prefix         /usr/X11R6
@@ -24,9 +25,10 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description 
 OpenDX is a uniquely powerful, full-featured software package for the
-visualization of scientific, engineering and analytical data: Its open system
-design is built on a standard interface environments.  And its sophisticated
-data model provides users with great flexibility in creating visualizations.
+visualization of scientific, engineering and analytical data: Its open
+system design is built on a standard interface environments. And its
+sophisticated data model provides users with great flexibility in
+creating visualizations.
 
 %description -l pl
 
@@ -37,12 +39,11 @@ data model provides users with great flexibility in creating visualizations.
 %build
 autoheader;autoconf;automake; 
 
-LDFLAGS="-s" ; export LDFLAGS
 %configure     --prefix=%{_prefix}     \
                --datadir=%{_datadir}   \
                --mandir=%{_mandir}     
 
-make
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -52,7 +53,7 @@ install -d $RPM_BUILD_ROOT%{_includedir}/%{name}
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}
 
 
-make install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 
 gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man*/* \
@@ -71,17 +72,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) /usr/X11R6/bin/*
-/usr/X11R6/include/*
-/usr/X11R6/include/dx/*
-/usr/X11R6/lib/*
+%attr(755,root,root) %{_bindir}/*
+%{_includedir}/*
+%{_includedir}/dx/*
+%{_libdir}/*
 %doc /usr/share/doc/dx/*
 %doc /usr/share/doc/dx/html/*
-/usr/X11R6/share/dx/fonts/*
-/usr/X11R6/share/dx/bin/*
-/usr/X11R6/share/dx/help/*
-/usr/X11R6/share/dx/ui/*
-
-
-
-%changelog
+%{_datadir}/dx/fonts/*
+%{_datadir}/dx/bin/*
+%{_datadir}/dx/help/*
+%{_datadir}/dx/ui/*