OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Mar-2007 08:27:51
Branch: HEAD Handle: 2007030207275100
Modified files:
openpkg-src/netcdf netcdf.spec
Log:
upgrading package: netcdf 3.6.1 -> 3.6.2
Summary:
Revision Changes Path
1.11 +20 -14 openpkg-src/netcdf/netcdf.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/netcdf/netcdf.spec
============================================================================
$ cvs diff -u -r1.10 -r1.11 netcdf.spec
--- openpkg-src/netcdf/netcdf.spec 1 Jan 2007 17:40:05 -0000 1.10
+++ openpkg-src/netcdf/netcdf.spec 2 Mar 2007 07:27:51 -0000 1.11
@@ -32,8 +32,11 @@
Class: EVAL
Group: Libraries
License: Open Source
-Version: 3.6.1
-Release: 20061013
+Version: 3.6.2
+Release: 20070302
+
+# package options
+%option with_cxx yes
# list of sources
Source0: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-%{version}.tar.gz
@@ -43,6 +46,9 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc
PreReq: OpenPKG, openpkg >= 20040130
+%if "%{with_cxx}" == "yes"
+BuildPreReq: gcc::with_cxx = yes
+%endif
AutoReq: no
AutoReqProv: no
@@ -62,7 +68,7 @@
}
%prep
- %setup -q -n netcdf-%{version}/src
+ %setup -q
%build
CC="%{l_cc}" \
@@ -72,21 +78,21 @@
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
./configure \
- --prefix=%{l_prefix}
+ --prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
+%if "%{with_cxx}" == "yes"
+ --enable-cxx \
+%else
+ --disable-cxx \
+%endif
+ --disable-f77 \
+ --disable-f90 \
+ --disable-examples
%{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
- %{l_shtool} subst \
- -e 's;ln -s;ln;g' \
- rules.make
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/lib
- %{l_make} %{l_mflags} install \
- prefix=$RPM_BUILD_ROOT%{l_prefix} \
- exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/man3f
- rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man3/*.3f
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
