- A lot of changes spec rewrited in, I am hope, PLD style.

- Version updated to 5.1.1
- rewision set to 1
- remove prewius patch. The reason of remowing is that it doesn't fit to this grace version
- Add DESTDIR patch

Changed files:
    grace.spec -> 1.10

diff --git a/grace.spec b/grace.spec
index ce832deade30cd300efe12dc9b3747b7814d2a4d..00241cdd1cee4469ae88b9e1c358a779fceb9f46 100644 (file)
--- a/grace.spec
+++ b/grace.spec
@@ -1,17 +1,21 @@
 Summary:       Numerical Data Processing and Visualization Tool (grace)
 Name:          grace
-Version:       5.1.0
+Version:       5.1.1
 Release:       1
 License:       GPL
+Vendor:                PLD
 Group:         Applications/Math
+######         /scratch/pele/PLD/builder/rpm/SOURCES/rpm.groups: no such file
 Group(pl):     Aplikacje/Matematyczne
 Source0:       ftp://plasma-gate.weizmann.ac.il/pub/grace/src/%{name}-%{version}.tar.gz
-Source1:       xmgrace
-Source2:       fftw.tar.gz
-Patch0:                %{name}.perl.patch
-Icon:          %{name}.gif
+URL:           http://plasma-gate.weizmann.ac.il/Grace/        
+Patch0:                %{name}-DESTDIR.patch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define _prefix /usr/X11R6
+%define _mandir %{_prefix}/man
+%define _docdir /usr/share/doc
+
 %description
 Grace is a Motif application for two-dimensional data visualization.
 Grace can transform the data using free equations, FFT, cross- and
@@ -28,112 +32,52 @@ maj
 chodzi o monitorowanie i transformacjê danych oraz tworzenie wykresów
 do publikacji.
 
-%package dynamic
-Group:         Applications/Math
-Group(pl):     Aplikacje/Matematyczne
-Summary:       Numerical Data Processing and Visualization Tool (grace)
-Provides:      %{name}
-Conflicts:     %{name}-semistatic
-
-%description dynamic
-Grace is a Motif application for two-dimensional data visualization.
-Grace can transform the data using free equations, FFT, cross- and
-auto-correlation, differences, integrals, histograms, and much more.
-The generated figures are of high quality. Grace is a very convenient
-tool for data inspection, data transformation, and and for making
-figures for publications.
-
-%package semistatic
-Group:         Applications/Math
-Group(pl):     Aplikacje/Matematyczne
-Summary:       grace with statically linked Motif libraries
-Provides:      %{name}
-Conflicts:     %{name}-dynamic
-
-%description semistatic
-Grace is a Motif application for two-dimensional data visualization.
-Grace can transform the data using free equations, FFT, cross- and
-auto-correlation, differences, integrals, histograms, and much more.
-The generated figures are of high quality. Grace is a very convenient
-tool for data inspection, data transformation, and and for making
-figures for publications.
-
-In this package the Motif libraries are linked statically for users
-who have no Motif runtime libraries.
-
 %prep
 %setup -q
 %patch0 -p1
-tar -xzf $RPM_SOURCE_DIR/fftw.tar.gz
 
 %build
-%configure
-
+%configure     --enable-grace-home=%{_datadir}/%{name} \
+               --mandir=%{_mandir}\
+               --libdir=%{_libdir}\
+               --includedir=%{_includedir}\
+               --bindir=%{_bindir}\
+               --datadir=%{_datadir}\
+               --enable-editres \
+               --enable-extra-incpath=$PKG_BUILD_DIR/include \
+               --enable-extra-ldpath=$PKG_BUILD_DIR/lib --enable-debug
 %{__make}
 
