rpms/qhull/devel qhull-2003.1-qh_gethash.patch, NONE, 1.1 qhull.spec, 1.15, 1.16
corsepiu
corsepiu at fedoraproject.org
Tue Feb 2 08:56:27 UTC 2010
Author: corsepiu
Update of /cvs/pkgs/rpms/qhull/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18872/devel
Modified Files:
qhull.spec
Added Files:
qhull-2003.1-qh_gethash.patch
Log Message:
* Tue Feb 02 2010 Ralf Corsépius <corsepiu at fedoraproject.org> - 2003.1-14
- Apply upstream's qh_gethash patch
- Silence %setup.
- Remove rpath.
qhull-2003.1-qh_gethash.patch:
poly.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
--- NEW FILE qhull-2003.1-qh_gethash.patch ---
diff -up qhull-2003.1/src/poly.c.qh_gethash qhull-2003.1/src/poly.c
--- qhull-2003.1/src/poly.c.qh_gethash 2004-01-31 04:00:15.000000000 -0700
+++ qhull-2003.1/src/poly.c 2010-02-01 14:07:45.851966800 -0700
@@ -403,6 +403,7 @@ unsigned qh_gethash (int hashsize, setT
void **elemp= SETelemaddr_(set, firstindex, void);
ptr_intT hash = 0, elem;
int i;
+ unsigned result;
switch (size-firstindex) {
case 1:
@@ -441,9 +442,10 @@ unsigned qh_gethash (int hashsize, setT
}while(*elemp);
break;
}
- hash %= (ptr_intT) hashsize;
- /* hash= 0; for debugging purposes */
- return hash;
+ result= (unsigned)hash;
+ result %= (unsigned)hashsize;
+ /* result= 0; for debugging purposes */
+ return result;
} /* gethash */
/*-<a href="qh-poly.htm#TOC"
Index: qhull.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qhull/devel/qhull.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- qhull.spec 27 Jul 2009 02:25:56 -0000 1.15
+++ qhull.spec 2 Feb 2010 08:56:26 -0000 1.16
@@ -1,11 +1,12 @@
Summary: General dimension convex hull programs
Name: qhull
Version: 2003.1
-Release: 13%{?dist}
+Release: 14%{?dist}
License: Qhull
Group: System Environment/Libraries
Source0: http://www.qhull.org/download/qhull-%{version}.tar.gz
Patch0: qhull-2003.1-alias.patch
+Patch1: http://www.qhull.org/download/qhull-2003.1-qh_gethash.patch
URL: http://www.qhull.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,12 +34,16 @@ diagrams, furthest-site Voronoi diagrams
about a point.
%prep
-%setup -n %{name}-%{version}
+%setup -q -n %{name}-%{version}
%patch0 -p1
+%patch1 -p1
sed -i -e "s,\"../html/,\"html/,g" src/*.htm
%build
%configure --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
make
%install
@@ -67,6 +72,11 @@ rm -rf $RPM_BUILD_ROOT
%_includedir/*
%changelog
+* Tue Feb 02 2010 Ralf Corsépius <corsepiu at fedoraproject.org> - 2003.1-14
+- Apply upstream's qh_gethash patch
+- Silence %%setup.
+- Remove rpath.
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2003.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -92,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Sep 05 2006 Ralf Corsépius <rc040203 at freenet.de> - 2003.1-6
- Mass rebuild.
-* Fri Feb 17 2006 Ralf Corsépius <rc040203 at freenet.de> - 2003.1-5
+* Fri Feb 17 2006 Ralf Corsépius <rc040203 at freenet.de> - 2003.1-5
- Disable static libs.
- Fixup some broken links in doc.
- Add %%{?dist}.
More information about the scm-commits
mailing list