rpms/openbabel/devel openbabel-check.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 openbabel-rpm.patch, 1.2, 1.3 openbabel.spec, 1.41, 1.42 sources, 1.11, 1.12 openbabel-python-ppc64.patch, 1.3, NONE

Sun Jul 6 14:58:24 UTC 2008

Author: rathann

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

Modified Files:
	.cvsignore openbabel-rpm.patch openbabel.spec sources 
Added Files:
	openbabel-check.patch 
Removed Files:
	openbabel-python-ppc64.patch 
Log Message:
- updated to 2.2.0
- fixed testsuite
- added strict perl version requirements (patch by Paul Howarth)
- fixed some rpmlint warnings
- merged a sed call into -rpm patch


openbabel-check.patch:

--- NEW FILE openbabel-check.patch ---
diff -up openbabel-2.2.0b7/test/bond.cpp.chk openbabel-2.2.0b7/test/bond.cpp
--- openbabel-2.2.0b7/test/bond.cpp.chk	2008-06-13 22:48:05.000000000 +0200
+++ openbabel-2.2.0b7/test/bond.cpp	2008-07-06 14:05:26.000000000 +0200
@@ -58,7 +58,7 @@ int main(int argc,char *argv[])
 
   bond1.SetBegin(&begin1);
   bond1.SetEnd(&end1);
-  cout << "ok 4\n";
+  cout << "ok 3\n";
 
   return(0);
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	2 Jul 2008 18:49:45 -0000	1.11
+++ .cvsignore	6 Jul 2008 14:57:34 -0000	1.12
@@ -1 +1 @@
-openbabel-2.2.0b7-20080627-r2628.tar.gz
+openbabel-2.2.0.tar.gz

openbabel-rpm.patch:

Index: openbabel-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-rpm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openbabel-rpm.patch	2 Mar 2008 19:04:13 -0000	1.2
+++ openbabel-rpm.patch	6 Jul 2008 14:57:34 -0000	1.3
@@ -1,9 +1,9 @@
-diff -up openbabel-2.2.0b3-20080215-r2249/scripts/Makefile.am.r openbabel-2.2.0b3-20080215-r2249/scripts/Makefile.am
---- openbabel-2.2.0b3-20080215-r2249/scripts/Makefile.am.r	2008-01-24 21:43:42.000000000 +0100
-+++ openbabel-2.2.0b3-20080215-r2249/scripts/Makefile.am	2008-02-23 15:48:26.000000000 +0100
-@@ -58,8 +58,8 @@ ruby/openbabel_ruby.cpp: openbabel-ruby.
- 	$(SWIG) -ruby -naturalvar -autorename -c++ -o $@ -I$(top_srcdir)/include \
-   -I$(top_builddir)/include $<;
+diff -up openbabel-2.2.0/scripts/Makefile.am.r openbabel-2.2.0/scripts/Makefile.am
+--- openbabel-2.2.0/scripts/Makefile.am.r	2008-07-03 20:25:54.000000000 +0200
++++ openbabel-2.2.0/scripts/Makefile.am	2008-07-06 15:59:23.000000000 +0200
+@@ -63,8 +63,8 @@ ruby/openbabel_ruby.cpp: openbabel-ruby.
+ 	$(SWIG) -small -O -ruby -naturalvar -autorename -c++ -o $@ \
+ 	-templatereduce -I$(top_srcdir)/include -I$(top_builddir)/include $<;
  	(cd ruby; ruby extconf.rb \
 -  --with-openbabel-include=$(includedir)/openbabel-2.0 \
 -  --with-openbabel-lib=$(libdir) )
@@ -12,3 +12,17 @@
  	sed -e 's/rb_define_module(\"Openbabel\")/rb_define_module(\"OpenBabel\")/' -e 's/void Init_OpenBabel/void Init_openbabel/' <ruby/openbabel_ruby.cpp >ruby/openbabel_ruby.new 
  	mv ruby/openbabel_ruby.new ruby/openbabel_ruby.cpp
  endif # BUILD_RUBY
