rpms/openbabel/devel .cvsignore, 1.2, 1.3 openbabel-chicken.patch, 1.1, 1.2 openbabel.spec, 1.4, 1.5 sources, 1.2, 1.3 openbabel-cxxflags.patch, 1.1, NONE
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Mon Dec 18 21:34:49 UTC 2006
- Previous message: rpms/Macaulay2/devel Macaulay2-0.9.95-infodir.patch, NONE, 1.1 Macaulay2-0.9.95-xdg_open.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 Macaulay2.desktop, 1.3, 1.4 Macaulay2.spec, 1.27, 1.28 sources, 1.6, 1.7 Macaulay2-0.9.8-htmlview.patch, 1.1, NONE Macaulay2-0.9.8-infodir.patch, 1.1, NONE
- Next message: rpms/clucene/FC-6 clucene.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rathann
Update of /cvs/extras/rpms/openbabel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4316
Modified Files:
.cvsignore openbabel-chicken.patch openbabel.spec sources
Removed Files:
openbabel-cxxflags.patch
Log Message:
- update to 2.1.0b4 to fix building with new python
- dropped obsolete patch
- ensure proper inchi versioning
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openbabel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Aug 2006 22:11:43 -0000 1.2
+++ .cvsignore 18 Dec 2006 21:34:19 -0000 1.3
@@ -1 +1 @@
-openbabel-2.0.2.tar.gz
+openbabel-2.1.0b4.tar.gz
openbabel-chicken.patch:
Index: openbabel-chicken.patch
===================================================================
RCS file: /cvs/extras/rpms/openbabel/devel/openbabel-chicken.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openbabel-chicken.patch 20 Sep 2006 07:10:51 -0000 1.1
+++ openbabel-chicken.patch 18 Dec 2006 21:34:19 -0000 1.2
@@ -1,24 +1,23 @@
---- openbabel-2.0.2/scripts/perl/Makefile.PL.chicken 2006-05-03 17:54:54.000000000 +0200
-+++ openbabel-2.0.2/scripts/perl/Makefile.PL 2006-09-20 05:55:53.000000000 +0200
-@@ -4,7 +4,8 @@
- $srcdir = '../../src';
+--- openbabel-2.1.0b4/scripts/perl/Makefile.PL.chicken 2006-12-10 13:57:57.000000000 +0100
++++ openbabel-2.1.0b4/scripts/perl/Makefile.PL 2006-12-18 00:45:12.000000000 +0100
+@@ -5,6 +5,8 @@
# check if we're compiling in the source directory
--$ldfrom = '$(OBJECT) -lopenbabel -lz';
+ $ldfrom = '$(OBJECT) -lopenbabel -lz';
+$ldfrom = "\$(OBJECT) -L$srcdir/.libs -lopenbabel -lz"
+ if (-r "$srcdir/.libs/libopenbabel.so") and (-s _) and (-B _);
$ldfrom = "\$(OBJECT) $srcdir/.libs/libopenbabel.a -lz"
if (-r "$srcdir/.libs/libopenbabel.a") and (-s _) and (-B _);
---- openbabel-2.0.2/scripts/python/setup.py.chicken 2006-05-03 17:54:53.000000000 +0200
-+++ openbabel-2.0.2/scripts/python/setup.py 2006-09-20 05:53:33.000000000 +0200
-@@ -41,6 +41,9 @@
- "INFO: Looking for library and include files in ../../src\n")
- if os.path.isfile("../../src/atom.o"):
- return ["../../src"],["../../src"]
-+ else:
-+ if os.path.isfile("../../src/atom.lo"):
-+ return ["../../src"],["../../src/.libs"]
-
- sys.stderr.write("ERROR: Cannot find Open Babel library directory\n")
- return (None,None)
+--- openbabel-2.1.0b4/scripts/python/setup.py.chicken 2006-12-10 13:58:47.000000000 +0100
++++ openbabel-2.1.0b4/scripts/python/setup.py 2006-12-18 01:07:25.000000000 +0100
+@@ -31,6 +31,9 @@
+ sys.stderr.write("INFO: Looking for library and include files in ../../src\n")
+ if os.path.isfile("../../src/atom.o"):
+ return ["../../include"],["../../src"]
++ else:
++ if os.path.isfile("../../src/atom.lo"):
++ return ["../../include"],["../../src/.libs"]
+
+ for dirname in ["/usr/local","/usr"]:
+ # Look for each of these directories in turn for the directory include/openbabel-2.0
Index: openbabel.spec
===================================================================
RCS file: /cvs/extras/rpms/openbabel/devel/openbabel.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openbabel.spec 3 Oct 2006 22:00:40 -0000 1.4
+++ openbabel.spec 18 Dec 2006 21:34:19 -0000 1.5
@@ -4,27 +4,23 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%define inchi_ver 1.0.1
+%define inchi_rel 5
Name: openbabel
-Version: 2.0.2
-Release: 5%{?dist}
+Version: 2.1.0
+Release: 0.1.b4%{?dist}
Summary: Chemistry software file format converter
License: GPL
Group: Applications/File
URL: http://openbabel.sourceforge.net/
-Source: http://dl.sourceforge.net/sourceforge/openbabel/%{name}-%{version}.tar.gz
-Patch0: %{name}-cxxflags.patch
+Source: http://dl.sourceforge.net/sourceforge/openbabel/%{name}-%{version}b4.tar.gz
Patch1: %{name}-chicken.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf
-BuildRequires: automake
-#BuildRequires: doxygen
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: perl
BuildRequires: python
BuildRequires: python-devel
-BuildRequires: swig
BuildRequires: zlib-devel
%description
@@ -60,6 +56,7 @@
Group: System Environment/Libraries
License: LGPL
Version: %{inchi_ver}
+Release: %{inchi_rel}%{?dist}
%description -n inchi
The IUPAC International Chemical Identifier (InChI) library.
@@ -69,7 +66,8 @@
Group: Development/Libraries
License: LGPL
Version: %{inchi_ver}
-Requires: inchi = %{inchi_ver}-%{release}
+Release: %{inchi_rel}%{?dist}
+Requires: inchi = %{inchi_ver}-%{inchi_rel}%{?dist}
%description -n inchi-devel
The inchi-devel package includes the header files and libraries
@@ -94,8 +92,7 @@
Python wrapper for the Open Babel library.
%prep
-%setup -q
-%patch0 -p1 -b .cxxflags
+%setup -q -n %{name}-2.1.0b4
%patch1 -p1 -b .chicken
%build
@@ -106,7 +103,6 @@
pushd scripts/perl
perl Makefile.PL INSTALLDIRS="vendor"
%{__make} %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
-#%{__make} test
popd
pushd scripts/python
@@ -125,6 +121,7 @@
popd
%{__rm} -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
%{__rm} -f $RPM_BUILD_ROOT%{perl_vendorarch}/*/Chemistry/OpenBabel/{.packlist,OpenBabel.bs}
+chmod 755 $RPM_BUILD_ROOT%{perl_vendorarch}/*/Chemistry/OpenBabel/OpenBabel.so
pushd scripts/python
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
@@ -180,8 +177,14 @@
%defattr(-,root,root,-)
%{python_sitearch}/_openbabel.so
%{python_sitearch}/openbabel.py*
+%{python_sitearch}/pybel.py*
%changelog
+* Sun Dec 17 2006 Dominik Mierzejewski <rpm at greysector.net> 2.1.0-0.1.b4
+- update to 2.1.0b4 to fix building with new python
+- dropped obsolete patch
+- ensure proper inchi versioning
+
* Tue Oct 03 2006 Dominik Mierzejewski <rpm at greysector.net> 2.0.2-5
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openbabel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Aug 2006 22:11:43 -0000 1.2
+++ sources 18 Dec 2006 21:34:19 -0000 1.3
@@ -1 +1 @@
-1cb8d4a99482d2d109887a099d1a719e openbabel-2.0.2.tar.gz
+c2ac565d77206f903fe04b119717a345 openbabel-2.1.0b4.tar.gz
--- openbabel-cxxflags.patch DELETED ---
- Previous message: rpms/Macaulay2/devel Macaulay2-0.9.95-infodir.patch, NONE, 1.1 Macaulay2-0.9.95-xdg_open.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 Macaulay2.desktop, 1.3, 1.4 Macaulay2.spec, 1.27, 1.28 sources, 1.6, 1.7 Macaulay2-0.9.8-htmlview.patch, 1.1, NONE Macaulay2-0.9.8-infodir.patch, 1.1, NONE
- Next message: rpms/clucene/FC-6 clucene.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list