rpms/xdrawchem/devel xdrawchem-ob22.patch, NONE, 1.1 xdrawchem.spec, 1.9, 1.10

[Dominik Mierzejewski (rathann)]

Author: rathann

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

Modified Files:
	xdrawchem.spec 
Added Files:
	xdrawchem-ob22.patch 
Log Message:
- port to openbabel-2.2

xdrawchem-ob22.patch:

--- NEW FILE xdrawchem-ob22.patch ---
diff -up xdrawchem-1.9.9/xdrawchem/application_ob.cpp.ob xdrawchem-1.9.9/xdrawchem/application_ob.cpp
--- xdrawchem-1.9.9/xdrawchem/application_ob.cpp.ob	2005-11-30 04:47:14.000000000 +0100
+++ xdrawchem-1.9.9/xdrawchem/application_ob.cpp	2008-04-04 21:24:48.000000000 +0200
@@ -45,23 +45,36 @@ void ApplicationWindow::OBGetFilters() {
   readFilters.append(str1);
   writeFilters.append(str1);
 
-  Formatpos pos;
+  int i;
   OBFormat* pFormat;
-  const char* str=NULL;
-  while(OBConversion::GetNextFormat(pos,str,pFormat))
+  vector<string> pFormats=Conv.GetSupportedInputFormat();
+
+  for(i=0; i < pFormats.size(); i++)
     {
       //std::cout << "  " << str << std::endl;
-      if((pFormat->Flags() & NOTWRITABLE) && (pFormat->Flags() & NOTREADABLE))
+      pFormat=Conv.FindFormat(pFormats[i].c_str());
+      if(pFormat->Flags() & NOTREADABLE)
+	continue;
+      str1 = pFormats[i];
+      myext = str1.left( str1.find(" -- ") );
+      str1.append("(*.");
+      str1.append(myext);
+      str1.append(")");
+      readFilters.append(str1);
+    }
+
+  pFormats=Conv.GetSupportedOutputFormat();
+  for(i=0; i < pFormats.size(); i++)
+    {
+      pFormat=Conv.FindFormat(pFormats[i].c_str());
+      if(pFormat->Flags() & NOTWRITABLE)
 	continue;
-      str1 = str;
+      str1 = pFormats[i];
       myext = str1.left( str1.find(" -- ") );
       str1.append("(*.");
       str1.append(myext);
       str1.append(")");
-      if ( (pFormat->Flags() & NOTREADABLE) == 0 )
-	readFilters.append(str1);
-      if ( (pFormat->Flags() & NOTWRITABLE) == 0 )
-	writeFilters.append(str1);
+      writeFilters.append(str1);
     }
   
   filters.sort();


Index: xdrawchem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdrawchem/devel/xdrawchem.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xdrawchem.spec	4 Apr 2008 18:28:48 -0000	1.9
+++ xdrawchem.spec	4 Apr 2008 19:29:00 -0000	1.10
@@ -6,6 +6,7 @@
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Patch:		%{name}-gcc43.patch
+Patch1:		%{name}-ob22.patch
 URL: 		http://xdrawchem.sourceforge.net/
 License: 	GPLv2+
 Group: 		Applications/Engineering
@@ -24,6 +25,7 @@
 %prep
 %setup -q
 %patch -p1 -b .gcc43
+%patch1 -p1 -b .ob
 
 %build
 %configure
@@ -53,8 +55,9 @@
 %{_datadir}/pixmaps/xdrawchem.png
 
 %changelog
-* Tue Mar 25 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.9.9-9
-- qt-devel -> qt3-devel
+* Fri Apr 04 2008 Dominik Mierzejewski <rpm at greysector.net> 1.9.9-9
+- qt-devel -> qt3-devel (thanks to Rex Dieter)
+- port to openbabel-2.2
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.9.9-8
 - Autorebuild for GCC 4.3