rpms/kdeedu/devel kdeedu-4.0.80-openbabel.patch, NONE, 1.1 kdeedu.spec, 1.110, 1.111

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1577/devel

Modified Files:
	kdeedu.spec 
Added Files:
	kdeedu-4.0.80-openbabel.patch 
Log Message:
* Tue May 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.80-2
- patch to build against OpenBabel 2.2.0 beta4

kdeedu-4.0.80-openbabel.patch:

--- NEW FILE kdeedu-4.0.80-openbabel.patch ---
diff -ur kdeedu-4.0.80/kalzium/libavogadro-kalzium/src/primitive.cpp kdeedu-4.0.80-openbabel/kalzium/libavogadro-kalzium/src/primitive.cpp
--- kdeedu-4.0.80/kalzium/libavogadro-kalzium/src/primitive.cpp	2008-05-21 10:33:31.000000000 +0200
+++ kdeedu-4.0.80-openbabel/kalzium/libavogadro-kalzium/src/primitive.cpp	2008-05-27 19:11:19.000000000 +0200
@@ -358,7 +358,7 @@
     for(Atom *lhsAtom = static_cast< Atom* >(BeginAtom( i ));
         lhsAtom; lhsAtom = static_cast< Atom* >(NextAtom( i )))
     {
-      Atom *rhsAtom = static_cast< Atom* >(other.GetAtom(lhsAtom->GetIdx()));
+      Atom *rhsAtom = static_cast< Atom* >(const_cast<Molecule&>(other).GetAtom(lhsAtom->GetIdx()));
       unsigned long id = rhsAtom->id();
       lhsAtom->setId(id);
       d->atoms[id] = lhsAtom;
@@ -370,7 +370,7 @@
     for(Bond *lhsBond = static_cast< Bond* >(BeginBond( j ));
         lhsBond; lhsBond = static_cast< Bond* >(NextBond( j )))
     {
-      Bond *rhsBond = static_cast< Bond* >(other.GetBond(lhsBond->GetIdx()));
+      Bond *rhsBond = static_cast< Bond* >(const_cast<Molecule&>(other).GetBond(lhsBond->GetIdx()));
       unsigned long id = rhsBond->id();
       lhsBond->setId(id);
       d->bonds[id] = lhsBond;


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- kdeedu.spec	26 May 2008 13:17:21 -0000	1.110
+++ kdeedu.spec	27 May 2008 17:14:14 -0000	1.111
@@ -14,7 +14,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications 
 Version: 4.0.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -22,6 +22,7 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdeedu-%{version}.tar.bz2
 # fix cfitsio detection by using pkgconfig
 Patch0:  kdeedu-4.0.4-cfitsio.patch
+# get this to build against OpenBabel 2.2.0 beta4
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # http://bugzilla.redhat.com/371121
@@ -218,6 +219,9 @@
 
 
 %changelog
+* Tue May 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.80-2
+- patch to build against OpenBabel 2.2.0 beta4
+
 * Mon May 26 2008 Than Ngo <than at redhat.com> 4.0.80-1
 - 4.1 beta1