-cd ..
-rm -rf gd1.3 fftw-1.3
-./configure --prefix=/usr/X11R6 --enable-grace-home=/usr/X11R6/lib/X11/grace \
-       --enable-editres \
-       --enable-extra-incpath=$PKG_BUILD_DIR/include \
-       --enable-extra-ldpath=$PKG_BUILD_DIR/lib --enable-debug
-%{__make}
-cd src
-rm xmgrace
-`make -n xmgrace | grep '^gcc' | head -1 | \
- sed -e 's/\([ \t]\|^\)-lnetcdf\b/\1-Wl,-Bstatic,-lnetcdf,-Bdynamic/g'`
-mv xmgrace xmgrace.dynamic
-`make -n xmgrace | grep '^gcc' | head -1 | \
- sed -e 's/\([ \t]\|^\)-lXm\b/\1-Wl,-Bstatic,-lXm,-Bdynamic/g' \
-     -e 's/\([ \t]\|^\)-lXbae\b/\1-Wl,-Bstatic,-lXbae,-Bdynamic/g' \
-     -e 's/\([ \t]\|^\)-lnetcdf\b/\1-Wl,-Bstatic,-lnetcdf,-Bdynamic/g'`
-cd ..
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
-%{__make} PREFIX=$RPM_BUILD_ROOT%{_prefix}/X11R6 \
-GRACE_HOME=$RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/grace \
-     install
-strip $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/grace/bin/xmgrace
-mv $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/grace/bin/xmgrace \
-$RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/grace/bin/xmgrace.semistatic
-strip $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/grace/bin/grconvert
-install -s src/xmgrace.dynamic $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/grace/bin
-rm -f $RPM_BUILD_ROOT%{_prefix}/X11R6/bin/xmgrace
-rm -f $RPM_BUILD_ROOT%{_prefix}/X11R6/bin/gracebat
-install -m755 $RPM_SOURCE_DIR/xmgrace $RPM_BUILD_ROOT%{_prefix}/X11R6/bin/xmgrace
-ln -sf %{_prefix}/X11R6/bin/xmgrace $RPM_BUILD_ROOT%{_prefix}/X11R6/bin/gracebat
-install -d $RPM_BUILD_ROOT%{_includedir}
-ln -sf %{_prefix}/X11R6/lib/X11/grace/include/grace_np.h \
-    $RPM_BUILD_ROOT%{_includedir}/grace_np.h
-install -d $RPM_BUILD_ROOT%{_libdir}
-ln -sf %{_prefix}/X11R6/lib/X11/grace/lib/libgrace_np.a \
-    $RPM_BUILD_ROOT%{_libdir}/libgrace_np.a
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_docdir}
 
-cd $RPM_BUILD_ROOT
-find .%{_prefix}/X11R6/lib/X11/grace -type d \
-       | sed 's,^\.,\%attr(-\,root\,root) \%dir ,' \
-       > $RPM_BUILD_DIR/file.list.%{name}
-find . -type f \
-       | egrep -v 'xmgrace\.(dynamic|semistatic)' \
-       | sed 's,^\.,\%attr(-\,root\,root) ,' \
-               >> $RPM_BUILD_DIR/file.list.%{name}
-find . -type l \
-       | sed 's,^\.,\%attr(-\,root\,root) ,' \
-               >> $RPM_BUILD_DIR/file.list.%{name}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
+gzip -9nf      $RPM_BUILD_ROOT%{_mandir}/man*/* \
+               $RPM_BUILD_ROOT%{_docdir}/%{name}/*.html\
+               $RPM_BUILD_ROOT%{_docdir}/%{name}/*.dat\
+               $RPM_BUILD_ROOT%{_docdir}/%{name}/*.agr\
+               $RPM_BUILD_ROOT%{_docdir}/%{name}/mygraph.png\
+               $RPM_BUILD_ROOT%{_docdir}/%{name}/shiftdata.sh\
+               $RPM_BUILD_ROOT%{_docdir}/%{name}/examples/*
 
 %clean
-if [ "x$RPM_BUILD_ROOT" != "x/" ]; then
-    rm -rf $RPM_BUILD_ROOT
-fi
-rm -f $RPM_BUILD_DIR/file.list.%{name}
-
-%files dynamic -f ../file.list.%{name}
-%defattr(644,root,root,755)
-%{_prefix}/X11R6/lib/X11/grace/bin/xmgrace.dynamic
 
-%files semistatic -f ../file.list.%{name}
+%files 
 %defattr(644,root,root,755)
-%{_prefix}/X11R6/lib/X11/grace/bin/xmgrace.semistatic
+%config(noreplace) %verify(not size, mtime, md5) %{_sysconfdir}/grace/*
+%doc /usr/share/doc/grace/*.html.gz
+%doc /usr/share/doc/grace/*.dat.gz
+%doc /usr/share/doc/grace/*.agr.gz
+%doc /usr/share/doc/grace/mygraph.png.gz
+%doc /usr/share/doc/grace/philosophical-gnu-sm.jpg
+%doc /usr/share/doc/grace/shiftdata.sh.gz
+%doc /usr/share/doc/grace/examples/*
+%attr(755,root,root)%{_bindir}/*
+%{_libdir}/grace/*
+%{_includedir}/*
+%{_datadir}/grace/auxiliary/*
+%config(noreplace) %verify(not size, mtime, md5) %{_datadir}/grace/templates/*
+%{_datadir}/grace/fonts/*