rpms/xdrawchem/F-9 xdrawchem-ob22.patch, 1.1, 1.2 xdrawchem.spec, 1.10, 1.11

[Dominik Mierzejewski (rathann)]

Author: rathann

Update of /cvs/pkgs/rpms/xdrawchem/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25615

Modified Files:
	xdrawchem-ob22.patch xdrawchem.spec 
Log Message:
- fix segfault (#447531), patch by Mamoru Tasaka
- don't use %%makeinstall


xdrawchem-ob22.patch:

Index: xdrawchem-ob22.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xdrawchem/F-9/xdrawchem-ob22.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xdrawchem-ob22.patch	4 Apr 2008 19:29:00 -0000	1.1
+++ xdrawchem-ob22.patch	1 Jun 2008 14:00:13 -0000	1.2
@@ -1,7 +1,6 @@
-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() {
+--- xdrawchem-1.9.9/xdrawchem/application_ob.cpp.ob	2005-11-30 12:47:14.000000000 +0900
++++ xdrawchem-1.9.9/xdrawchem/application_ob.cpp	2008-05-20 20:50:07.000000000 +0900
+@@ -45,23 +45,38 @@
    readFilters.append(str1);
    writeFilters.append(str1);
  
@@ -17,6 +16,7 @@
        //std::cout << "  " << str << std::endl;
 -      if((pFormat->Flags() & NOTWRITABLE) && (pFormat->Flags() & NOTREADABLE))
 +      pFormat=Conv.FindFormat(pFormats[i].c_str());
++      if(!pFormat) continue;
 +      if(pFormat->Flags() & NOTREADABLE)
 +	continue;
 +      str1 = pFormats[i];
@@ -31,6 +31,7 @@
 +  for(i=0; i < pFormats.size(); i++)
 +    {
 +      pFormat=Conv.FindFormat(pFormats[i].c_str());
++      if(!pFormat) continue;
 +      if(pFormat->Flags() & NOTWRITABLE)
  	continue;
 -      str1 = str;


Index: xdrawchem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdrawchem/F-9/xdrawchem.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xdrawchem.spec	4 Apr 2008 19:29:00 -0000	1.10
+++ xdrawchem.spec	1 Jun 2008 14:00:13 -0000	1.11
@@ -1,6 +1,6 @@
 Name: 		xdrawchem
 Version: 	1.9.9
-Release: 	9%{?dist}
+Release: 	10%{?dist}
 Summary: 	2D chemical structures drawing tool
 Source:		http://dl.sourceforge.net/sourceforge/xdrawchem/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
@@ -32,7 +32,7 @@
 %{__make} %{?_smp_mflags}
 
 %install
-%makeinstall
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 # menu
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -55,6 +55,10 @@
 %{_datadir}/pixmaps/xdrawchem.png
 
 %changelog
+* Sun Jun 01 2008 Dominik Mierzejewski <rpm at greysector.net> 1.9.9-10
+- fix segfault (#447531), patch by Mamoru Tasaka
+- don't use %%makeinstall
+
 * 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