- release bumped

This commit is contained in:
Jindrich Luza 2014-03-06 11:10:50 +01:00
parent 82f6968339
commit 27fe6f9f69
3 changed files with 33 additions and 11 deletions

1
.gitignore vendored
View File

@ -25,3 +25,4 @@
/libcomps-b098d1b7dc00951490b262b533df7af2103bd4d4.tar.gz /libcomps-b098d1b7dc00951490b262b533df7af2103bd4d4.tar.gz
/libcomps-01ee5eb205ab46011e4fe9d69fadaccf0d2c3ef6.tar.gz /libcomps-01ee5eb205ab46011e4fe9d69fadaccf0d2c3ef6.tar.gz
/libcomps-c57510dda1b9db6143da38656c7e518586ca59cc.tar.gz /libcomps-c57510dda1b9db6143da38656c7e518586ca59cc.tar.gz
/libcomps-a756363ce4a0dc7cb9395d2f57315428c22a4efb.tar.gz

View File

@ -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 Name: libcomps
Version: 0.1.6 Version: 0.1.6
Release: 3%{?dist} Release: 4%{?dist}
Summary: Comps XML file manipulation library Summary: Comps XML file manipulation library
Group: Development/Libraries Group: Development/Libraries
@ -12,11 +22,11 @@ Source0: https://github.com/midnightercz/libcomps/archive/%{commit}/libco
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: check-devel BuildRequires: check-devel
BuildRequires: expat-devel BuildRequires: expat-devel
%if 0%{?rhel} == 6 #%if 0%{?rhel} == 6
BuildRequires: cmake28 #BuildRequires: cmake28
%else #%else
BuildRequires: cmake BuildRequires: cmake
%endif #%endif
%description %description
Libcomps is library for structure-like manipulation with content of Libcomps is library for structure-like manipulation with content of
@ -59,6 +69,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n python-libcomps %description -n python-libcomps
Python2 bindings for libcomps library Python2 bindings for libcomps library
%if %python3_build
%package -n python3-libcomps %package -n python3-libcomps
Summary: Python3 bindings for libcomps library Summary: Python3 bindings for libcomps library
Group: Development/Libraries Group: Development/Libraries
@ -67,15 +78,17 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n python3-libcomps %description -n python3-libcomps
Python3 bindings for libcomps library Python3 bindings for libcomps library
%endif
%prep %prep
%setup -qn %{name}-%{commit} %setup -qn %{name}-%{commit}
%if %python3_build == 1
rm -rf py3 rm -rf py3
mkdir ../py3 mkdir ../py3
cp -a . ../py3/ cp -a . ../py3/
mv ../py3 ./ mv ../py3 ./
%endif
%build %build
%cmake -DPYTHON_DESIRED:STRING=2 libcomps/ %cmake -DPYTHON_DESIRED:STRING=2 libcomps/
@ -83,23 +96,30 @@ make %{?_smp_mflags}
make %{?_smp_mflags} docs make %{?_smp_mflags} docs
make %{?_smp_mflags} pydocs make %{?_smp_mflags} pydocs
%if %python3_build == 1
pushd py3 pushd py3
%cmake -DPYTHON_DESIRED:STRING=3 libcomps/ %cmake -DPYTHON_DESIRED:STRING=3 libcomps/
make %{?_smp_mflags} make %{?_smp_mflags}
popd popd
%endif
%check %check
make test make test
%if %{python3_build}
pushd py3 pushd py3
make pytest make pytest
popd popd
%endif
%install %install
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
%if %{python3_build}
pushd py3 pushd py3
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
popd popd
%endif
%clean %clean
rm -rf $buildroot rm -rf $buildroot
@ -124,12 +144,13 @@ rm -rf $buildroot
%files -n python-libcomps %files -n python-libcomps
%{_libdir}/python2* %{_libdir}/python2*
%exclude %{_libdir}/python2/libcomps/__pycache__ #%exclude %{_libdir}/python2/libcomps/__pycache__
%if %{python3_build}
%files -n python3-libcomps %files -n python3-libcomps
%{_libdir}/python3* %{_libdir}/python3*
%exclude %{_libdir}/python3/libcomps/__pycache__ #%exclude %{_libdir}/python3/libcomps/__pycache__
%endif
%changelog %changelog
* Wed Jan 29 2014 Jindrich Luza <jluza@redhat.com> 0.1.6 * Wed Jan 29 2014 Jindrich Luza <jluza@redhat.com> 0.1.6

View File

@ -1 +1 @@
92dc9a89efcd8401a798ee5c028fd895 libcomps-c57510dda1b9db6143da38656c7e518586ca59cc.tar.gz 736bfe32a07fe8a8e54faab952ce72b4 libcomps-a756363ce4a0dc7cb9395d2f57315428c22a4efb.tar.gz