[packages/nifticlib] - updated to 2.0.0 - updated cmake patch

[qboosh]

commit 9ed65787651a0878f35f8381c47b2886f1aaf47e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Dec 23 16:26:42 2018 +0100

    - updated to 2.0.0
    - updated cmake patch

 nifticlib-cmake.patch | 25 ++++++++++++++++---------
 nifticlib.spec        | 27 ++++++++++++---------------
 2 files changed, 28 insertions(+), 24 deletions(-)
---
diff --git a/nifticlib.spec b/nifticlib.spec
index 33a0adf..60810a6 100644
--- a/nifticlib.spec
+++ b/nifticlib.spec
@@ -1,12 +1,12 @@
 Summary:	C I/O libraries for files in the nifti-1 data format
 Summary(pl.UTF-8):	Biblioteki C wejścia/wyjścia dla plików danych w formacie nifti-1
 Name:		nifticlib
-Version:	1.0.0
+Version:	2.0.0
 Release:	1
 License:	Public Domain
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/niftilib/%{name}-%{version}.tar.gz
-# Source0-md5:	4d0828e5783df40fb98b8dd6edc11ebb
+Source0:	http://downloads.sourceforge.net/niftilib/%{name}-%{version}.tar.gz
+# Source0-md5:	425a711f8f92fb1e1f088cbc55bea53a
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-cmake.patch
 URL:		http://niftilib.sourceforge.net/
@@ -50,19 +50,15 @@ Pliki nagłówkowe bibliotek C niftilib.
 %patch1 -p1
 
 %build
-%cmake . \
-	-DCMAKE_CXX_COMPILER_WORKS=1 \
-	-DCMAKE_CXX_COMPILER="%{__cc}" \
-	-DBUILD_SHARED_LIBS=ON \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-DCMAKE_SKIP_RPATH=ON \
-	-DCMAKE_VERBOSE_MAKEFILE=ON \
-	-DNIFTI_INSTALL_LIB_DIR=%{_libdir}
+install -d build
+cd build
+%cmake ..
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -76,12 +72,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE README Updates.txt
 %attr(755,root,root) %{_bindir}/nifti_stats
 %attr(755,root,root) %{_bindir}/nifti_tool
+%attr(755,root,root) %{_bindir}/nifti1_test
 %attr(755,root,root) %{_libdir}/libnifticdf.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnifticdf.so.1
+%attr(755,root,root) %ghost %{_libdir}/libnifticdf.so.2
 %attr(755,root,root) %{_libdir}/libniftiio.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libniftiio.so.1
+%attr(755,root,root) %ghost %{_libdir}/libniftiio.so.2
 %attr(755,root,root) %{_libdir}/libznz.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libznz.so.1
+%attr(755,root,root) %ghost %{_libdir}/libznz.so.2
 
 %files devel
 %defattr(644,root,root,755)
diff --git a/nifticlib-cmake.patch b/nifticlib-cmake.patch
index f4e0836..c533e4e 100644
--- a/nifticlib-cmake.patch
+++ b/nifticlib-cmake.patch
@@ -1,12 +1,19 @@
---- nifticlib-1.0.0/CMakeLists.txt.orig	2007-12-05 14:07:45.000000000 +0100
-+++ nifticlib-1.0.0/CMakeLists.txt	2008-01-20 16:15:17.202457443 +0100
-@@ -42,7 +42,9 @@
-    FIND_PACKAGE(ZLIB)
- #  MESSAGE(STATUS "---------------------SYSTEM ZLIB ${ZLIB_LIBRARY}")
-   SET(PACKAGE_PREFIX "")
-+ IF(NOT DEFINED NIFTI_INSTALL_LIB_DIR)
-   SET(NIFTI_INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-+ ENDIF(NOT DEFINED NIFTI_INSTALL_LIB_DIR)
+--- nifticlib-2.0.0/CMakeLists.txt.orig	2010-07-07 21:05:44.000000000 +0200
++++ nifticlib-2.0.0/CMakeLists.txt	2018-12-23 15:32:48.339462174 +0100
+@@ -1,6 +1,6 @@
+ #File Generated by Hans J. Johnson
+ #Please contact hans-johnson at uiowa.edu for making enhancments/corrections
+-PROJECT(NIFTI)
++PROJECT(NIFTI C)
+ # Configure Dart testing support.
+ INCLUDE(${CMAKE_ROOT}/Modules/Dart.cmake)
+ 
+@@ -46,7 +46,7 @@
+   SET(NIFTI_LIBRARY_PROPERTIES VERSION ${NIFTI_SHAREDLIB_VERSION} SOVERSION ${NIFTI_SHAREDLIB_SOVERSION})
+ 
    SET(NIFTI_INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
+-  SET(NIFTI_INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
++  SET(NIFTI_INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
    SET(NIFTI_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/nifti")
    SET(NIFTI_ZLIB_LIBRARIES ${ZLIB_LIBRARIES})
+   SET(NIFTI_INSTALL_NO_DEVELOPMENT 0)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nifticlib.git/commitdiff/9ed65787651a0878f35f8381c47b2886f1aaf47e