diff --git a/.gitignore b/.gitignore index e69de29..47cbcdc 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/cmpi-bindings-0.5.2.tar.bz2 diff --git a/cmpi-bindings-0.4.17-no-ruby-perl.patch b/cmpi-bindings-0.4.17-no-ruby-perl.patch index 3db6578..e65e235 100644 --- a/cmpi-bindings-0.4.17-no-ruby-perl.patch +++ b/cmpi-bindings-0.4.17-no-ruby-perl.patch @@ -1,7 +1,7 @@ -diff -up cmpi-bindings-0.4.17/swig/CMakeLists.txt.orig cmpi-bindings-0.4.17/swig/CMakeLists.txt ---- cmpi-bindings-0.4.17/swig/CMakeLists.txt.orig 2011-09-30 21:13:40.000000000 +0200 -+++ cmpi-bindings-0.4.17/swig/CMakeLists.txt 2012-03-01 16:08:58.724392497 +0100 -@@ -4,11 +4,11 @@ +diff -up cmpi-bindings-0.5.2/swig/CMakeLists.txt.orig cmpi-bindings-0.5.2/swig/CMakeLists.txt +--- cmpi-bindings-0.5.2/swig/CMakeLists.txt.orig 2012-05-04 15:47:18.000000000 +0200 ++++ cmpi-bindings-0.5.2/swig/CMakeLists.txt 2012-05-07 09:59:33.639648918 +0200 +@@ -4,12 +4,12 @@ enable_testing() @@ -9,16 +9,18 @@ diff -up cmpi-bindings-0.4.17/swig/CMakeLists.txt.orig cmpi-bindings-0.4.17/swig -IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) - MESSAGE(STATUS "Building Ruby...") - ADD_SUBDIRECTORY(ruby) +- OPTION( BUILD_RUBY_GEM "Build Ruby GEM" YES ) -ENDIF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) +#FIND_PACKAGE(Ruby) +#IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) +# MESSAGE(STATUS "Building Ruby...") +# ADD_SUBDIRECTORY(ruby) ++# OPTION( BUILD_RUBY_GEM "Build Ruby GEM" YES ) +#ENDIF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) FIND_PACKAGE(PythonLibs) IF (PYTHON_LIBRARY) -@@ -21,9 +21,9 @@ IF (PYTHON_LIBRARY) +@@ -22,9 +22,9 @@ IF (PYTHON_LIBRARY) ENDIF (PYTHON_LINK_LIBS) ENDIF (PYTHON_LIBRARY) diff --git a/cmpi-bindings.spec b/cmpi-bindings.spec index 7cd1541..9fd0db5 100644 --- a/cmpi-bindings.spec +++ b/cmpi-bindings.spec @@ -1,6 +1,6 @@ Name: cmpi-bindings -Version: 0.4.17 -Release: 2%{?dist} +Version: 0.5.2 +Release: 1%{?dist} Summary: Adapter to write and run CMPI-type CIM providers Group: Development/Libraries @@ -8,8 +8,9 @@ License: BSD URL: http://github.com/kkaempf/cmpi-bindings # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# git clone https://github.com/kkaempf/cmpi-bindings.git cmpi-bindings-0.4.17 -# tar -cJvf cmpi-bindings-0.4.17.tar.xz cmpi-bindings-0.4.17 +# git clone https://github.com/kkaempf/cmpi-bindings.git +# cd cmpi-bindings +# git archive --prefix=cmpi-bindings-%{version}/ v%{version} | bzip2 >cmpi-bindings-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2 #Patch0: don't build ruby and perl bingings @@ -39,6 +40,7 @@ CMPI-compliant provider interface for Python %setup -q %patch0 -p1 %patch1 -p1 + # change hardcoded path from /usr/lib/pycim/ to something better sed -i 's@/usr/lib/pycim/@'`echo %{python_sitelib}/pycim/`'@' swig/python/cmpi_pywbem_bindings.py # let user know where the providers have to be placed @@ -90,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 7 2012 Jan Safranek - 0.5.2 +- Update to 0.5.2 + * Thu Mar 08 2012 Vitezslav Crhonek - 0.4.17-2 - Create and own "pycim" directory - Add documentation and create README.Fedora diff --git a/cmpi-bindings2.spec b/cmpi-bindings2.spec new file mode 100644 index 0000000..7c4ed5f --- /dev/null +++ b/cmpi-bindings2.spec @@ -0,0 +1,103 @@ +Name: cmpi-bindings +Version: 0.5.2 +Release: 1%{?dist} +Summary: Adapter to write and run CMPI-type CIM providers + +Group: Development/Libraries +License: BSD +URL: http://github.com/kkaempf/cmpi-bindings +# The source for this package was pulled from upstream's vcs. Use the +# following commands to generate the tarball: +# git clone https://github.com/kkaempf/cmpi-bindings.git +# cd cmpi-bindings +# git archive --prefix=cmpi-bindings-%{version} v%{version} | bzip2 >cmpi-bindings-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 + +#Patch0: don't build ruby and perl bingings +Patch0: cmpi-bindings-0.4.17-no-ruby-perl.patch +#Patch1: removes workaround no longer needed +Patch1: cmpi-bindings-0.4.17-sblim-sigsegv.patch + +BuildRequires: cmake gcc-c++ swig >= 1.3.34 +BuildRequires: curl-devel pkgconfig sed +BuildRequires: sblim-cmpi-devel +BuildRequires: python2-devel + +%description +CMPI-compliant provider interface for various languages via SWIG + + +%package -n cmpi-bindings-pywbem +Summary: Adapter to write and run CMPI-type CIM providers in Python +Group: Development/Languages +Requires: pywbem + +%description -n cmpi-bindings-pywbem +CMPI-compliant provider interface for Python + + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 + +# change hardcoded path from /usr/lib/pycim/ to something better +sed -i 's@/usr/lib/pycim/@'`echo %{python_sitelib}/pycim/`'@' swig/python/cmpi_pywbem_bindings.py +# let user know where the providers have to be placed +cat > README.Fedora << EOS +Python provider interface expects the providers to be placed in: +%{python_sitelib}/pycim/ + +You can customize the path - edit line 428 in: +%{python_sitelib}/cmpi_pywbem_bindings.py +EOS + + +%build +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX=%_prefix \ + -DLIB=%{_lib} \ + -DCMAKE_VERBOSE_MAKEFILE=TRUE \ + -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=1 \ + .. +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +cd build +mkdir -p $RPM_BUILD_ROOT%{_datadir}/cmpi +make install DESTDIR=$RPM_BUILD_ROOT +# create directory for providers +mkdir -p $RPM_BUILD_ROOT%{python_sitelib}/pycim/ + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files -n cmpi-bindings-pywbem +%defattr(-,root,root,-) +%doc README ANNOUNCE COPYING LICENSE.BSD README.Fedora +%dir %{_libdir}/cmpi +%{_libdir}/cmpi/libpyCmpiProvider.so +%dir %{_datadir}/cmpi +%{python_sitelib}/cmpi_pywbem_bindings.py* +%{python_sitelib}/cmpi.py* +%dir %{python_sitelib}/pycim/ + + +%changelog +* Mon May 7 2012 Jan Safranek - 0.5.2 +- Update to 0.5.2 + +* Thu Mar 08 2012 Vitezslav Crhonek - 0.4.17-2 +- Create and own "pycim" directory +- Add documentation and create README.Fedora + +* Thu Mar 01 2012 Vitezslav Crhonek - 0.4.17-1 +- Initial support (ruby and perl bindings are disabled) diff --git a/sources b/sources index 532159f..9bb8e18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55020060b49225cce6fc651aec8e524f cmpi-bindings-0.4.17.tar.bz2 +3f09811353c74e4b71b89aa1af711189 cmpi-bindings-0.5.2.tar.bz2