From 5e2a5f6aafcb04494096d42681d5853e5ebcfba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
Date: Fri, 29 Nov 2019 12:22:49 +0100
Subject: [PATCH] Update to 0.1.12

---
 50.patch      | 50 --------------------------------------------------
 libcomps.spec | 11 ++++++++---
 sources       |  2 +-
 3 files changed, 9 insertions(+), 54 deletions(-)
 delete mode 100644 50.patch

diff --git a/50.patch b/50.patch
deleted file mode 100644
index 2b7b58d..0000000
--- a/50.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 45d0154a1e0bf167656d1ef4050de782452aad2c Mon Sep 17 00:00:00 2001
-From: Victor Stinner <vstinner@redhat.com>
-Date: Wed, 31 Jul 2019 15:03:36 +0200
-Subject: [PATCH] Fix Python method descriptors for Python 3.8
-
-The Python binding cannot be loaded in Python 3.8: import libcomps
-fails with:
-
-    Traceback (most recent call last):
-      File "src/python/src/python3/libcomps/__init__.py", line 1, in <module>
-        from ._libpycomps import *
-    SystemError: bad call flags
-
-Fedora bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1734777
-
-The problem are the following method descriptors of
-libcomps/src/python/src/pycomps.c:
-
-    {"categories_match", (PyCFunction)PyCOMPS_categories_match, METH_KEYWORDS,
-     PyCOMPS_validate__doc__},
-    {"environments_match", (PyCFunction)PyCOMPS_envs_match, METH_KEYWORDS,
-     PyCOMPS_validate__doc__},
-
-In Python 3.7, import didn't check descriptor flags (METH_KEYWORDS):
-these flags were only checked when the methods were called.
-
-In Python 3.8, the flags are checked at soon as the module is
-imported, which prevents the module to be imported.
-
-This change fix the two method descriptors.
----
- libcomps/src/python/src/pycomps.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libcomps/src/python/src/pycomps.c b/libcomps/src/python/src/pycomps.c
-index b34685c..293a338 100644
---- a/libcomps/src/python/src/pycomps.c
-+++ b/libcomps/src/python/src/pycomps.c
-@@ -766,9 +766,9 @@ PyDoc_STRVAR(PyCOMPS_arch_filter__doc__,
- static PyMethodDef PyCOMPS_methods[] = {
-     {"groups_match", (PyCFunction)PyCOMPS_groups_match, METH_VARARGS | METH_KEYWORDS,
-     PyCOMPS_validate__doc__},
--    {"categories_match", (PyCFunction)PyCOMPS_categories_match, METH_KEYWORDS,
-+    {"categories_match", (PyCFunction)PyCOMPS_categories_match, METH_VARARGS | METH_KEYWORDS,
-     PyCOMPS_validate__doc__},
--    {"environments_match", (PyCFunction)PyCOMPS_envs_match, METH_KEYWORDS,
-+    {"environments_match", (PyCFunction)PyCOMPS_envs_match, METH_VARARGS | METH_KEYWORDS,
-     PyCOMPS_validate__doc__},
-     {"validate", (PyCFunction)PyCOMPS_validate, METH_NOARGS,
-     PyCOMPS_validate__doc__},
diff --git a/libcomps.spec b/libcomps.spec
index f27520e..3897fb0 100644
--- a/libcomps.spec
+++ b/libcomps.spec
@@ -13,14 +13,13 @@
 %endif
 
 Name:           libcomps
-Version:        0.1.11
-Release:        5%{?dist}
+Version:        0.1.12
+Release:        1%{?dist}
 Summary:        Comps XML file manipulation library
 
 License:        GPLv2+
 URL:            https://github.com/rpm-software-management/libcomps
 Source0:        %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
-Patch1:         %{url}/pull/50.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  cmake
@@ -171,6 +170,7 @@ popd
 
 %files devel
 %{_libdir}/%{name}.so
+%{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/%{name}/
 
 %files doc
@@ -182,14 +182,19 @@ popd
 %if %{with python2}
 %files -n python2-%{name}
 %{python2_sitearch}/%{name}/
+%{python2_sitearch}/%{name}-%{version}-py%{python2_version}.egg-info
 %endif
 
 %if %{with python3}
 %files -n python3-%{name}
 %{python3_sitearch}/%{name}/
+%{python3_sitearch}/%{name}-%{version}-py%{python3_version}.egg-info
 %endif
 
 %changelog
+* Fri Nov 29 2019 Ales Matej <amatej@redhat.com> - 0.1.12-1
+- Update to 0.1.12
+
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.1.11-5
 - Rebuilt for Python 3.8.0rc1 (#1748018)
 
diff --git a/sources b/sources
index 85da3ff..bc35c68 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libcomps-0.1.11.tar.gz) = eeb1749b48be4497f85bc2296d919b25ca59bb3dfe97fe84abfd5ef49b66d29946b08e3d1f560bf843d9d2aed17f878132caee55e4949a37af82cc8a92e5e99a
+SHA512 (libcomps-0.1.12.tar.gz) = 1e13c03d6aafe9e5f69677f05c6b83153c2c2b6415a87b0f412cf956daee17821248138eb5dfeea4de8a396d29b189d8c00b35f3d9a4d0466ae15d8c41b817c5