rpms/grace/devel grace-detect-netcdf.diff, NONE, 1.1 grace.spec, 1.17, 1.18
José Abílio Oliveira Matos (jamatos)
fedora-extras-commits at redhat.com
Fri Sep 28 23:23:30 UTC 2007
Author: jamatos
Update of /cvs/pkgs/rpms/grace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11930
Modified Files:
grace.spec
Added Files:
grace-detect-netcdf.diff
Log Message:
* Fri Sep 28 2007 José Matos <jamatos[AT]fc.up.pt> - 5.1.21-4
- Correctly detect netcdf (signature has changed).
- Add libXmu-devel as BR.
- Add conditional dependency on chkfontpath for <= F8.
grace-detect-netcdf.diff:
--- NEW FILE grace-detect-netcdf.diff ---
--- configure.old 2007-02-16 22:44:49.000000000 +0000
+++ configure 2007-09-28 23:03:29.000000000 +0100
@@ -15181,7 +15181,7 @@
int main(void) {
char *vlib;
vlib = nc_inq_libvers();
- if (strcmp(vlib, "3.0") < 0) {
+ if (strcmp(vlib, "\"3.0\"") < 0) {
exit(1);
}
exit(0);
Index: grace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grace/devel/grace.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- grace.spec 27 Sep 2007 16:16:02 -0000 1.17
+++ grace.spec 28 Sep 2007 23:22:58 -0000 1.18
@@ -3,7 +3,7 @@
Name: grace
Version: 5.1.21
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Numerical Data Processing and Visualization Tool
License: GPLv2+
@@ -14,13 +14,14 @@
Source2: %{name}.png
Source3: cephes-license.email
Source4: LICENSE.cephes
-Patch: %{name}-gracerc-no_auxiliary.diff
+Patch0: %{name}-gracerc-no_auxiliary.diff
+Patch1: %{name}-detect-netcdf.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Group: Applications/Engineering
BuildRequires: libjpeg-devel, libpng-devel, netcdf-devel
BuildRequires: zlib-devel, fftw2-devel, t1lib-devel
-BuildRequires: xbae-devel, gcc-gfortran
+BuildRequires: xbae-devel, gcc-gfortran, libXmu-devel
BuildRequires: desktop-file-utils, font-utils
%if "%{fedora}" < "5"
@@ -31,6 +32,10 @@
Requires: nedit
Requires: htmlview
+%if "%{fedora}" < "8"
+Requires(post): chkfontpath
+Requires(postun): chkfontpath
+%endif
%description
Grace is a Motif application for two-dimensional data visualization.
@@ -53,7 +58,9 @@
%prep
%setup -q
-%patch
+%patch0
+%patch1
+
# remove stripping option to have meaningfull debuginfo packages
sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' */Makefile
rm -rf Xbae
@@ -70,7 +77,6 @@
--with-x \
--with-f77=gfortran \
--with-extra-incpath=%{_includedir}/netcdf-3 \
- --with-extra-ldpath=%{_libdir}/netcdf-3 \
--with-bundled-xbae=no
make %{?_smp_mflags}
@@ -130,14 +136,19 @@
--add-category Graphics \
%{buildroot}%{_datadir}/applications/%{name}.desktop
+%if "%{fedora}" >= "8"
mkdir -p $RPM_BUILD_ROOT%{catalogue}
ln -sf %{_datadir}/%{name}/type1 $RPM_BUILD_ROOT%{catalogue}/%{name}-type1
+%endif
%clean
rm -rf %{buildroot}
%post
+%if "%{fedora}" < "8"
+%{_sbindir}/chkfontpath -q -a %{_datadir}/%{name}/fonts/type1
+%endif
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -145,6 +156,9 @@
%postun
+%if "%{fedora}" < "8"
+%{_sbindir}/chkfontpath -q -r %{_datadir}/%{name}/fonts/type1
+%endif
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -164,8 +178,9 @@
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/*/*/*
%{_mandir}/man*/*
+%if "%{fedora}" >= "8"
%{catalogue}/%{name}-type1
-
+%endif
%files devel
%defattr(-,root,root,-)
@@ -177,6 +192,11 @@
%changelog
+* Fri Sep 28 2007 José Matos <jamatos[AT]fc.up.pt> - 5.1.21-4
+- Correctly detect netcdf (signature has changed).
+- Add libXmu-devel as BR.
+- Add conditional dependency on chkfontpath for <= F8.
+
* Thu Sep 27 2007 José Matos <jamatos[AT]fc.up.pt> - 5.1.21-3
- Remove dependency on chkfontpath, thanks to ajax for the patch. (#252277)
More information about the fedora-extras-commits
mailing list