Author: qboosh Date: Tue Jan 25 20:24:14 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated python patch so it actually works
- kill unwanted -O3 from C (libinchi) compilation
- package python binding
---- Files affected:
packages/openbabel:
openbabel-python.patch (1.1 -> 1.2) , openbabel.spec (1.31 -> 1.32)
---- Diffs:
================================================================
Index: packages/openbabel/openbabel-python.patch
diff -u packages/openbabel/openbabel-python.patch:1.1
packages/openbabel/openbabel-python.patch:1.2
--- packages/openbabel/openbabel-python.patch:1.1 Tue Jan 25 15:22:52 2011
+++ packages/openbabel/openbabel-python.patch Tue Jan 25 21:24:08 2011
@@ -1,11 +1,18 @@
--- openbabel-2.3.0/scripts/CMakeLists.txt.orig 2010-10-25
19:37:42.000000000 +0200
+++ openbabel-2.3.0/scripts/CMakeLists.txt 2011-01-24 17:32:52.634356589
+0100
-@@ -84,7 +84,7 @@
+@@ -84,12 +84,12 @@
VERBATIM)
if (PYTHON_PREFIX)
- install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE}
${openbabel_SOURCE_DIR}/scripts/python/setup.py install
--prefix=${PYTHON_PREFIX} WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)")
-+ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE}
${openbabel_SOURCE_DIR}/scripts/python/setup.py install
--prefix=${PYTHON_PREFIX} --root=$ENV{DESTDIR} WORKING_DIRECTORY
${openbabel_BINARY_DIR}/scripts)")
++ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE}
${openbabel_SOURCE_DIR}/scripts/python/setup.py install
--prefix=${PYTHON_PREFIX} --root=\$ENV{DESTDIR} --optimize=2 WORKING_DIRECTORY
${openbabel_BINARY_DIR}/scripts)")
else (PYTHON_PREFIX)
if (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
- install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE}
${openbabel_SOURCE_DIR}/scripts/python/setup.py install WORKING_DIRECTORY
${openbabel_BINARY_DIR}/scripts)")
+- install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE}
${openbabel_SOURCE_DIR}/scripts/python/setup.py install WORKING_DIRECTORY
${openbabel_BINARY_DIR}/scripts)")
++ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE}
${openbabel_SOURCE_DIR}/scripts/python/setup.py install --root=\$ENV{DESTDIR}
--optimize=2 WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)")
+ else (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
+- install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE}
${openbabel_SOURCE_DIR}/scripts/python/setup.py install
--prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY
${openbabel_BINARY_DIR}/scripts)")
++ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE}
${openbabel_SOURCE_DIR}/scripts/python/setup.py install
--prefix=${CMAKE_INSTALL_PREFIX} --root=\$ENV{DESTDIR} --optimize=2
WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)")
+ endif (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
+ endif (PYTHON_PREFIX)
+
================================================================
Index: packages/openbabel/openbabel.spec
diff -u packages/openbabel/openbabel.spec:1.31
packages/openbabel/openbabel.spec:1.32
--- packages/openbabel/openbabel.spec:1.31 Tue Jan 25 15:22:52 2011
+++ packages/openbabel/openbabel.spec Tue Jan 25 21:24:08 2011
@@ -21,6 +21,8 @@
BuildRequires: libstdc++-devel
BuildRequires: libxml2-devel >= 2.6.5
BuildRequires: perl-devel
+BuildRequires: rpm-perlprov
+BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.577
#BuildRequires: wxGTK2-devel
BuildRequires: zlib-devel
@@ -65,6 +67,18 @@
%description -n perl-Chemistry-OpenBabel -l pl.UTF-8
Wiązanie Perla do biblioteki OpenBabel.
+%package -n python-openbabel
+Summary: Python binding for OpenBabel
+Summary(pl.UTF-8): Wiązanie Pythona do biblioteki OpenBabel
+Group: Libraries/Python
+Requires: %{name} = %{version}-%{release}
+
+%description -n python-openbabel
+Python binding for OpenBabel.
+
+%description -n python-openbabel -l pl.UTF-8
+Wiązanie Pythona do biblioteki OpenBabel.
+
%prep
%setup -q
%patch0 -p1
@@ -75,6 +89,7 @@
%build
%cmake . \
-DALL_BINDINGS=ON \
+ -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
-DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
-DwxWIDGETS_CONFIG_EXECUTABLE=%{_bindir}/wx-gtk2-unicode-config
%{__make}
@@ -85,6 +100,8 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+%py_postclean
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -147,12 +164,23 @@
%{perl_vendorarch}/auto/Chemistry/OpenBabel/OpenBabel.bs
%attr(755,root,root) %{perl_vendorarch}/auto/Chemistry/OpenBabel/OpenBabel.so
+%files -n python-openbabel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{py_sitedir}/_openbabel.so
+%{py_sitedir}/openbabel.py[co]
+%{py_sitedir}/openbabel-1.6-py*.egg-info
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[email protected]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.32 2011/01/25 20:24:08 qboosh
+- updated python patch so it actually works
+- kill unwanted -O3 from C (libinchi) compilation
+- package python binding
+
Revision 1.31 2011/01/25 14:22:52 qboosh
- added prefix,perl,python patches
- now perl binding is packaged; python still broken
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openbabel/openbabel-python.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openbabel/openbabel.spec?r1=1.31&r2=1.32&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
