packages: qhull/qhull-cmake.patch, qhull/qhull.spec - They(TM) changed tarb...

[qboosh]

Author: qboosh                       Date: Tue Jul  5 16:33:43 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- They(TM) changed tarball without version change; updated md5 and cmake patch

---- Files affected:
packages/qhull:
   qhull-cmake.patch (1.1 -> 1.2) , qhull.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/qhull/qhull-cmake.patch
diff -u packages/qhull/qhull-cmake.patch:1.1 packages/qhull/qhull-cmake.patch:1.2
--- packages/qhull/qhull-cmake.patch:1.1	Mon Jul  4 21:19:02 2011
+++ packages/qhull/qhull-cmake.patch	Tue Jul  5 18:33:38 2011
@@ -1,6 +1,6 @@
---- qhull-2011.1/CMakeLists.txt.orig	2011-04-18 02:38:33.000000000 +0200
-+++ qhull-2011.1/CMakeLists.txt	2011-07-04 17:59:45.135402392 +0200
-@@ -159,21 +159,23 @@
+--- qhull-2011.1/CMakeLists.txt.orig	2011-05-19 03:53:36.000000000 +0200
++++ qhull-2011.1/CMakeLists.txt	2011-07-05 17:58:55.111627041 +0200
+@@ -166,21 +166,23 @@
  
  string(REGEX MATCH "[^.]+" qhull_MAJOR "${qhull_VERSION}")
  if(CMAKE_BUILD_TYPE MATCHES "[dD]ebug")
@@ -25,22 +25,20 @@
      qhull_TARGETS 
 -        ${qhull_CPP} ${qhull_SHARED} ${qhull_STATIC} ${qhull_STATICP} 
 -        qhull rbox qconvex qdelaunay qvoronoi qhalf
-+        ${qhull_CPP_SHARED} ${qhull_CPP_STATIC} ${qhull_SHARED} ${qhull_STATIC} ${qhull_STATICP} 
++        ${qhull_CPP_SHARED} ${qhull_CPP_STATIC} ${qhull_SHARED} ${qhull_STATIC} ${qhull_STATICP}
 +        qhullprog rbox qconvex qdelaunay qvoronoi qhalf
          user_eg user_eg2 user_eg3
  )
  
-@@ -186,21 +188,15 @@
+@@ -193,21 +195,18 @@
          src/libqhull/qhull-exports.def)
  set_target_properties(${qhull_SHARED} PROPERTIES
      COMPILE_DEFINITIONS "qh_QHpointer"
 -    VERSION ${qhull_VERSION})
 +    VERSION ${qhull_VERSION} SOVERSION ${qhull_MAJOR})
  
--#target_link_libraries(${qhull_SHARED} m)
-+target_link_libraries(${qhull_SHARED} m)
- 
--if(UNIX)
+ if(UNIX)
+     target_link_libraries(${qhull_SHARED} m)
 -    if(APPLE)
 -        set_target_properties(${qhull_SHARED} PROPERTIES 
 -            INSTALL_NAME_DIR "${LIB_INSTALL_DIR}")
@@ -50,16 +48,18 @@
 -            INSTALL_RPATH_USE_LINK_PATH TRUE
 -            BUILD_WITH_INSTALL_RPATH FALSE)
 -    endif()
--endif(UNIX)
+ endif(UNIX)
+ 
 +add_library(${qhull_CPP_SHARED} SHARED ${libqhullcpp_SOURCES})
 +set_target_properties(${qhull_CPP_SHARED} PROPERTIES
 +    COMPILE_DEFINITIONS "qh_QHpointer"
 +    VERSION ${qhull_VERSION} SOVERSION ${qhull_MAJOR})
 +target_link_libraries(${qhull_CPP_SHARED} ${qhull_SHARED})
- 
++
  # ---------------------------------------
  # Define static libraries qhullstatic and qhullstatic_p (qh_QHpointer)
-@@ -219,8 +215,8 @@
+ # ---------------------------------------
+@@ -230,8 +229,8 @@
  # Define C++ static library qhullcpp (qh_QHpointer)
  # ---------------------------------------
  
@@ -70,7 +70,7 @@
      COMPILE_DEFINITIONS "qh_QHpointer"
      VERSION ${qhull_VERSION})
  
-@@ -241,40 +237,27 @@
+@@ -252,40 +251,27 @@
      set(user_eg_DEFINES qh_QHpointer)
  endif()
  
@@ -120,7 +120,7 @@
  
  # ---------------------------------------
  # Define qhull executables linked to qhull shared library
-@@ -286,8 +269,7 @@
+@@ -297,8 +283,7 @@
  # user_eg may be linked to qhull_STATIC if user_eg_DEFINES is removed
  target_link_libraries(user_eg ${qhull_SHARED})
  set_target_properties(user_eg PROPERTIES
@@ -130,7 +130,7 @@
  
  # ---------------------------------------
  # Define qhull executables linked to qhullstatic_p and qhullcpp static library
-@@ -301,10 +283,9 @@
+@@ -312,10 +297,9 @@
  
  add_executable(user_eg3 ${user_eg3_SOURCES})
  # qhull_STATICP must be last, otherwise qh_fprintf,etc. are not loaded from qhull_CPP

================================================================
Index: packages/qhull/qhull.spec
diff -u packages/qhull/qhull.spec:1.7 packages/qhull/qhull.spec:1.8
--- packages/qhull/qhull.spec:1.7	Mon Jul  4 21:19:02 2011
+++ packages/qhull/qhull.spec	Tue Jul  5 18:33:38 2011
@@ -7,7 +7,7 @@
 License:	distributable (see COPYING.txt)
 Group:		Libraries
 Source0:	http://www.qhull.org/download/%{name}-%{version}-src.tgz
-# Source0-md5:	1704bbae3a4d56d624ea7d309fbef46a
+# Source0-md5:	a65061cf2a6e6581182f4df0f3667a8e
 Patch0:		%{name}-cmake.patch
 URL:		http://www.qhull.org/
 BuildRequires:	cmake >= 2.6
@@ -97,7 +97,8 @@
 %patch0 -p1
 
 %build
-%cmake .
+%cmake . \
+	-DMAN_INSTALL_DIR=%{_mandir}/man1
 %{__make}
 
 %install
@@ -109,11 +110,6 @@
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/packages
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/user_eg*
 
-# missing in cmake
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install html/qhull.man $RPM_BUILD_ROOT%{_mandir}/man1/qhull.1
-install html/rbox.man $RPM_BUILD_ROOT%{_mandir}/man1/rbox.1
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -166,6 +162,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2011/07/05 16:33:38  qboosh
+- They(TM) changed tarball without version change; updated md5 and cmake patch
+
 Revision 1.7  2011/07/04 19:19:02  qboosh
 - updated to 2011.1 (note: new sonames)
 - autotools support is gone, switched to messy cmake; removed update patch, added cmake patch instead
================================================================

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