[libcomps] - release bumped
Jindrich Luza
jluza at fedoraproject.org
Thu Mar 6 10:11:14 UTC 2014
commit 27fe6f9f6981a658b2b9550c9d0a72e87606e5b9
Author: Jindrich Luza <jluza at redhat.com>
Date: Thu Mar 6 11:10:50 2014 +0100
- release bumped
.gitignore | 1 +
libcomps.spec | 41 +++++++++++++++++++++++++++++++----------
sources | 2 +-
3 files changed, 33 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 41e1d38..953787c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
/libcomps-b098d1b7dc00951490b262b533df7af2103bd4d4.tar.gz
/libcomps-01ee5eb205ab46011e4fe9d69fadaccf0d2c3ef6.tar.gz
/libcomps-c57510dda1b9db6143da38656c7e518586ca59cc.tar.gz
+/libcomps-a756363ce4a0dc7cb9395d2f57315428c22a4efb.tar.gz
diff --git a/libcomps.spec b/libcomps.spec
index b596bf3..a59b674 100644
--- a/libcomps.spec
+++ b/libcomps.spec
@@ -1,8 +1,18 @@
-%global commit c57510dda1b9db6143da38656c7e518586ca59cc
+%global commit a756363ce4a0dc7cb9395d2f57315428c22a4efb
+
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%define python3_build 0
+#%{!?__python2: %global __python2 /usr/bin/python2}
+#%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+#%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%else
+%define python3_build 1
+%endif
+
Name: libcomps
Version: 0.1.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Comps XML file manipulation library
Group: Development/Libraries
@@ -12,11 +22,11 @@ Source0: https://github.com/midnightercz/libcomps/archive/%{commit}/libco
BuildRequires: libxml2-devel
BuildRequires: check-devel
BuildRequires: expat-devel
-%if 0%{?rhel} == 6
-BuildRequires: cmake28
-%else
+#%if 0%{?rhel} == 6
+#BuildRequires: cmake28
+#%else
BuildRequires: cmake
-%endif
+#%endif
%description
Libcomps is library for structure-like manipulation with content of
@@ -59,6 +69,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n python-libcomps
Python2 bindings for libcomps library
+%if %python3_build
%package -n python3-libcomps
Summary: Python3 bindings for libcomps library
Group: Development/Libraries
@@ -67,15 +78,17 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n python3-libcomps
Python3 bindings for libcomps library
-
+%endif
%prep
%setup -qn %{name}-%{commit}
+%if %python3_build == 1
rm -rf py3
mkdir ../py3
cp -a . ../py3/
mv ../py3 ./
+%endif
%build
%cmake -DPYTHON_DESIRED:STRING=2 libcomps/
@@ -83,23 +96,30 @@ make %{?_smp_mflags}
make %{?_smp_mflags} docs
make %{?_smp_mflags} pydocs
+%if %python3_build == 1
pushd py3
%cmake -DPYTHON_DESIRED:STRING=3 libcomps/
make %{?_smp_mflags}
popd
+%endif
%check
make test
+%if %{python3_build}
pushd py3
make pytest
popd
+%endif
%install
make install DESTDIR=%{buildroot}
+
+%if %{python3_build}
pushd py3
make install DESTDIR=%{buildroot}
popd
+%endif
%clean
rm -rf $buildroot
@@ -124,12 +144,13 @@ rm -rf $buildroot
%files -n python-libcomps
%{_libdir}/python2*
-%exclude %{_libdir}/python2/libcomps/__pycache__
+#%exclude %{_libdir}/python2/libcomps/__pycache__
+%if %{python3_build}
%files -n python3-libcomps
%{_libdir}/python3*
-%exclude %{_libdir}/python3/libcomps/__pycache__
-
+#%exclude %{_libdir}/python3/libcomps/__pycache__
+%endif
%changelog
* Wed Jan 29 2014 Jindrich Luza <jluza at redhat.com> 0.1.6
diff --git a/sources b/sources
index 107cf46..330f824 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-92dc9a89efcd8401a798ee5c028fd895 libcomps-c57510dda1b9db6143da38656c7e518586ca59cc.tar.gz
+736bfe32a07fe8a8e54faab952ce72b4 libcomps-a756363ce4a0dc7cb9395d2f57315428c22a4efb.tar.gz
More information about the scm-commits
mailing list