[grib_api] Definitions are not documentation Drop INSTALL from docs Add Requires jasper-devel to -devel package

Orion Poplawski orion at fedoraproject.org
Mon Jul 9 15:51:16 UTC 2012


commit e68c974e305d5962b69a926db12ff192aa1cd9b0
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Jul 9 09:51:15 2012 -0600

    Definitions are not documentation
    Drop INSTALL from docs
    Add Requires jasper-devel to -devel package
    Don't change ksh path on Fedora 17+

 grib_api.spec |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/grib_api.spec b/grib_api.spec
index 15c6e0c..11b2fd2 100644
--- a/grib_api.spec
+++ b/grib_api.spec
@@ -1,6 +1,6 @@
 Name:           grib_api
 Version:        1.9.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        WMO FM-92 GRIB (v1,v2) interface accessible from C and FORTRAN programs
 
 Group:          Applications/System
@@ -25,6 +25,7 @@ Group:      Development/Languages
 Requires:   %{name}%{?_isa} = %{version}-%{release}
 Requires:   %{name}-static%{?_isa} = %{version}-%{release}
 Requires:   gcc-gfortran%{?_isa}
+Requires:   jasper-devel%{_?isa}
 
 %description devel
 Header files and libraries for building a extension library
@@ -41,8 +42,10 @@ Static libraries for %{name}
 %prep
 %setup -q
 %patch0 -p1 -b .paths
-# Fix ksh patch
+%if 0%{?fedora} < 17
+# Fix ksh path
 sed -i -e 's,/usr/bin/ksh,/bin/ksh,' tools/grib1to2.txt
+%endif
 
 
 %build
@@ -65,7 +68,7 @@ done
 mv %{buildroot}/%{_bindir}/parser %{buildroot}/%{_bindir}/grib-parser
 
 # Give these files some normal permissions
-chmod 644 INSTALL README LICENSE COPYING.LESSER ChangeLog AUTHORS gpl-3.0.txt
+chmod 644 README LICENSE COPYING.LESSER ChangeLog AUTHORS gpl-3.0.txt
 
 # Move the fortran module into _fmoddir
 mkdir -p %{buildroot}%{_fmoddir}
@@ -76,22 +79,31 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc INSTALL README LICENSE COPYING.LESSER ChangeLog AUTHORS gpl-3.0.txt
-%doc %{_datadir}/%{name}/
+%doc README LICENSE COPYING.LESSER ChangeLog AUTHORS gpl-3.0.txt
 %{_bindir}/*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/definitions/
+%doc %{_datadir}/%{name}/ifs_samples/
+%doc %{_datadir}/%{name}/samples/
 
 %files devel
 %defattr(-,root,root,-)
-%doc INSTALL README LICENSE COPYING.LESSER ChangeLog AUTHORS gpl-3.0.txt
+%doc README LICENSE COPYING.LESSER ChangeLog AUTHORS gpl-3.0.txt
 %{_includedir}/*
 %{_fmoddir}/%{name}.mod
 
 %files static
 %defattr(-,root,root,-)
-%doc INSTALL README LICENSE COPYING.LESSER ChangeLog AUTHORS gpl-3.0.txt
+%doc README LICENSE COPYING.LESSER ChangeLog AUTHORS gpl-3.0.txt
 %{_libdir}/*.a
 
 %changelog
+* Mon Jul 9 2012 Orion Poplawski <orion at cora.nwra.com> - 1.9.16-3
+- Definitions are not documentation
+- Drop INSTALL from docs
+- Add Requires jasper-devel to -devel package
+- Don't change ksh path on Fedora 17+
+
 * Fri Jul 6 2012 Orion Poplawski <orion at cora.nwra.com> - 1.9.16-2
 - Build fortran interface
 


More information about the scm-commits mailing list