- up to 5.1.12, removed outdated ac25x patch

- added t1lib patch with update for t1lib 5.0.0 API

Changed files:
    grace-ac25x.patch -> 1.2
    grace-t1lib.patch -> 1.1
    grace.spec -> 1.36

diff --git a/grace-ac25x.patch b/grace-ac25x.patch
deleted file mode 100644 (file)
index cb04925..0000000
--- a/grace-ac25x.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- grace-5.1.2/ac-tools/configure.in.orig     Sun Apr 28 11:28:51 2002
-+++ grace-5.1.2/ac-tools/configure.in  Sun Apr 28 11:30:48 2002
-@@ -625,8 +625,8 @@
-   LIBS="$GUI_LIBS $NOGUI_LIBS"
- 
-   dnl **** and some - Xpm lib
--  AC_CHECK_LIB(Xpm,main,GUI_LIBS="-lXpm $GUI_LIBS"; AC_DEFINE(HAVE_XPM)
--                 AC_CHECK_HEADERS(xpm.h X11/xpm.h))
-+  AC_CHECK_LIB(Xpm,main,[GUI_LIBS="-lXpm $GUI_LIBS"; AC_DEFINE(HAVE_XPM)
-+                 AC_CHECK_HEADERS(xpm.h X11/xpm.h)])
- 
-   ACX_RESTORE_STATE
- 

diff --git a/grace-t1lib.patch b/grace-t1lib.patch
new file mode 100644 (file)
index 0000000..7720265
--- /dev/null
+++ b/grace-t1lib.patch
@@ -0,0 +1,22 @@
+--- grace-5.1.12/src/t1fonts.c.orig    Thu Apr  3 20:57:12 2003
++++ grace-5.1.12/src/t1fonts.c Thu Apr  3 21:41:00 2003
+@@ -85,7 +85,7 @@
+         return (RETURN_FAILURE);
+     }
+     
+-    nfonts = T1_Get_no_fonts();
++    nfonts = T1_GetNoFonts();
+     if (nfonts < 1) {
+         return (RETURN_FAILURE);
+     }
+--- grace-5.1.12/src/fontwin.c.orig    Wed Aug 21 22:19:51 2002
++++ grace-5.1.12/src/fontwin.c Thu Apr  3 21:51:41 2003
+@@ -320,7 +320,7 @@
+     Widget font_table = (Widget) data;
+     
+     FontID = value;
+-    switch (CheckForFontID(FontID)) {
++    switch (T1_CheckForFontID(FontID)) {
+     case 0:
+         T1_LoadFont(FontID);
+         break;

diff --git a/grace.spec b/grace.spec
index d5c474632b47bdd782ad0221c92453e0a16494c4..a6b2cacc824167759a2015bcb20d0162ff655ad5 100644 (file)
--- a/grace.spec
+++ b/grace.spec
@@ -1,8 +1,8 @@
 Summary:       Numerical Data Processing and Visualization Tool (grace)
 Summary(pl):   Narzêdzie do numerycznej obróbki i wizualizacji danych
 Name:          grace
-Version:       5.1.9
-Release:       3
+Version:       5.1.12
+Release:       1
 License:       GPL
 Group:         Applications/Math
 Source0:       ftp://plasma-gate.weizmann.ac.il/pub/grace/src/%{name}-%{version}.tar.gz
@@ -11,7 +11,7 @@ Patch0:               %{name}-FHS.patch
 Patch1:                %{name}-home_etc.patch
 Patch2:                %{name}-etc.patch
 Patch3:                %{name}-fontsdir.patch
-Patch4:                %{name}-ac25x.patch
+Patch4:                %{name}-t1lib.patch
 URL:           http://plasma-gate.weizmann.ac.il/Grace/
 BuildRequires: XFree86-devel
 BuildRequires: Xbae-devel
@@ -24,7 +24,7 @@ BuildRequires:        libpng-devel >= 0.9.6
 BuildRequires: libtiff-devel
 BuildRequires: netcdf-devel >= 3.0
 BuildRequires: pdflib-devel >= 4.0.3
-BuildRequires: t1lib-devel
+BuildRequires: t1lib-devel >= 5.0.0
 Requires:      ghostscript-fonts-std
 Requires:      libpng >= 0.9.6
 Requires:      pdflib >= 4.0.3
@@ -65,13 +65,10 @@ cp -f ac-tools/configure.in .
        --enable-editres \
        --enable-extra-incpath=$PKG_BUILD_DIR/include \
        --enable-extra-ldpath=$PKG_BUILD_DIR/lib \
+       --without-bundled-xbae \
        %{!?debug:--disable-debug}
 %{__make}
 
-gzip -9nf $RPM_BUILD_ROOT%{_datadir}/grace/doc/*.dat \
-       $RPM_BUILD_ROOT%{_datadir}/grace/doc/*.agr \
-       $RPM_BUILD_ROOT%{_datadir}/grace/doc/*.sh
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -83,6 +80,10 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/grace/doc/{*.sgml,*.dvi,*.1} \
 install -d $RPM_BUILD_ROOT%{_applnkdir}/Scientific/Plotting
 install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Scientific/Plotting/%{name}.desktop
 
+gzip -9nf $RPM_BUILD_ROOT%{_datadir}/grace/doc/*.dat \
+       $RPM_BUILD_ROOT%{_datadir}/grace/doc/*.agr \
+       $RPM_BUILD_ROOT%{_datadir}/grace/doc/*.sh
+
 %clean
 rm -rf $RPM_BUILD_ROOT