[konkretcmpi] Update to version 0.9.0

Radek Novacek rnovacek at fedoraproject.org
Fri Mar 8 10:20:50 UTC 2013


commit 358f56fc11ead103205e77aac202ec54ba4b5842
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Fri Mar 8 11:20:45 2013 +0100

    Update to version 0.9.0
    
    - Drop upstreamed patches
    - Use CMake build system
    - Include FindCMPI.cmake and FindKonkretCMPI.cmake cmake modules
    - Add python subpackage

 .gitignore                                         |    2 +-
 konkretcmpi-0.8.7-fix-array-count-property.patch   |   16 -
 konkretcmpi-0.8.7-fix-assert.patch                 |   21 -
 konkretcmpi-0.8.7-fix-for-current-schema.patch     |   20 -
 ...mpi-0.8.7-fix-registration-from-optimized.patch |   12 -
 konkretcmpi-0.8.7-fix-same-enum-values.patch       |   59 --
 ...cmpi-0.8.7-fix-warnings-in-generated-code.patch |   23 -
 konkretcmpi-0.8.7-shared-lib.patch                 |  571 --------------------
 konkretcmpi-0.8.7-unistd.patch                     |   11 -
 konkretcmpi.spec                                   |   74 ++--
 sources                                            |    2 +-
 11 files changed, 40 insertions(+), 771 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0fabf42..8bbd777 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/konkretcmpi-0.8.7.tar.gz
+/konkretcmpi-0.9.0.tar.gz
diff --git a/konkretcmpi.spec b/konkretcmpi.spec
index 5347763..07aa9d9 100644
--- a/konkretcmpi.spec
+++ b/konkretcmpi.spec
@@ -1,31 +1,15 @@
 Name:           konkretcmpi
-Version:        0.8.7
-Release:        9%{?dist}
+Version:        0.9.0
+Release:        1%{?dist}
 Summary:        Tool for rapid CMPI providers development
 
 License:        MIT
-URL:            http://konkretcmpi.org/
-Source0:        http://konkretcmpi.org/konkretcmpi-0.8.7.tar.gz
-
-# Include unistd.h to prevent usage of undefined functions
-Patch0:         konkretcmpi-0.8.7-unistd.patch
-# Prevent assertion in generated code
-Patch1:         konkretcmpi-0.8.7-fix-assert.patch
-# Create library as shared instead of static
-Patch2:         konkretcmpi-0.8.7-shared-lib.patch
-# Disable check in MOF that fails with current (experimental) cim-schema
-Patch3:         konkretcmpi-0.8.7-fix-for-current-schema.patch
-# Schema sometimes has same Value for more keys in ValueMap
-Patch4:         konkretcmpi-0.8.7-fix-same-enum-values.patch
-# Optimization can eat KONKRET_REGISTRATION from the library sometimes,
-# use volatile to avoid it
-Patch5:         konkretcmpi-0.8.7-fix-registration-from-optimized.patch
-# Fix KArray count property
-Patch6:         konkretcmpi-0.8.7-fix-array-count-property.patch
-# Fix warnings in generated code
-Patch7:         konkretcmpi-0.8.7-fix-warnings-in-generated-code.patch
+Source0:        https://github.com/rnovacek/%{name}/archive/%{name}-%{version}.tar.gz
 
 BuildRequires:  sblim-cmpi-devel
+BuildRequires:  cmake
+BuildRequires:  python2-devel
+BuildRequires:  swig
 
 
 %description
@@ -40,25 +24,29 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 %description devel
 This package provides required files for development using konkretcmpi.
 
+%package python
+Summary:        Python bindings for konkretcmpi
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       python2
+
+%description python
+This package contains python binding for konkretcmpi.
+
+
 %prep
 %setup -q
-%patch0 -p1 -b .unistd
-%patch1 -p1 -b .fix-assert
-%patch2 -p1 -b .shared-lib
-%patch3 -p1 -b .fix-for-current-schema
-%patch4 -p1 -b .fix-same-enum-values
-%patch5 -p1 -b .fix-registration-from-optimized
-%patch6 -p1
-%patch7 -p1 -b .fix-warnings-in-generated-code
 
 %build
-%configure --enable-static=no
-make %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} -DWITH_PYTHON=ON ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 # Don't package .la object
 rm -rf $RPM_BUILD_ROOT/usr/lib*/libkonkret.la
@@ -70,15 +58,29 @@ rm -rf $RPM_BUILD_ROOT/usr/lib*/libkonkret.la
 %doc README COPYING
 %{_bindir}/konkret
 %{_bindir}/konkretreg
-%{_libdir}/libkonkret.so.0
-%{_libdir}/libkonkret.so.0.0.0
+%{_libdir}/libkonkret.so.0.0.1
+%{_libdir}/libkonkretmof.so.0.0.1
 
 %files devel
+%{_datadir}/cmake/Modules/FindCMPI.cmake
+%{_datadir}/cmake/Modules/FindKonkretCMPI.cmake
 %{_includedir}/konkret/konkret.h
 %{_libdir}/libkonkret.so
+%{_libdir}/libkonkretmof.so
+
+%files python
+%{python_sitearch}/konkretmof.py*
+%{python_sitearch}/_konkretmof.so
 
 
 %changelog
+* Fri Mar 08 2013 Radek Novacek <rnovacek at redhat.com> 0.9.0-1
+- Update to version 0.9.0
+- Drop upstreamed patches
+- Use CMake build system
+- Include FindCMPI.cmake and FindKonkretCMPI.cmake cmake modules
+- Add python subpackage
+
 * Wed Feb 13 2013 Radek Novacek <rnovacek at redhat.com> 0.8.7-9
 - Fix warnings in generated code
 
diff --git a/sources b/sources
index 7940765..a3382be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf8a2c31ea6244823ae498b1ec2384d9  konkretcmpi-0.8.7.tar.gz
+36399f581d628b1f9b2383f0c0380a51  konkretcmpi-0.9.0.tar.gz


More information about the scm-commits mailing list