- s/--enable-debug/--disable-debug/

- removed FFTW patch (obsoleted? FFTW files are fftw, not dfftw)
- added netCDF support, use internal XmHTML-based browser to view help
- docs and examples moved to %%{_datadir}/grace/ and marked as doc
  (reason: grace uses it as online help)
- etc patch: use gracerc in /etc/grace
- release 2

Changed files:
    grace-DESTDIR.patch -> 1.3
    grace-FFTW.patch -> 1.2
    grace-etc.patch -> 1.1
    grace.spec -> 1.17

diff --git a/grace-DESTDIR.patch b/grace-DESTDIR.patch
index eec179592fd7a2a69c1da78bdc150ecbec7eb2b7..54a19d17c2364ce5a0942ff583e04f07273a5e8c 100644 (file)
--- a/grace-DESTDIR.patch
+++ b/grace-DESTDIR.patch
@@ -73,8 +73,8 @@ diff -urN grace-5.1.2/doc/Makefile grace-DESTDIR/doc/Makefile
 -      cd $(GRACE_HOME)/doc; \
 -      for i in $(MANLINKS); do $(RM) $$i; $(LN_S) $(GRACEMAN) $$i; done
 -
-+      $(MKINSTALLDIRS) $(DESTDIR)/usr/share/doc/grace/
-+      for i in $?; do $(INSTALL_DATA) $$i $(DESTDIR)/usr/share/doc/grace/; done
++      $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/doc/
++      for i in $?; do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/doc/; done
 +      $(MKINSTALLDIRS) $(DESTDIR)$(MANDIR)/man1
 +      $(INSTALL_DATA) $(GRACEMAN) $(DESTDIR)$(MANDIR)/man1/$(GRACEMAN)
  links : $(MANPAGES)
@@ -90,9 +90,9 @@ diff -urN grace-5.1.2/examples/Makefile grace-DESTDIR/examples/Makefile
 -      $(MKINSTALLDIRS) $(GRACE_HOME)/examples
 -      for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/examples; done
 -      $(INSTALL_PROGRAM) $(DOTEST) $(GRACE_HOME)/examples/$(DOTEST)
-+      $(MKINSTALLDIRS) $(DESTDIR)/usr/share/doc/grace/examples
-+      for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(DESTDIR)/usr/share/doc/grace/examples; done
-+      $(INSTALL_PROGRAM) $(DOTEST) $(DESTDIR)/usr/share/doc/grace/examples/$(DOTEST)
++      $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/examples
++      for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/examples; done
++      $(INSTALL_PROGRAM) $(DOTEST) $(DESTDIR)$(DATADIR)/grace/examples/$(DOTEST)
  
  links : dummy
  

