[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/coldet/devel .cvsignore, 1.2, 1.3 coldet-1.1-fixes.patch, 1.1, 1.2 coldet.spec, 1.2, 1.3 sources, 1.2, 1.3



Author: jwrdegoede

Update of /cvs/extras/rpms/coldet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21936

Modified Files:
	.cvsignore coldet-1.1-fixes.patch coldet.spec sources 
Log Message:
* Sun May 20 2007 Hans de Goede <j w r degoede hhs nl> 1.2-1
- New upstream release 1.2
- Fix URL field (bz 240645)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/coldet/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jul 2006 18:08:17 -0000	1.2
+++ .cvsignore	20 May 2007 08:15:13 -0000	1.3
@@ -1 +1 @@
-coldet_11.zip
+coldet12.zip

coldet-1.1-fixes.patch:

Index: coldet-1.1-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/coldet/devel/coldet-1.1-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- coldet-1.1-fixes.patch	7 Jul 2006 18:08:17 -0000	1.1
+++ coldet-1.1-fixes.patch	20 May 2007 08:15:13 -0000	1.2
@@ -2,14 +2,14 @@
 --- coldet.orig/src/box.cpp	2001-02-23 21:21:20.000000000 +0100
 +++ coldet/src/box.cpp	2006-06-26 09:11:12.000000000 +0200
 @@ -228,7 +228,7 @@
- extern "C" { 
- int tri_tri_intersect(float V0[3],float V1[3],float V2[3],
-                       float U0[3],float U1[3],float U2[3]);
--};
-+}
- 
- Triangle::Triangle(const Vector3D& _1, const Vector3D& _2, const Vector3D& _3)
- : v1(_1), v2(_2), v3(_3), center((1.0f/3.0f)*(_1+_2+_3)) 
+ extern "C" { 
+ int tri_tri_intersect(float V0[3],float V1[3],float V2[3],
+                       float U0[3],float U1[3],float U2[3]);
+-};
++}
+ 
+ Triangle::Triangle(const Vector3D& _1, const Vector3D& _2, const Vector3D& _3)
+ : v1(_1), v2(_2), v3(_3), center((1.0f/3.0f)*(_1+_2+_3)) 
 diff -ur coldet.orig/src/coldetimpl.h coldet/src/coldetimpl.h
 --- coldet.orig/src/coldetimpl.h	2001-02-23 21:21:20.000000000 +0100
 +++ coldet/src/coldetimpl.h	2006-06-26 09:11:12.000000000 +0200
@@ -17,7 +17,7 @@
  
    int getTriangleIndex(BoxedTriangle* bt)
    {
--    return int(bt-m_Triangles.begin());
+-    return int(bt-&(*m_Triangles.begin()));
 +    return (int)(bt-&(m_Triangles[0]));
    }
  


Index: coldet.spec
===================================================================
RCS file: /cvs/extras/rpms/coldet/devel/coldet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- coldet.spec	28 Aug 2006 05:16:03 -0000	1.2
+++ coldet.spec	20 May 2007 08:15:13 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           coldet
-Version:        1.1
-Release:        4%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        3D Collision Detection Library
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://photoneffect.com/coldet/
-Source0:        http://photoneffect.com/download/coldet_11.zip
+URL:            http://coldet.sourceforge.net/
+Source0:        http://downloads.sourceforege.net/coldet/coldet12.zip
 Patch0:         coldet-1.1-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,7 +42,7 @@
 %setup -q -n %{name}
 %patch0 -p1 -z .fixes
 # for %doc
-sed -i 's/\r//' readme.txt COPYING doc/quickstart.html
+sed -i 's/\r//' readme.txt COPYING doc/quickstart.html doc/html/{*.html,*.css}
 mv doc/quickstart.html doc/html
 
 
@@ -76,12 +76,16 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc transform.txt doc/html
+%doc doc/html
 %{_includedir}/%{name}
 %{_libdir}/lib%{name}.so
 
 
 %changelog
+* Sun May 20 2007 Hans de Goede <j w r degoede hhs nl> 1.2-1
+- New upstream release 1.2
+- Fix URL field (bz 240645)
+
 * Mon Aug 28 2006 Hans de Goede <j w r degoede hhs nl> 1.1-4
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/coldet/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jul 2006 18:08:17 -0000	1.2
+++ sources	20 May 2007 08:15:13 -0000	1.3
@@ -1 +1 @@
-26c2db12ec5ad2d7a0b1d0fe2597ed4a  coldet_11.zip
+069ceb36333f8d88e099a44d19ebc061  coldet12.zip


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]