Browse Source

qhull: update to 2015.2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11789 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 5 years ago
parent
commit
7eed03d0f9
1 changed files with 89 additions and 32 deletions
  1. 89 32
      q/qhull/qhull-vl.spec

+ 89 - 32
q/qhull/qhull-vl.spec

@@ -1,26 +1,29 @@
 %define name qhull
-%define version 2012.1
+%define version 2015.2
+
+# Upstream's versioning is bizarre
+%global tarvers 2015-src-7.2.0
 
 Summary: General dimension convex hull programs
-Name: %{name}
+Name:    %{name}
 Version: %{version}
-Release: 2%{?_dist_release}
-License: Distributable
-Group: System Environment/Libraries
+Release: 1%{?_dist_release}
+License: Qhull
+Group:   System Environment/Libraries
+
 URL: http://www.qhull.org
+Source0: http://www.qhull.org/download/qhull-%{tarvers}.tgz
 
-Source0: http://www.qhull.org/download/qhull-%{version}-src.tgz
+Patch1: 0001-Link-executables-against-shared-libs.patch
+Patch2: 0002-Install-docs-into-subdirs.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-%ifarch %{ix86}
-Provides: libqhull.so
-Provides: libqhull_p.so
-%endif
-%ifarch x86_64
-Provides: libqhull.so()(64bit)
-Provides: libqhull_p.so()(64bit)
-%endif
+BuildRequires: cmake
+BuildRequires: chrpath
+
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
 %description
@@ -30,10 +33,33 @@ the points to stdout.  It also generates Delaunay triangulations, Voronoi
 diagrams, furthest-site Voronoi diagrams, and halfspace intersections
 about a point.
 
+%package -n libqhull
+Group:   System Environment/Libraries
+Summary: -n libqhull
+
+%description -n libqhull
+%{summary}
+
+%package -n libqhull_r
+Group:   System Environment/Libraries
+Summary: libqhull_r
+
+%description -n libqhull_r
+%{summary}
+
+%package -n libqhull_p
+Group:   System Environment/Libraries
+Summary: libqhull_p
+
+%description -n libqhull_p
+%{summary}
+
 %package devel
 Summary: Development files for qhull
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Group:   Development/Libraries
+Requires: lib%{name} = %{version}-%{release}
+Requires: lib%{name}_r = %{version}-%{release}
+Requires: lib%{name}_p = %{version}-%{release}
 
 %description devel
 Qhull is a general dimension convex hull program that reads a set
@@ -42,49 +68,80 @@ the points to stdout.  It also generates Delaunay triangulations, Voronoi
 diagrams, furthest-site Voronoi diagrams, and halfspace intersections
 about a point.
 
+
 %prep
 %setup -q -n %{name}-%{version}
-
-sed -i "s|\$(DESTDIR)/bin|\$(DESTDIR)%{_bindir}|g" Makefile
-sed -i "s|\$(DESTDIR)/include|\$(DESTDIR)%{_includedir}|g" Makefile
-sed -i "s|\$(DESTDIR)/lib|\$(DESTDIR)%{_libdir}|g" Makefile
-sed -i "s|\$(DESTDIR)/share|\$(DESTDIR)%{_datadir}|g" Makefile
+%patch1 -p1
+%patch2 -p1
 
 %build
-make
+cd build
+%cmake ..
+make VERBOSE=1 %{?_smp_mflags}
+cd ..
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf ${RPM_BUILD_ROOT}
+cd build
+%make_install
+cd ..
+
+chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*
 
 ## remove unuse files
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
+rm -rf ${RPM_BUILD_ROOT}%{_libdir}/*.a
 
+## rename doc folder
+mv ${RPM_BUILD_ROOT}%{_docdir}/%{name} \
+   ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post -n libqhull -p /sbin/ldconfig
+%postun -n libqhull -p /sbin/ldconfig
+
+%post -n libqhull_r -p /sbin/ldconfig
+%postun -n libqhull_r -p /sbin/ldconfig
+
+%post -n libqhull_p -p /sbin/ldconfig
+%postun -n libqhull_p -p /sbin/ldconfig
+
+
 %files
-%defattr(-,root,root)
-%doc %{_docdir}/%{name}
 %{_bindir}/*
+%{_docdir}/%{name}-%{version}/
+%{_mandir}/man1/*
+
+%files -n libqhull
 %{_libdir}/libqhull.so.*
+
+%files -n libqhull_r
+%{_libdir}/libqhull_r.so.*
+
+%files -n libqhull_p
 %{_libdir}/libqhull_p.so.*
-%{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/libqhull
-%{_includedir}/libqhullcpp
+%{_includedir}/libqhull*
 %{_libdir}/libqhull.so
+%{_libdir}/libqhull_r.so
 %{_libdir}/libqhull_p.so
 
+
 %changelog
+* Tue Sep 04 2018 Toshiaki Ara <ara_t@384.jp> 2015.2-1
+- update to 2015.2-7.2.0
+- add patches from fedora package
+- split out libqhull, libqhull_p, libqhull_r packages
+- drop Provides: libqhull.so
+- drop Provides: libqhull_p.so
+
 * Tue Apr 12 2016 Toshiaki Ara <ara_t@384.jp> 2012.1-2
 - add Provides: libqhull.so
 - add Provides: libqhull_p.so