rpms/grace/devel grace.spec,1.10,1.11
José AbÃlio Oliveira Matos (jamatos)
fedora-extras-commits at redhat.com
Sun Sep 24 18:23:54 UTC 2006
Author: jamatos
Update of /cvs/extras/rpms/grace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12176
Modified Files:
grace.spec
Log Message:
* Sun Sep 24 2006 José Matos <jamatos[AT]fc.up.pt> - 5.1.20-3
- Use external xbae.
- Revert test for fedora macro so that it works by default for latest
versions if the macro is not defined.
Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/devel/grace.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- grace.spec 11 Sep 2006 20:44:28 -0000 1.10
+++ grace.spec 24 Sep 2006 18:23:54 -0000 1.11
@@ -1,10 +1,10 @@
Name: grace
Version: 5.1.20
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Numerical Data Processing and Visualization Tool
License: GPL
-# Xbae is BSD and cephes is LGPL, see also Source3 and Source4
+# cephes is LGPL, see also Source3 and Source4
URL: http://plasma-gate.weizmann.ac.il/Grace/
Source0: ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
@@ -17,13 +17,13 @@
BuildRequires: libjpeg-devel, libpng-devel, netcdf-devel
BuildRequires: zlib-devel, fftw2-devel, t1lib-devel
-BuildRequires: openmotif-devel, gcc-gfortran
+BuildRequires: xbae-devel, gcc-gfortran
BuildRequires: desktop-file-utils, font-utils
-%if "%{fedora}" >= "5"
-BuildRequires: libXpm-devel
-%else
+%if "%{fedora}" < "5"
BuildRequires: xorg-x11-devel
+%else
+BuildRequires: libXpm-devel
%endif
Requires: nedit
@@ -55,6 +55,7 @@
%patch
# remove stripping option to have meaningfull debuginfo packages
sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' */Makefile
+rm -rf Xbae
%build
cp %{SOURCE3} %{SOURCE4} .
@@ -68,7 +69,8 @@
--with-x \
--with-f77=gfortran \
--with-extra-incpath=%{_includedir}/netcdf-3 \
- --with-extra-ldpath=%{_libdir}/netcdf-3
+ --with-extra-ldpath=%{_libdir}/netcdf-3 \
+ --with-bundled-xbae=no
make %{?_smp_mflags}
@@ -77,7 +79,6 @@
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
-cp Xbae/LICENSE LICENSE.Xbae
rm -f doc/*.1
mkdir -pm 755 \
@@ -143,7 +144,7 @@
%files
%defattr(-,root,root,-)
-%doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README LICENSE.Xbae
+%doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README
%doc cephes-license.email LICENSE.cephes
%doc examples/ doc/
%config(noreplace) %{_sysconfdir}/%{name}/
@@ -166,6 +167,11 @@
%changelog
+* Sun Sep 24 2006 José Matos <jamatos[AT]fc.up.pt> - 5.1.20-3
+- Use external xbae.
+- Revert test for fedora macro so that it works by default for latest
+ versions if the macro is not defined.
+
* Mon Sep 11 2006 José Matos <jamatos[AT]fc.up.pt> - 5.1.20-2
- Fix html documentation viewer. (#188696)
More information about the fedora-extras-commits
mailing list