From b8c0becc6f6e2d05498c74684d330abb98e07707 Mon Sep 17 00:00:00 2001
From: Pavla Kratochvilova <pkratoch@redhat.com>
Date: Tue, 12 Mar 2019 10:16:02 +0100
Subject: [PATCH] Update to 0.1.11

---
 libcomps.spec | 64 +++++++++++++++++++++++++++++++++++++++------------
 sources       |  2 +-
 2 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/libcomps.spec b/libcomps.spec
index f31c839..ec2c703 100644
--- a/libcomps.spec
+++ b/libcomps.spec
@@ -1,3 +1,4 @@
+# Do not build python3 bindings for RHEL <= 7
 %if 0%{?rhel} && 0%{?rhel} <= 7
 %bcond_with python3
 %else
@@ -12,8 +13,8 @@
 %endif
 
 Name:           libcomps
-Version:        0.1.10
-Release:        2%{?dist}
+Version:        0.1.11
+Release:        1%{?dist}
 Summary:        Comps XML file manipulation library
 
 License:        GPLv2+
@@ -26,6 +27,7 @@ BuildRequires:  gcc
 BuildRequires:  libxml2-devel
 BuildRequires:  check-devel
 BuildRequires:  expat-devel
+BuildRequires:  zlib-devel
 
 %description
 Libcomps is library for structure-like manipulation with content of
@@ -51,7 +53,16 @@ Documentation files for libcomps library.
 Summary:        Documentation files for python bindings libcomps library
 Requires:       %{name} = %{version}-%{release}
 BuildArch:      noarch
+%if %{with python3}
 BuildRequires:  python3-sphinx
+%endif
+%if %{with python2}
+%if 0%{?rhel} && 0%{?rhel} <= 7
+BuildRequires:  python-sphinx
+%else
+BuildRequires:  python2-sphinx
+%endif
+%endif
 
 %description -n python-%{name}-doc
 Documentation files for python bindings libcomps library.
@@ -82,15 +93,17 @@ Python3 bindings for libcomps library.
 %prep
 %autosetup -n %{name}-%{name}-%{version}
 
-mkdir build
-
+%if %{with python2}
+mkdir build-py2
+%endif
 %if %{with python3}
 mkdir build-py3
 %endif
+mkdir build-doc
 
 %build
 %if %{with python2}
-pushd build
+pushd build-py2
   %cmake ../libcomps/ -DPYTHON_DESIRED:STRING=2
   %make_build
 popd
@@ -100,14 +113,24 @@ popd
 pushd build-py3
   %cmake ../libcomps/ -DPYTHON_DESIRED:STRING=3
   %make_build
-  make %{?_smp_mflags} docs
-  make %{?_smp_mflags} pydocs
 popd
 %endif
 
+pushd build-doc
+%if %{with python2}
+  %cmake ../libcomps/ -DPYTHON_DESIRED:STRING=2
+%else
+%if %{with python3}
+  %cmake ../libcomps/ -DPYTHON_DESIRED:STRING=3
+%endif
+%endif
+  make %{?_smp_mflags} docs
+  make %{?_smp_mflags} pydocs
+popd
+
 %install
 %if %{with python2}
-pushd build
+pushd build-py2
   %make_install
 popd
 %endif
@@ -120,17 +143,25 @@ popd
 
 %check
 %if %{with python2}
-pushd build
+pushd build-py2
   make test
-popd
-%endif
-%if %{with python3}
-pushd build-py3
   make pytest
 popd
 %endif
 
+%if %{with python3}
+pushd build-py3
+  make test
+  make pytest
+popd
+%endif
+
+%if %{undefined ldconfig_scriptlets}
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+%else
 %ldconfig_scriptlets
+%endif
 
 %files
 %license COPYING
@@ -142,10 +173,10 @@ popd
 %{_includedir}/%{name}/
 
 %files doc
-%doc build-py3/docs/libcomps-doc/html
+%doc build-doc/docs/libcomps-doc/html
 
 %files -n python-%{name}-doc
-%doc build-py3/src/python/docs/html
+%doc build-doc/src/python/docs/html
 
 %if %{with python2}
 %files -n python2-%{name}
@@ -158,6 +189,9 @@ popd
 %endif
 
 %changelog
+* Mon Mar 11 2019 Pavla Kratochvilova <pkratoch@redhat.com> - 0.1.11-1
+- Update to 0.1.11
+
 * Wed Feb 13 2019 Pavla Kratochvilova <pkratoch@redhat.com> - 0.1.10-1
 - Update to 0.1.10
 
diff --git a/sources b/sources
index ee849f5..85da3ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libcomps-0.1.10.tar.gz) = 063bfc01dfee03ab1c48fef1293b4d95d3b7f8d05ee44c3285d72ed47a7e3d176bee94c7d6b9b9f5a7c209db969cafaaf9dd8a2f01426d27d33e3b161910cc3a
+SHA512 (libcomps-0.1.11.tar.gz) = eeb1749b48be4497f85bc2296d919b25ca59bb3dfe97fe84abfd5ef49b66d29946b08e3d1f560bf843d9d2aed17f878132caee55e4949a37af82cc8a92e5e99a