Author: qboosh Date: Sat Oct 16 17:24:52 2010 GMT Module: packages Tag: HEAD ---- Log message: - updated to 2010.1 - added update patch to update ac/am suite (included Makefile/cmake/qt suites don't support shared library)
---- Files affected: packages/qhull: qhull.spec (1.5 -> 1.6) , qhull-update.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/qhull/qhull.spec diff -u packages/qhull/qhull.spec:1.5 packages/qhull/qhull.spec:1.6 --- packages/qhull/qhull.spec:1.5 Wed Sep 5 16:25:53 2007 +++ packages/qhull/qhull.spec Sat Oct 16 19:24:46 2010 @@ -2,17 +2,18 @@ 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: 2003.1 -Release: 2 +Version: 2010.1 +Release: 1 License: distributable (see COPYING.txt) Group: Libraries Source0: http://www.qhull.org/download/%{name}-%{version}-src.tgz -# Source0-md5: 3f301373539a55b8c7aa961b6c13d196 +# Source0-md5: e64138470acdeb18f752a0bc2a11ceb4 +Patch0: %{name}-update.patch URL: http://www.qhull.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool -BuildRequires: perl-base +BuildRequires: sed >= 4.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -57,10 +58,9 @@ %prep %setup -q +%patch0 -p1 -%{__perl} -pi -e 's/\r//g;s/^echo Run/exit 0/' src/Make-config.sh -touch src/Makefile.txt -mv -f src/{Mborland,MBorland} +sed -i -e 's/^echo Run/exit 0/' src/Make-config.sh %build cd src @@ -79,6 +79,8 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/qhull + %clean rm -rf $RPM_BUILD_ROOT @@ -88,20 +90,27 @@ %files %defattr(644,root,root,755) %doc Announce.txt COPYING.txt README.txt REGISTER.txt index.htm -%attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_libdir}/lib*.so.*.*.* -%{_mandir}/man1/*.1* +%attr(755,root,root) %{_bindir}/qconvex +%attr(755,root,root) %{_bindir}/qdelaunay +%attr(755,root,root) %{_bindir}/qhalf +%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.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libqhull.so.4 +%{_mandir}/man1/qhull.1* +%{_mandir}/man1/rbox.1* %files devel %defattr(644,root,root,755) %doc html/*.{htm,gif} -%attr(755,root,root) %{_libdir}/lib*.so -%{_libdir}/lib*.la +%attr(755,root,root) %{_libdir}/libqhull.so +%{_libdir}/libqhull.la %{_includedir}/qhull %files static %defattr(644,root,root,755) -%{_libdir}/lib*.a +%{_libdir}/libqhull.a %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -109,6 +118,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2010/10/16 17:24:46 qboosh +- updated to 2010.1 +- added update patch to update ac/am suite (included Makefile/cmake/qt suites don't support shared library) + Revision 1.5 2007/09/05 14:25:53 baggins - rel 2 @@ -123,4 +136,3 @@ Revision 1.1 2004/01/01 11:36:32 qboosh - new - ================================================================ Index: packages/qhull/qhull-update.patch diff -u /dev/null packages/qhull/qhull-update.patch:1.1 --- /dev/null Sat Oct 16 19:24:52 2010 +++ packages/qhull/qhull-update.patch Sat Oct 16 19:24:46 2010 @@ -0,0 +1,51 @@ +--- qhull-2010.1/src/Make-config.sh.orig 2010-01-07 20:01:43.000000000 +0100 ++++ qhull-2010.1/src/Make-config.sh 2010-10-16 18:27:10.719740205 +0200 +@@ -114,7 +114,7 @@ + ### Man pages (trick to get around .man extension) + + %.1: %.man +- cp $< $@ ++ cp $< $@ + CLEANFILES = *.1 + man_MANS = rbox.1 qhull.1 + +@@ -183,6 +183,7 @@ + + # from (frequently used files at end): + libqhull_la_SOURCES = \ ++ rboxlib.c \ + user.c \ + global.c \ + random.c \ +@@ -195,7 +196,9 @@ + geom.c \ + poly.c \ + qset.c \ +- mem.c ++ mem.c \ ++ usermem.c \ ++ userprintf.c + + # how: + libqhull_la_LDFLAGS = -version-info 4:0:0 -lm +@@ -233,7 +236,8 @@ + merge.h \ + libqhull.h \ + qset.h \ +- user.h ++ user.h \ ++ random.h + + + ### Example programs +@@ -247,9 +251,7 @@ + user_eg.c \ + user_eg2.c \ +- qhull_interface.cpp \ +- Makefile.txt \ + Make-config.sh \ +- MBorland ++ Mborland + + doc_DATA = Changes.txt \ + index.htm \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qhull/qhull.spec?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
