packages: metis/metis.spec, metis/metis-cmake.patch (NEW), metis/metis-libc...

Thu Jan 5 19:55:29 CET 2012

Author: qboosh                       Date: Thu Jan  5 18:55:29 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 5.0.2
- shared,libc patches obsolete
- project has switched to cmake; added cmake patch to fix bug and set soname, use two-pass build to preserve static library

---- Files affected:
packages/metis:
   metis.spec (1.1 -> 1.2) , metis-cmake.patch (NONE -> 1.1)  (NEW), metis-libc.patch (1.1 -> NONE)  (REMOVED), metis-shared.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/metis/metis.spec
diff -u packages/metis/metis.spec:1.1 packages/metis/metis.spec:1.2

--- packages/metis/metis.spec:1.1	Mon Jan 31 19:47:28 2011
+++ packages/metis/metis.spec	Thu Jan  5 19:55:24 2012
@@ -2,20 +2,17 @@
 Summary:	METIS - Serial Graph Partitioning and Fill-reducing Matrix Ordering
 Summary(pl.UTF-8):	METIS - szeregowy podział grafu i tworzenie porządków redukujący macierzy
 Name:		metis
-# see VERSION file for real version number
-Version:	4.0.1
-%define	fver	4.0
+Version:	5.0.2
 Release:	1
 License:	free, distribution restricted (http://glaros.dtc.umn.edu/gkhome/metis/metis/faq?q=metis/metis/faq#distribute)
 Group:		Libraries
 #Source0Download: http://glaros.dtc.umn.edu/gkhome/metis/metis/download
-Source0:	http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/%{name}-%{fver}.tar.gz
-# NoSource0-md5:	0aa546419ff7ef50bd86ce1ec7f727c7
+Source0:	http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/%{name}-%{version}.tar.gz
+# NoSource0-md5:	acb521a4e8c2e6dd559a7f9abd0468c5
 NoSource:	0
-Patch0:		%{name}-shared.patch
-Patch1:		%{name}-libc.patch
+Patch0:		%{name}-cmake.patch
 URL:		http://glaros.dtc.umn.edu/gkhome/views/metis
-BuildRequires:	libtool
+BuildRequires:	cmake >= 2.8
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -60,26 +57,27 @@
 Statyczna biblioteka METIS.
 
 %prep
-%setup -q -n %{name}-%{fver}
+%setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-%{__make} \
-	CC="%{__cc}" \
-	OPTFLAGS="%{rpmcflags} %{rpmcppflags}" \
-	LDOPTIONS="%{rpmldflags}" \
-	libdir=%{_libdir}
+mkdir -p build-shared build-static
+cd build-static
+%cmake ..
+%{__make}
+cd ../build-shared
+%cmake .. \
+	-DSHARED=ON
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	libdir=%{_libdir}
+%{__make} -C build-static install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_includedir}/metis
-install Lib/*.h $RPM_BUILD_ROOT%{_includedir}/metis
+%{__make} -C build-shared install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -89,25 +87,21 @@
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES VERSION
+%doc Changelog LICENSE.txt
+%attr(755,root,root) %{_bindir}/cmpfillin
+%attr(755,root,root) %{_bindir}/gpmetis
 %attr(755,root,root) %{_bindir}/graphchk
-%attr(755,root,root) %{_bindir}/kmetis
-%attr(755,root,root) %{_bindir}/mesh2dual
-%attr(755,root,root) %{_bindir}/mesh2nodal
-%attr(755,root,root) %{_bindir}/oemetis
-%attr(755,root,root) %{_bindir}/onmetis
-%attr(755,root,root) %{_bindir}/partdmesh
-%attr(755,root,root) %{_bindir}/partnmesh
-%attr(755,root,root) %{_bindir}/pmetis
+%attr(755,root,root) %{_bindir}/m2gmetis
+%attr(755,root,root) %{_bindir}/mpmetis
+%attr(755,root,root) %{_bindir}/ndmetis
 %attr(755,root,root) %{_libdir}/libmetis.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libmetis.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%doc Doc/manual.ps
+%doc manual/manual.pdf
 %attr(755,root,root) %{_libdir}/libmetis.so
-%{_libdir}/libmetis.la
-%{_includedir}/metis
+%{_includedir}/metis.h
 
 %files static
 %defattr(644,root,root,755)
@@ -119,6 +113,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2012/01/05 18:55:24  qboosh
+- updated to 5.0.2
+- shared,libc patches obsolete
+- project has switched to cmake; added cmake patch to fix bug and set soname, use two-pass build to preserve static library
+
 Revision 1.1  2011/01/31 18:47:28  qboosh
 - new; one must ask UMN for permission before distrubuting it
 - shared patch to build shared library

================================================================
Index: packages/metis/metis-cmake.patch
diff -u /dev/null packages/metis/metis-cmake.patch:1.1
--- /dev/null	Thu Jan  5 19:55:29 2012
+++ packages/metis/metis-cmake.patch	Thu Jan  5 19:55:24 2012
@@ -0,0 +1,27 @@
+--- metis-5.0.2/GKlib/GKlibSystem.cmake.orig	2011-09-01 00:23:04.000000000 +0200
++++ metis-5.0.2/GKlib/GKlibSystem.cmake	2012-01-02 18:03:47.012961126 +0100
+@@ -109,7 +109,7 @@
+   if("${HAVE_THREADLOCALSTORAGE}" MATCHES "^${HAVE_THREADLOCALSTORAGE}$")
+     try_compile(HAVE_THREADLOCALSTORAGE
+       ${CMAKE_BINARY_DIR}
+-      ${GKLIB_PATH}/conf/check_thread_storage.c)
++      ${CMAKE_SOURCE_DIR}/${GKLIB_PATH}/conf/check_thread_storage.c)
+     if(HAVE_THREADLOCALSTORAGE)
+       message(STATUS "checking for thread-local storage - found")
+     else()
+--- metis-5.0.2/libmetis/CMakeLists.txt.orig	2011-06-22 19:47:13.000000000 +0200
++++ metis-5.0.2/libmetis/CMakeLists.txt	2012-01-05 19:16:23.618452636 +0100
+@@ -8,9 +8,10 @@
+   target_link_libraries(metis m)
+ endif()
+ 
++set_target_properties(metis PROPERTIES SOVERSION 0 VERSION 0.0.0)
+ if(METIS_INSTALL)
+   install(TARGETS metis
+-    LIBRARY DESTINATION lib
+-    RUNTIME DESTINATION lib
+-    ARCHIVE DESTINATION lib)
++    LIBRARY DESTINATION lib${LIB_SUFFIX}
++    RUNTIME DESTINATION lib${LIB_SUFFIX}
++    ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ endif()
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/metis/metis.spec?r1=1.1&r2=1.2&f=u

