[cgnslib/f17] Updated to 3.1-3

[Shakthi Kannan]

commit c8fe4361ad413597f14cd657ff9207f03dfd16cf
Author: Shakthi Kannan <skannan at redhat.com>
Date:   Wed Aug 15 18:41:34 2012 +0530

    Updated to 3.1-3

 .gitignore                                 |    1 +
 cgnslib-2.5-4-set-so.patch                 |   37 --
 cgnslib-2.5-5-replace-exit-to-return.patch |  926 ----------------------------
 cgnslib.spec                               |   83 ++--
 sources                                    |    4 +-
 5 files changed, 39 insertions(+), 1012 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 35c960c..3e66280 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 cgnslib_2.5-4.tar.gz
 usersguide.pdf
 /cgnslib_2.5-5.tar.gz
+/cgnslib_3.1.3-4.tar.gz
diff --git a/cgnslib.spec b/cgnslib.spec
index 77d2b9c..4a3362a 100644
--- a/cgnslib.spec
+++ b/cgnslib.spec
@@ -2,18 +2,16 @@
 %global debug_package %{nil}
 
 Name:           cgnslib
-Version:        2.5
-Release:        6.r2%{?dist}
+Version:        3.1
+Release:        3.r4%{?dist}
 Summary:        Computational Fluid Dynamics General Notation System
 
 Group:          Development/Libraries
 License:        zlib
 URL:            http://www.cgns.org/
 
-Source:         http://downloads.sourceforge.net/project/cgns/%{name}_%{version}/Release%204/%{name}_%{version}-5.tar.gz
-Source1:        http://www.grc.nasa.gov/WWW/cgns/user/usersguide.pdf
-Patch0:         cgnslib-2.5-4-set-so.patch
-Patch1:         cgnslib-2.5-5-replace-exit-to-return.patch
+Source:         http://sourceforge.net/projects/cgns/files/%{name}_%{version}/%{name}_%{version}.3-4.tar.gz
+Source1:        http://www.grc.nasa.gov/WWW/cgns/CGNS_docs_current/user/usersguide.pdf
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -21,7 +19,8 @@ BuildRequires:  hdf5-devel >= 1.8
 BuildRequires:  zlib-devel
 BuildRequires:  gcc-gfortran
 BuildRequires:  chrpath
-Requires:       hdf5
+BuildRequires:  cmake
+Requires:       hdf5 = %{_hdf5_version}
 
 %description
 The Computational Fluid Dynamics General Notation System (CGNS) provides 
@@ -44,53 +43,23 @@ The %{name}-devel package contains the header files
 for %{name} package.
 
 %prep
-%setup -q -n %{name}_%{version}
-%patch0 -p1 -b .so
-%patch1 -p1 -b .exit
+%setup -q -n %{name}_%{version}.3
 
-%{__sed} -i -e "s|LIBDIR.*= @LIBDIR@|LIBDIR = \$(DESTDIR)@LIBDIR@|" \
-            -e "s|INCLUDEDIR.*= @INCLUDEDIR@|INCLUDEDIR = \$(DESTDIR)@INCLUDEDIR@|" \
-            make.defs.in
-            
-%{__sed} -i "s|dbtest|./dbtest|" tests/rundbtest
+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
 
-%{__cp} %{SOURCE1} %{_builddir}/%{name}_%{version}
+%{__cp} %{SOURCE1} %{_builddir}/%{name}_%{version}.3
 
 %build
-%configure --enable-gcc      \
-           --enable-shared   \
-           --enable-lfs      \
-           --with-zlib       \
-%ifarch x86_64 ppc64 sparc64
-           --enable-64bit    \
-%endif
-           --with-hdf5 
-
+%cmake . -DCMAKE_SKIP_RPATH:BOOL=YES
 %{__make} %{?_smp_mflags}
 
 
 %install
-%{__rm} -rf %{buildroot}
-%{__mkdir} -p %{buildroot}%{_libdir}
-%{__mkdir} -p %{buildroot}%{_includedir}
-%{__mkdir} -p %{buildroot}%{_docdir}
-%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}
-
-chrpath --delete %{buildroot}%{_libdir}/libcgns.so.1.0
-chmod 0755  %{buildroot}%{_libdir}/libcgns.so.1.0
-
-
-%ifarch x86_64 ppc64 sparc64
-%{__cp} -pP LINUX64/libcgns.so %{buildroot}%{_libdir}
-%else
-%{__cp} -pP LINUX/libcgns.so %{buildroot}%{_libdir}
-%endif
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
-
-%check
-cd tests
-%{__make}
-./rundbtest
+find $RPM_BUILD_ROOT -name libcgns.a -exec rm -f  {} \;
 
 %post -p /sbin/ldconfig
 
@@ -101,18 +70,38 @@ cd tests
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README
-%{_libdir}/libcgns.so.1.0
+%doc readme.lyx
+%{_bindir}/cgnames
+%{_bindir}/cgnscheck
+%{_bindir}/cgnsconvert
+%{_bindir}/cgnsdiff
+%{_bindir}/cgnslist
+%{_bindir}/cgnsupdate
+%{_bindir}/cgnsversion
+%{_libdir}/libcgns.so.3.1
 
 %files devel
 %defattr(-,root,root,-)
 %doc usersguide.pdf
+%{_includedir}/cgns_io.h
 %{_includedir}/cgnslib.h
 %{_includedir}/cgnslib_f.h
+%{_includedir}/cgnstypes.h
+%{_includedir}/cgnstypes_f.h
 %{_includedir}/cgnswin_f.h
 %{_libdir}/libcgns.so
 
 %changelog
+* Wed Aug 15 2012 Shakthi Kannan <shakthimaan [AT] fedoraproject DOT org> 3.1-3.r4
+- Updated to 3.1.3-4
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-8.r2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue May 15 2012 Orion Poplawski <orion at cora.nwra.com> - 2.5-7.rc2
+- Rebuild for hdf5
+- Explicitly require version of hdf5 built with
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-6.r2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 723798e..be145bc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ae2a2e79b99d41c63e5ed5f661f70fd9  cgnslib_2.5-5.tar.gz
-453788d1d9f7f383f76fde08c022a9a6  usersguide.pdf
+442bba32b576f3429cbd086af43fd4ae  cgnslib_3.1.3-4.tar.gz
+abe3915398bcd0f8d46a77aa14aa01de  usersguide.pdf