+diff -up openbabel-2.2.0/scripts/perl/Makefile.PL.r openbabel-2.2.0/scripts/perl/Makefile.PL
+--- openbabel-2.2.0/scripts/perl/Makefile.PL.r	2008-07-06 16:16:45.000000000 +0200
++++ openbabel-2.2.0/scripts/perl/Makefile.PL	2008-07-06 16:48:59.000000000 +0200
+@@ -3,8 +3,8 @@ use ExtUtils::MakeMaker;
+ use lib 'inc';
+ use Devel::CheckLib;
+ 
+-check_lib_or_exit( lib => 'openbabel' , libpath =>
+- at ENV{"LD_LIBRARY_PATH"});
++#check_lib_or_exit( lib => 'openbabel' , libpath =>
++#@ENV{"LD_LIBRARY_PATH"});
+ 
+ $CC = 'g++';
+ $srcdir = '../../src';


Index: openbabel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- openbabel.spec	2 Jul 2008 22:46:55 -0000	1.41
+++ openbabel.spec	6 Jul 2008 14:57:34 -0000	1.42
@@ -4,12 +4,12 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')
 
-%define beta_ver b7
-%define beta_str b7-20080627-r2628
+%define beta_ver %{nil}
+%define beta_str %{nil}
 
 Name: openbabel
 Version: 2.2.0
-Release: 0.5.%{beta_ver}%{?dist}
+Release: 1%{?dist}
 Summary: Chemistry software file format converter
 License: GPLv2
 Group: Applications/File
@@ -17,6 +17,7 @@
 Source: http://dl.sourceforge.net/sourceforge/openbabel/%{name}-%{version}%{beta_str}.tar.gz
 Patch: %{name}-gcc43.patch
 Patch1: %{name}-rpm.patch
+Patch2: %{name}-check.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: inchi-devel
 BuildRequires: libtool
@@ -62,8 +63,9 @@
 %package -n perl-%{name}
 Group: System Environment/Libraries
 Summary: Perl wrapper for the Open Babel library
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Obsoletes: %{name}-perl < 2.2.0
-Provides: %{name}-perl
+Provides: %{name}-perl = %{version}-%{release}
 
 %description -n perl-%{name}
 Perl wrapper for the Open Babel library.
@@ -72,7 +74,7 @@
 Group: System Environment/Libraries
 Summary: Python wrapper for the Open Babel library
 Obsoletes: %{name}-python < 2.2.0
-Provides: %{name}-python
+Provides: %{name}-python = %{version}-%{release}
 
 %description -n python-%{name}
 Python wrapper for the Open Babel library.
@@ -90,7 +92,8 @@
 %setup -q -n %{name}-%{version}%{beta_ver}
 %patch -p1 -b .gcc43
 %patch1 -p1 -b .r
-find . -name "._*" | xargs rm
+%patch2 -p1 -b .chk
+chmod 644 src/formats/{mmcif,fchk}format.cpp
 
 %build
 # don't reference m4 include directory which isn't shipped in the tarball
@@ -101,9 +104,6 @@
 %{__make} %{?_smp_mflags}
 
 pushd scripts/perl
-# disable the check for the installed library, the library isn't installed yet
-# at this point and isn't expected to
-sed -i -e 's/check_lib_or_exit/#check_lib_or_exit/g' Makefile.PL
 perl Makefile.PL INSTALLDIRS="vendor"
 %{__make} %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 popd
@@ -134,6 +134,7 @@
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 popd
+chmod 755 $RPM_BUILD_ROOT%{python_sitearch}/_openbabel.so
 
 pushd scripts/ruby
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
@@ -187,11 +188,14 @@
 %{ruby_sitearch}/openbabel.so
 
 %changelog
-* Wed Jul 02 2008 Dominik Mierzejewski <rpm at greysector.net> 2.2.0-0.6.b7
-- updated to 2.2.0 beta7
+* Sun Jul 06 2008 Dominik Mierzejewski <rpm at greysector.net> 2.2.0-1
+- updated to 2.2.0
 - new URL
 - dropped Python binding split patch (broken, reverted upstream)
-- removed weird Macintosh files
+- fixed testsuite and disabled inchi tests temporarily
+- added strict perl version requirements (patch by Paul Howarth)
+- fixed some rpmlint warnings
+- merged a sed call into -rpm patch
 
 * Fri Jun 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2.0-0.5.b5
 - backport upstream patch to split Python binding (should fix #427700 for good)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	2 Jul 2008 18:49:45 -0000	1.11
+++ sources	6 Jul 2008 14:57:34 -0000	1.12
@@ -1 +1 @@
-541d2e8654d95afe5aee2ad9055e33b2  openbabel-2.2.0b7-20080627-r2628.tar.gz
+643a18c7ba09254d36e93afd6277346f  openbabel-2.2.0.tar.gz


--- openbabel-python-ppc64.patch DELETED ---


