[openbabel/f15] Revert "bootstrap arm, disable bindings/tests"

Rex Dieter rdieter at fedoraproject.org
Tue Jan 17 13:54:28 UTC 2012


commit c58d557289c136ff4e14ccdc3d385f34a8f88d86
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jan 17 07:54:22 2012 -0600

    Revert "bootstrap arm, disable bindings/tests"
    
    This reverts commit bd925048c800beceafdeeb6cce2d4bae5cbcddfd.

 openbabel.spec |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/openbabel.spec b/openbabel.spec
index 35a8eee..d471513 100644
--- a/openbabel.spec
+++ b/openbabel.spec
@@ -10,7 +10,7 @@
 
 Name: openbabel
 Version: 2.3.1
-Release: 0.1%{beta_ver}%{?dist}
+Release: 1%{beta_ver}%{?dist}
 Summary: Chemistry software file format converter
 License: GPLv2
 Group: Applications/File
@@ -133,23 +133,22 @@ convert src/GUI/babel.xpm -transparent white babel.png
 %cmake \
  -DCMAKE_SKIP_RPATH:BOOL=ON \
  -DBUILD_GUI:BOOL=ON \
- -DPYTHON_BINDINGS:BOOL=OFF \
- -DPERL_BINDINGS:BOOL=OFF \
- -DRUBY_BINDINGS:BOOL=OFF \
- -DENABLE_TESTS:BOOL=OFF \
+ -DPYTHON_BINDINGS:BOOL=ON \
+ -DPERL_BINDINGS:BOOL=ON \
+ -DRUBY_BINDINGS:BOOL=ON \
  -DOPENBABEL_USE_SYSTEM_INCHI=true \
  .
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-#touch scripts/CMakeLists.txt
-make VERBOSE=1 DESTDIR=$RPM_BUILD_ROOT install/fast
+touch scripts/CMakeLists.txt
+make VERBOSE=1 DESTDIR=$RPM_BUILD_ROOT install
 
 rm $RPM_BUILD_ROOT%{_libdir}/cmake/openbabel2/*.cmake
-rm -f $RPM_BUILD_ROOT%{_libdir}/perl5/perllocal.pod
+rm $RPM_BUILD_ROOT%{_libdir}/perl5/perllocal.pod
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Chemistry/OpenBabel/{.packlist,OpenBabel.bs}
-#chmod 755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Chemistry/OpenBabel/OpenBabel.so
+chmod 755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Chemistry/OpenBabel/OpenBabel.so
 
 desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
 install -Dpm644 babel.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/babel.png
@@ -171,7 +170,7 @@ install -Dpm644 babel.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ba
 %defattr(-,root,root,-)
 %{_bindir}/babel
 %{_bindir}/ob*
-#{_bindir}/roundtrip
+%{_bindir}/roundtrip
 %{_mandir}/man1/*
 
 %files gui
@@ -195,7 +194,6 @@ install -Dpm644 babel.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ba
 %{_libdir}/libopenbabel.so
 %{_libdir}/pkgconfig/*.pc
 
-%if 0
 %files -n perl-%{name}
 %defattr(-,root,root,-)
 %{perl_vendorarch}/Chemistry/OpenBabel.pm
@@ -212,7 +210,6 @@ install -Dpm644 babel.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ba
 %files -n ruby-%{name}
 %defattr(-, root, root, -)
 %{ruby_sitearch}/openbabel.so
-%endif
 
 %changelog
 * Fri Oct 21 2011 Dominik Mierzejewski <rpm at greysector.net> 2.3.1-1


More information about the scm-commits mailing list