diff --git a/grace-FFTW.patch b/grace-FFTW.patch
deleted file mode 100644 (file)
index d02c3ef..0000000
--- a/grace-FFTW.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -urN grace-5.1.2/configure grace-5.1.2-FFTW/configure
---- grace-5.1.2/configure      Sun Sep 10 14:14:00 2000
-+++ grace-5.1.2-FFTW/configure Thu Dec  7 01:36:37 2000
-@@ -58,7 +58,7 @@
- ac_help="$ac_help
-   --with-netcdf-libraries=OBJ  use OBJ as netCDF libraries [-lnetcdf]"
- ac_help="$ac_help
--  --with-fftw-library=OBJ      use OBJ as FFTW library [-lfftw]"
-+  --with-fftw-library=OBJ      use OBJ as FFTW library [-ldfftw]"
- ac_help="$ac_help
-   --with-zlib-library=OBJ      use OBJ as ZLIB library [-lz]"
- ac_help="$ac_help
-@@ -7300,7 +7300,7 @@
- 
-   if test "x$fftw_library" = "x"
-   then
--    fftw_library=-lfftw
-+    fftw_library=-ldfftw
-   fi
- 
-   echo $ac_n "checking "for FFTW"""... $ac_c" 1>&6
-@@ -7324,7 +7324,7 @@
-     cat > conftest.$ac_ext <<EOF
- #line 7326 "configure"
- #include "confdefs.h"
--#include <fftw.h>
-+#include <dfftw.h>
- int main() {
- main();
- ; return 0; }
-diff -urN grace-5.1.2/src/fourier.c grace-5.1.2-FFTW/src/fourier.c
---- grace-5.1.2/src/fourier.c  Tue Jun  6 02:16:00 2000
-+++ grace-5.1.2-FFTW/src/fourier.c     Thu Dec  7 01:35:33 2000
-@@ -230,7 +230,7 @@
- #else
- /* Start of new FFTW-based transforms by Marcus H. Mendenhall */
- 
--#include <fftw.h>
-+#include <dfftw.h>
- #include <string.h>
- 
- static char  *wisdom_file=0;

diff --git a/grace-etc.patch b/grace-etc.patch
new file mode 100644 (file)
index 0000000..2f44f8a
--- /dev/null
+++ b/grace-etc.patch
@@ -0,0 +1,17 @@
+--- grace-5.1.2/src/files.c.orig       Thu Jun 22 23:48:54 2000
++++ grace-5.1.2/src/files.c    Sat Mar 17 22:40:19 2001
+@@ -690,6 +690,14 @@
+             return buf;
+         }
+ 
++      if (strstr(fn, "gracerc") != NULL) {
++          strcpy(buf, "/etc/grace/");
++          strcat(buf, fn);
++          if (stat(buf, &statb) == 0) {
++              return buf;
++          }
++      }
++
+       /* the last attempt: in $GRACE_HOME */
+         strcpy(buf, get_grace_home());
+       strcat(buf, "/");

diff --git a/grace.spec b/grace.spec
index 35baf4635485c6ba6f329291c7023d2dfe3ebeff..6f785374cdc3e0f0218785bb78e3a7672b7fcc92 100644 (file)
--- a/grace.spec
+++ b/grace.spec
@@ -2,7 +2,7 @@ Summary:        Numerical Data Processing and Visualization Tool (grace)
 Summary(pl):   Narzêdzie do numerycznej obróbki i wizualizacji danych
 Name:          grace
 Version:       5.1.2
-Release:       1
+Release:       2
 License:       GPL
 Group:         Applications/Math
 Group(de):     Applikationen/Mathematik
@@ -11,10 +11,9 @@ Source0:     ftp://plasma-gate.weizmann.ac.il/pub/grace/src/%{name}-%{version}.tar.g
 Patch0:                %{name}-DESTDIR.patch
 Patch1:                %{name}-HOME-ETC.patch
 Patch2:                %{name}-PDFlib.patch
-Patch3:                %{name}-FFTW.patch
+Patch3:                %{name}-etc.patch
 URL:           http://plasma-gate.weizmann.ac.il/Grace/
 BuildRequires: fftw-devel
-BuildRequires: zlib-devel >= 1.0.3
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel >= 0.9.6
 BuildRequires: libtiff-devel
@@ -22,14 +21,16 @@ BuildRequires:      pdflib-devel >= 3.0
 BuildRequires: lesstif-devel
 BuildRequires: XFree86-devel
 BuildRequires: Xbae-devel
+BuildRequires: XmHTML-devel >= 1.1.5
+BuildRequires: netcdf-devel >= 3.0
+BuildRequires: t1lib-devel
 Requires:      pdflib >= 3.0
 Requires:      zlib >= 1.0.3
 Requires:      libpng >= 0.9.6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define _prefix /usr/X11R6
-%define _mandir %{_prefix}/man
-%define _docdir /usr/share/doc
+%define                _prefix         /usr/X11R6
+%define                _mandir         %{_prefix}/man
 
 %description
 Grace is a Motif application for two-dimensional data visualization.
@@ -60,36 +61,40 @@ do publikacji.
        --enable-editres \
        --enable-extra-incpath=$PKG_BUILD_DIR/include \
        --enable-extra-ldpath=$PKG_BUILD_DIR/lib \
-       --enable-debug
+       --disable-debug
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_docdir}
+#install -d $RPM_BUILD_ROOT%{_docdir}
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
-gzip -9nf $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/*
+#rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
+rm -f $RPM_BUILD_ROOT%{_datadir}/grace/doc/{*.sgml,*.dvi,*.1} \
+       $RPM_BUILD_ROOT%{_datadir}/grace/examples/dotest
+
+gzip -9nf $RPM_BUILD_ROOT%{_datadir}/grace/doc/*.dat \
+       $RPM_BUILD_ROOT%{_datadir}/grace/doc/*.agr \
+       $RPM_BUILD_ROOT%{_datadir}/grace/doc/*.sh
+
+#gzip -9nf $RPM_BUILD_ROOT%{_docdir}/%{name}/*.dat\
+#      $RPM_BUILD_ROOT%{_docdir}/%{name}/*.agr\
+#      $RPM_BUILD_ROOT%{_docdir}/%{name}/shiftdata.sh\
+#      $RPM_BUILD_ROOT%{_docdir}/%{name}/examples/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files 
 %defattr(644,root,root,755)
+%docdir %{_datadir}/grace/doc
+%docdir %{_datadir}/grace/examples
+%{_datadir}/grace/doc
+%{_datadir}/grace/examples
 %dir %{_sysconfdir}/grace
+
 %config(noreplace) %verify(not size, mtime, md5) %{_sysconfdir}/grace/*
-%doc /usr/share/doc/grace/*.html
-%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}/*