From 7f2355dc5146f06f72c95ada99968239e34321c7 Mon Sep 17 00:00:00 2001 From: José Abílio Oliveira Matos Date: Feb 16 2006 10:21:53 +0000 Subject: - Unify spec file starting from FC-4. - Rebuild for FC-5. --- diff --git a/grace.spec b/grace.spec index 50cb2ec..5b7c434 100644 --- a/grace.spec +++ b/grace.spec @@ -1,6 +1,6 @@ Name: grace Version: 5.1.19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Numerical Data Processing and Visualization Tool License: GPL @@ -16,9 +16,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Group: Applications/Engineering BuildRequires: libjpeg-devel, libpng-devel, netcdf-devel -BuildRequires: zlib-devel, libXpm-devel, fftw2-devel, t1lib-devel +BuildRequires: zlib-devel, fftw2-devel, t1lib-devel BuildRequires: openmotif-devel, gcc-gfortran BuildRequires: desktop-file-utils, font-utils + +%if "%{fedora}" >= "5" +BuildRequires: libXpm-devel +%else +BuildRequires: xorg-x11-devel +%endif + Requires: nedit Requires(post): chkfontpath Requires(postun): chkfontpath @@ -155,6 +162,10 @@ rm -rf %{buildroot} %changelog +* Thu Feb 16 2006 José Matos - 5.1.19-3 +- Unify spec file starting from FC-4. +- Rebuild for FC-5. + * Wed Feb 1 2006 José Matos - 5.1.19-2 - Update BR from fftw to fftw2. - Remove references to previous profile scripts. @@ -163,7 +174,7 @@ rm -rf %{buildroot} - new upstream version - remove name from Summary - disable setting environment variable GRACE_HOME -- replace x11-xorg-devel by libXpm-devel in BuildRequires +- replace x11-xorg-devel by libXpm-devel in BuildRequires for FC-5. * Mon Jan 9 2006 Patrice Dumas - 5.1.18-7 - put config files in /etc