[packages/qhull] - updated to 2015.2 aka 7.2.0 (note: new sonames) - updated cmake patch - removed obsolete format-se
qboosh
qboosh at pld-linux.org
Sun Mar 6 21:59:49 CET 2016
commit 98778872a73316e61b0ebb4f1904ab2b22cdf07b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Mar 6 22:03:26 2016 +0100
- updated to 2015.2 aka 7.2.0 (note: new sonames)
- updated cmake patch
- removed obsolete format-security patches
format-security.patch | 11 -------
qhull-cmake.patch | 84 +++++++++++++++++++++++++--------------------------
qhull.spec | 28 +++++++++++------
3 files changed, 60 insertions(+), 63 deletions(-)
---
diff --git a/qhull.spec b/qhull.spec
index 90f930d..eabc749 100644
--- a/qhull.spec
+++ b/qhull.spec
@@ -1,14 +1,13 @@
Summary: Qhull - convex hulls, triangulations and related computations
Summary(pl.UTF-8): Qhull - obliczanie powłok wypukłych, triangulacji i powiązanych rzeczy
Name: qhull
-Version: 2012.1
-Release: 3
+Version: 2015.2
+Release: 1
License: distributable (see COPYING.txt)
Group: Libraries
-Source0: http://www.qhull.org/download/%{name}-%{version}-src.tgz
-# Source0-md5: d0f978c0d8dfb2e919caefa56ea2953c
+Source0: http://www.qhull.org/download/%{name}-2015-src-7.2.0.tgz
+# Source0-md5: e6270733a826a6a7c32b796e005ec3dc
Patch0: %{name}-cmake.patch
-Patch1: format-security.patch
URL: http://www.qhull.org/
BuildRequires: cmake >= 2.6
BuildRequires: libstdc++-devel
@@ -96,7 +95,6 @@ Statyczna biblioteka QhullCPP.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%cmake . \
@@ -118,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+%post c++ -p /sbin/ldconfig
+%postun c++ -p /sbin/ldconfig
+
%files
%defattr(644,root,root,755)
%doc Announce.txt COPYING.txt README.txt REGISTER.txt index.htm
@@ -127,8 +128,12 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/qhull
%attr(755,root,root) %{_bindir}/qvoronoi
%attr(755,root,root) %{_bindir}/rbox
-%attr(755,root,root) %{_libdir}/libqhull.so.6
-%attr(755,root,root) %{_libdir}/libqhull_p.so.6
+%attr(755,root,root) %{_libdir}/libqhull.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libqhull.so.7
+%attr(755,root,root) %{_libdir}/libqhull_p.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libqhull_p.so.7
+%attr(755,root,root) %{_libdir}/libqhull_r.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libqhull_r.so.7
%{_mandir}/man1/qhull.1*
%{_mandir}/man1/rbox.1*
@@ -137,16 +142,19 @@ rm -rf $RPM_BUILD_ROOT
%doc html/*.{htm,gif,jpg}
%attr(755,root,root) %{_libdir}/libqhull.so
%attr(755,root,root) %{_libdir}/libqhull_p.so
+%attr(755,root,root) %{_libdir}/libqhull_r.so
%{_includedir}/libqhull
+%{_includedir}/libqhull_r
%files static
%defattr(644,root,root,755)
%{_libdir}/libqhullstatic.a
-%{_libdir}/libqhullstatic_p.a
+%{_libdir}/libqhullstatic_r.a
%files c++
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libqhullcpp.so.6
+%attr(755,root,root) %{_libdir}/libqhullcpp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libqhullcpp.so.7
%files c++-devel
%defattr(644,root,root,755)
diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644
index ac26e58..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qhull-2012.1/src/testqset/testqset.c~ 2012-01-26 03:55:25.000000000 +0100
-+++ qhull-2012.1/src/testqset/testqset.c 2013-12-04 21:33:46.116729166 +0100
-@@ -214,7 +214,7 @@
- char *endp;
-
- if (argc != 2 && argc != 3) {
-- printf(promptstr);
-+ printf("%s", promptstr);
- exit(0);
- }
- numIntsArg= strtol(argv[1], &endp, 10);
diff --git a/qhull-cmake.patch b/qhull-cmake.patch
index b254a50..a7dcc52 100644
--- a/qhull-cmake.patch
+++ b/qhull-cmake.patch
@@ -1,33 +1,34 @@
---- qhull-2012.1/CMakeLists.txt.orig 2012-02-22 04:38:47.000000000 +0100
-+++ qhull-2012.1/CMakeLists.txt 2012-02-26 09:01:36.040986288 +0100
-@@ -226,13 +226,15 @@
- include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/libqhull)
+--- qhull-2015.2/CMakeLists.txt.orig 2016-01-19 01:21:32.000000000 +0100
++++ qhull-2015.2/CMakeLists.txt 2016-03-06 20:39:15.762583423 +0100
+@@ -331,14 +331,16 @@
+ include_directories(${CMAKE_SOURCE_DIR}/src)
if(CMAKE_BUILD_TYPE MATCHES "[dD]ebug")
- set(qhull_CPP qhullcpp_d)
+ set(qhull_CPP_SHARED qhullcpp_d)
+ set(qhull_CPP_STATIC qhullcppstatic_d)
- set(qhull_SHARED qhull_d)
+ set(qhull_SHARED qhull_d)
set(qhull_SHAREDP qhull_pd)
+ set(qhull_SHAREDR qhull_rd)
set(qhull_STATIC qhullstatic_d)
- set(qhull_STATICP qhullstatic_pd)
+ set(qhull_STATICR qhullstatic_rd)
else()
- set(qhull_CPP qhullcpp)
+ set(qhull_CPP_SHARED qhullcpp)
+ set(qhull_CPP_STATIC qhullcppstatic)
- set(qhull_SHARED libqhull) # Avoid name conflict with qhull executable
+ set(qhull_SHARED libqhull) # Temporarily avoid name conflict with qhull executable
set(qhull_SHAREDP qhull_p)
- set(qhull_STATIC qhullstatic)
-@@ -241,7 +243,7 @@
+ set(qhull_SHAREDR qhull_r)
+@@ -348,7 +350,7 @@
set(
qhull_TARGETS_INSTALL
-- ${qhull_CPP} ${qhull_STATIC} ${qhull_STATICP} ${qhull_SHARED} ${qhull_SHAREDP}
-+ ${qhull_CPP_SHARED} ${qhull_CPP_STATIC} ${qhull_STATIC} ${qhull_STATICP} ${qhull_SHARED} ${qhull_SHAREDP}
+- ${qhull_CPP} ${qhull_STATIC} ${qhull_STATICR} ${qhull_SHAREDR}
++ ${qhull_CPP_SHARED} ${qhull_CPP_STATIC} ${qhull_STATIC} ${qhull_STATICR} ${qhull_SHAREDR}
qhull rbox qconvex qdelaunay qvoronoi qhalf
+ ${qhull_SHARED} ${qhull_SHAREDP} # Deprecated, use qhull_r instead
)
- set(
-@@ -272,15 +274,6 @@
+@@ -401,15 +403,6 @@
if(UNIX)
target_link_libraries(${qhull_SHARED} m)
@@ -43,7 +44,7 @@
endif(UNIX)
# ---------------------------------------
-@@ -296,17 +289,14 @@
+@@ -426,17 +419,13 @@
if(UNIX)
target_link_libraries(${qhull_SHAREDP} m)
@@ -60,30 +61,29 @@
+add_library(${qhull_CPP_SHARED} SHARED ${libqhullcpp_SOURCES})
+set_target_properties(${qhull_CPP_SHARED} PROPERTIES
-+ COMPILE_DEFINITIONS "qh_QHpointer"
-+ SOVERSION ${qhull_SOVERSION})
++ SOVERSION ${qhull_SOVERSION} VERSION ${qhull_VERSION})
+target_link_libraries(${qhull_CPP_SHARED} ${qhull_SHARED})
+
# ---------------------------------------
- # Define static libraries qhullstatic and qhullstatic_p (qh_QHpointer)
+ # Define static libraries qhullstatic (non-reentrant) and qhullstatic_r (reentrant)
# ---------------------------------------
-@@ -329,8 +319,8 @@
- # Define C++ static library qhullcpp (qh_QHpointer)
+@@ -459,8 +448,8 @@
+ # Do not create libqhullcpp as a shared library. Qhull C++ classes may change layout and size.
# ---------------------------------------
-add_library(${qhull_CPP} STATIC ${libqhullcpp_SOURCES})
-set_target_properties(${qhull_CPP} PROPERTIES
+add_library(${qhull_CPP_STATIC} STATIC ${libqhullcpp_SOURCES})
+set_target_properties(${qhull_CPP_STATIC} PROPERTIES
- COMPILE_DEFINITIONS "qh_QHpointer"
VERSION ${qhull_VERSION})
-@@ -354,22 +344,22 @@
- endif()
+ # ---------------------------------------
+@@ -477,22 +466,22 @@
+ set(qhalf_SOURCES src/qhalf/qhalf.c)
add_executable(qhull ${qhull_SOURCES})
--target_link_libraries(qhull ${qhull_STATIC})
-+target_link_libraries(qhull ${qhull_STATIC} m)
+-target_link_libraries(qhull ${qhull_STATICR})
++target_link_libraries(qhull ${qhull_STATICR} m)
add_executable(rbox ${rbox_SOURCES})
-target_link_libraries(rbox ${qhull_STATIC})
@@ -106,31 +106,31 @@
+target_link_libraries(qhalf ${qhull_STATIC} m)
# ---------------------------------------
- # Define testqset linked to qset.o and mem.o
-@@ -385,7 +375,7 @@
+ # Define options for linking to qhull_SHAREDR or qhull_SHARED
+@@ -527,7 +516,7 @@
add_executable(user_eg ${user_eg_SOURCES})
- # user_eg may be linked to qhull_STATIC if user_eg_DEFINES is removed
--target_link_libraries(user_eg ${qhull_SHAREDP})
-+target_link_libraries(user_eg ${qhull_SHAREDP} m)
+ # user_eg may be linked to qhull_STATICR if user_eg_DEFINES is removed
+-target_link_libraries(user_eg ${qhull_SHAREDR})
++target_link_libraries(user_eg ${qhull_SHAREDR} m)
set_target_properties(user_eg PROPERTIES
COMPILE_DEFINITIONS "${user_eg_DEFINES}")
-@@ -394,7 +384,7 @@
- # ---------------------------------------
+@@ -539,7 +528,7 @@
add_executable(user_eg2 ${user_eg2_SOURCES})
--target_link_libraries(user_eg2 ${qhull_SHARED})
-+target_link_libraries(user_eg2 ${qhull_SHARED} m)
- set_target_properties(user_eg2 PROPERTIES
- COMPILE_DEFINITIONS "${user_eg2_DEFINES}")
-
-@@ -410,7 +400,7 @@
+ # user_eg2 may be linked to qhull_SHAREDR if user_eg2_DEFINES is added
+-target_link_libraries(user_eg2 ${qhull_STATICR})
++target_link_libraries(user_eg2 ${qhull_STATICR} m)
+ # ---------------------------------------
+ # Define user_eg3 linked to qhullstatic_r and qhullcpp static library
+@@ -552,7 +541,7 @@
add_executable(user_eg3 ${user_eg3_SOURCES})
- # qhull_STATICP must be last, otherwise qh_fprintf,etc. are not loaded from qhull_CPP
--target_link_libraries(user_eg3 ${qhull_CPP} ${qhull_STATICP})
-+target_link_libraries(user_eg3 ${qhull_CPP_SHARED} ${qhull_SHARED})
- set_target_properties(user_eg3 PROPERTIES
- COMPILE_DEFINITIONS "qh_QHpointer")
+ # qhull_STATICR must be last, otherwise qh_fprintf,etc. are not loaded from qhull_CPP
+ # user_eg3 may be linked to qhull_SHAREDR if user_eg3_DEFINES is added
+-target_link_libraries(user_eg3 ${qhull_CPP} ${qhull_STATICR})
++target_link_libraries(user_eg3 ${qhull_CPP_STATIC} ${qhull_STATICR} m)
+ # ---------------------------------------
+ # qhullp is qhull/unix.c linked to deprecated qh_QHpointer libqhull_p
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qhull.git/commitdiff/98778872a73316e61b0ebb4f1904ab2b22cdf07b
More information about the pld-cvs-commit
mailing list