[cgnslib/f19: 7/8] Update to 3.2.1 Build with fortran support Build with hdf5(previous was not true) Build extra cgnsto
Christopher Meng
cicku at fedoraproject.org
Wed Jul 2 04:11:26 UTC 2014
commit 09472114950508cbaac3b239aea81d451c3657e9
Author: Christopher Meng <i at cicku.me>
Date: Wed Jul 2 12:06:05 2014 +0800
Update to 3.2.1
Build with fortran support
Build with hdf5(previous was not true)
Build extra cgnstools, stored in /usr/bin/cgnstools/ directory
.gitignore | 1 +
cgnslib.spec | 100 +++++++++++++++++++++++++++++----------------------------
sources | 2 +-
3 files changed, 53 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1794100..8a2e74b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ usersguide.pdf
/cgnslib_2.5-5.tar.gz
/cgnslib_3.1.3-4.tar.gz
/cgnslib_3.2.tar.gz
+/cgnslib_3.2.1.tar.gz
diff --git a/cgnslib.spec b/cgnslib.spec
index 1c58164..587605a 100644
--- a/cgnslib.spec
+++ b/cgnslib.spec
@@ -1,84 +1,80 @@
-# Package whose only architecture dependent binary is a library
-%global debug_package %{nil}
-
Name: cgnslib
-Version: 3.2
-Release: 6%{?dist}
+Version: 3.2.1
+Release: 1%{?dist}
Summary: Computational Fluid Dynamics General Notation System
-
-Group: Development/Libraries
License: zlib
URL: http://www.cgns.org/
-
-Source: http://sourceforge.net/projects/cgns/files/%{name}_%{version}/%{name}_%{version}.tar.gz
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: hdf5-devel >= 1.8
-BuildRequires: zlib-devel
-BuildRequires: gcc-gfortran
-BuildRequires: chrpath
+Source: http://download.sourceforge.net/project/cgns/cgnslib_3.2/cgnslib_%{version}.tar.gz
BuildRequires: cmake
+BuildRequires: gcc-gfortran
+BuildRequires: hdf5-devel
+BuildRequires: zlib-devel
Requires: hdf5 = %{_hdf5_version}
%description
-The Computational Fluid Dynamics General Notation System (CGNS) provides
-a general, portable, and extensible standard for the storage and
-retrieval of computational fluid dynamics (CFD) analysis
-data. It consists of a collection of conventions, and free
-and open software implementing those conventions. It is
-self-descriptive, machine-independent, well-documented, and
-administered by an international steering committee.
-
-
-%package devel
-Summary: Header files for %{name} package
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: hdf5-devel
-
-%description devel
-The %{name}-devel package contains the header files
-for %{name} package.
+The Computational Fluid Dynamics General Notation System (CGNS) provides a
+general, portable, and extensible standard for the storage and retrieval of
+computational fluid dynamics (CFD) analysisdata. It consists of a collection
+of conventions, and free and open software implementing those conventions. It
+is self-descriptive, machine-independent, well-documented, and administered by
+an international steering committee.
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: hdf5-devel%{?_isa}
+
+%description devel
+This package contains libraries and header files for
+developing applications that use %{name} libraries.
%prep
-%setup -q -n %{name}_%{version}
-
+%setup -qn %{name}_%{version}
+# Multi-lib path fix.
sed -i "s|\${CMAKE_INSTALL_PREFIX}/lib|\${CMAKE_INSTALL_PREFIX}/\${LIB_INSTALL_DIR}|" CMakeLists.txt
sed -i "s|DESTINATION lib|DESTINATION \${LIB_INSTALL_DIR}|" src/CMakeLists.txt
%build
-%cmake . -DCMAKE_SKIP_RPATH:BOOL=YES
-%{__make} %{?_smp_mflags}
-
+%cmake -DCMAKE_SKIP_RPATH=ON \
+ -DCGNS_ENABLE_TESTS=ON \
+ -DCGNS_ENABLE_FORTRAN=ON \
+ -DCGNS_BUILD_CGNSTOOLS=ON \
+ -DCGNS_ENABLE_HDF5=ON
+%make_build
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
+find %{buildroot} -name '*.a' -delete -print
-find $RPM_BUILD_ROOT -name libcgns.a -exec rm -f {} \;
+%check
+make test
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%clean
-%{__rm} -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
-%doc readme.lyx
-%{_bindir}/cgnsnames
+%doc changelog license.txt readme.{lyx,txt}
+%{_bindir}/adf2hdf
+%{_bindir}/cgconfig
+%{_bindir}/cgnscalc
%{_bindir}/cgnscheck
%{_bindir}/cgnscompress
%{_bindir}/cgnsconvert
%{_bindir}/cgnsdiff
%{_bindir}/cgnslist
+%{_bindir}/cgnsplot
+%{_bindir}/cgnsnodes
+%{_bindir}/cgnsnames
+%{_bindir}/cgnstools/
%{_bindir}/cgnsupdate
+%{_bindir}/cgnsview
+%{_bindir}/hdf2adf
+%{_bindir}/unitconv
+%{_datadir}/cgnstools/
%{_libdir}/libcgns.so.3.2
%files devel
-%defattr(-,root,root,-)
%{_includedir}/cgnsBuild.defs
%{_includedir}/cgns_io.h
%{_includedir}/cgnslib.h
@@ -90,6 +86,12 @@ find $RPM_BUILD_ROOT -name libcgns.a -exec rm -f {} \;
%{_libdir}/libcgns.so
%changelog
+* Mon Jun 30 2014 Christopher Meng <rpm at cicku.me> - 3.2.1-1
+- Update to 3.2.1
+- Enable hdf5 support
+- Enable fortran support
+- Build cgnstools(included in main package)
+
* Tue Jun 10 2014 Orion Poplawski <orion at cora.nwra.com> - 3.2-6
- Rebuild for hdf 1.8.13
diff --git a/sources b/sources
index 7a9f6e5..ef4711c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3006b73265415ac0bf8999b71ffd0e58 cgnslib_3.2.tar.gz
+2d26f88b2058dcd0ee5ce58f483bfccb cgnslib_3.2.1.tar.gz
More information about the scm-commits
mailing list