Notification time stamped 2022-05-31 22:18:24 UTC
From 4cc5495b2316fb02a2b3eeb6728c6b8cbbc6d2d2 Mon Sep 17 00:00:00 2001 From: Orion Poplawski orion@cora.nwra.com Date: Jun 20 2018 02:44:48 +0000 Subject: Cleanup spec
---
diff --git a/nco.spec b/nco.spec index c27afe4..3301412 100644 --- a/nco.spec +++ b/nco.spec @@ -2,7 +2,7 @@
Name: nco Version: 4.7.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Suite of programs for manipulating NetCDF/HDF4 files Group: Applications/Engineering License: GPLv3 @@ -10,16 +10,9 @@ URL: http://nco.sourceforge.net/
Source0: https://github.com/nco/nco/archive/%%7Bversion%7D.tar.gz#/%%7Bname%7D-%%7Bve... Patch0: nco-install_C_headers.patch -%if 0%{?rhel} && 0%{?rhel} <= 5 -#Patch out variables from in.cdl that earlier versioins of netcdf complain about -Patch1: nco-4.0.5-fillvalue.patch -%endif
BuildRequires: bison, flex, gawk BuildRequires: netcdf-devel -%if 0%{?rhel} && 0%{?rhel} <= 5 -BuildRequires: libnc-dap-devel -%endif %if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: antlr-C++ %else @@ -67,28 +60,12 @@ This package contains the NCO static libs. %prep %setup -q %patch0 -p1 -b .install_C_headers -%if 0%{?rhel} && 0%{?rhel} <= 5 -%patch1 -p1 -b .fillvalue -%endif
%build -%if 0%{?rhel} && 0%{?rhel} <= 5 -export CPPFLAGS="-I%{_includedir}/netcdf-3 -I%{_includedir}/udunits2" -%else -export CPPFLAGS="-I%{_includedir}/udunits2 -DENABLE_NETCDF4 -DHAVE_NETCDF4_H" -%endif -export CFLAGS="$RPM_OPT_FLAGS -fPIC" -export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive -fPIC" %configure \ HAVE_ANTLR=yes \ - --disable-dependency-tracking --includedir=%{_includedir}/nco \ -%if 0%{?rhel} && 0%{?rhel} <= 5 - --disable-dap-netcdf \ - --enable-dap-opendap -%else - --enable-netcdf4 -%endif + --disable-dependency-tracking --includedir=%{_includedir}/nco make %{?_smp_mflags} %if 0%{?builddocs} make -C doc html pdf @@ -96,8 +73,7 @@ make -C doc html pdf
%install -mkdir -p $RPM_BUILD_ROOT%{_includedir}/nco -make install DESTDIR=$RPM_BUILD_ROOT +%make_install rm $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_infodir}/dir # Ignore non-ELF files @@ -118,7 +94,6 @@ fi
%files -%{!?_licensedir:%global license %%doc} %license doc/LICENSE %doc doc/README doc/rtfm.txt doc/nco.html doc/nco.pdf doc/nco.css %doc doc/index.shtml doc/TODO doc/ChangeLog doc/nco.png doc/nco_news.shtml @@ -167,6 +142,9 @@ fi
%changelog +* Tue Jun 19 2018 Orion Poplawski orion@cora.nwra.com 4.7.5-2 +- Cleanup spec + * Sun Jun 17 2018 Orion Poplawski orion@cora.nwra.com 4.7.5-1 - Update to 4.7.5
https://src.fedoraproject.org/rpms/nco/c/4cc5495b2316fb02a2b3eeb6728c6b8cbbc...
scm-commits@lists.fedoraproject.org