- up to 0.1.15

diff --git a/libcomps-build.patch b/libcomps-build.patch
index efd4e339a4c00f96976f892618b34021566267e9..df999930a8f51340f51a023888487d63bb953e45 100644 (file)
--- a/libcomps-build.patch
+++ b/libcomps-build.patch
@@ -1,5 +1,6 @@
---- libcomps-libcomps-0.1.8/libcomps/src/python/docs/CMakeLists.txt~   2016-09-06 15:17:11.000000000 +0200
-+++ libcomps-libcomps-0.1.8/libcomps/src/python/docs/CMakeLists.txt    2016-12-31 00:31:06.264169589 +0100
+diff -urNp -x '*.orig' libcomps-libcomps-0.1.11.org/libcomps/src/python/docs/CMakeLists.txt libcomps-libcomps-0.1.11/libcomps/src/python/docs/CMakeLists.txt
+--- libcomps-libcomps-0.1.11.org/libcomps/src/python/docs/CMakeLists.txt       2019-03-11 08:09:27.000000000 +0100
++++ libcomps-libcomps-0.1.11/libcomps/src/python/docs/CMakeLists.txt   2021-03-07 23:12:47.572339850 +0100
 @@ -24,7 +24,6 @@ add_custom_target(pydocs)
  add_dependencies(pydocs pycomps)
  

diff --git a/libcomps.spec b/libcomps.spec
index 8f1f71f5696bf10487fa87228e05b9fe530807fa..c2dbdcea368b924425594ffb43bc112c9b7aa287 100644 (file)
--- a/libcomps.spec
+++ b/libcomps.spec
@@ -11,16 +11,15 @@
 Summary:       Comps XML file manipulation library
 Summary(pl.UTF-8):     Biblioteka operacji na plikach Comps XML
 Name:          libcomps
-Version:       0.1.11
+Version:       0.1.15
 Release:       1
 License:       GPL v2+
 Group:         Libraries
 #Source0Download: https://github.com/rpm-software-management/libcomps/releases
 Source0:       https://github.com/rpm-software-management/libcomps/archive/%{name}-%{version}.tar.gz
-# Source0-md5: e63cf17441e1c7e167405e364fd52fdd
+# Source0-md5: 5e899d213a28496f3b37236b47293bdf
 Patch0:                %{name}-build.patch
 Patch1:                python-install-dir.patch
-Patch2:                python-3.8.patch
 URL:           https://github.com/rpm-software-management/libcomps
 BuildRequires: check-devel
 BuildRequires: cmake >= 2.6
@@ -92,12 +91,12 @@ Wiązania Pythona 3.x do biblioteki libcomps.
 %setup -qn %{name}-%{name}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 install -d build
 cd build
 %cmake ../libcomps \
+       -DENABLE_TESTS:BOOL=NO \
        -DPYTHON_DESIRED:STRING=2 \
        -DPYTHON_INSTALL_DIR="%{py_sitedir}" \
        -DSPHINX_EXECUTABLE=/usr/bin/sphinx-build-2 \
@@ -113,6 +112,7 @@ cd ..
 install -d build-py3
 cd build-py3
 %cmake ../libcomps \
+       -DENABLE_TESTS:BOOL=NO \
        -DPYTHON_DESIRED:STRING=3 \
        -DPYTHON_INSTALL_DIR="%{py3_sitedir}" \
        -DSPHINX_EXECUTABLE=/usr/bin/sphinx-build-3 \
@@ -165,7 +165,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README.md COPYING
-%attr(755,root,root) %{_libdir}/libcomps.so.0.1.11
+%attr(755,root,root) %{_libdir}/libcomps.so.0
 
 %files devel
 %defattr(644,root,root,755)
@@ -181,6 +181,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py_sitedir}/libcomps
 %{py_sitedir}/libcomps/__init__.py[co]
 %attr(755,root,root) %{py_sitedir}/libcomps/_libpycomps.so
+%{py_sitedir}/libcomps-*-py*.egg-info
 %endif
 
 %if %{with python3}
@@ -191,4 +192,5 @@ rm -rf $RPM_BUILD_ROOT
 %{py3_sitedir}/libcomps/__init__.py
 %attr(755,root,root) %{py3_sitedir}/libcomps/_libpycomps.so
 %{py3_sitedir}/libcomps/__pycache__
+%{py3_sitedir}/libcomps-*-py*.egg-info
 %endif

diff --git a/python-3.8.patch b/python-3.8.patch
deleted file mode 100644 (file)
index 2b7b58d..0000000
--- a/python-3.8.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/python-install-dir.patch b/python-install-dir.patch
index 449844c73c2f7c62c2355ab1e86216a87c70d9b5..b1bd0be5687ff9cc241e0e546cf9bdba5e02c912 100644 (file)
--- a/python-install-dir.patch
+++ b/python-install-dir.patch
@@ -1,22 +1,11 @@
-diff -dur -x '*~' libcomps-libcomps-0.1.6.orig/libcomps/src/python/src/python2/CMakeLists.txt libcomps-libcomps-0.1.6/libcomps/src/python/src/python2/CMakeLists.txt
---- libcomps-libcomps-0.1.6.orig/libcomps/src/python/src/python2/CMakeLists.txt        2014-01-29 12:10:07.000000000 +0100
-+++ libcomps-libcomps-0.1.6/libcomps/src/python/src/python2/CMakeLists.txt     2015-11-30 18:24:47.545310413 +0100
-@@ -1,7 +1,6 @@
- find_package (PythonLibs 2.7)
- find_package (PythonInterp 2.7 REQUIRED)
- 
--execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
- 
- include_directories(${PYTHON_INCLUDE_PATH})
- include_directories(${LIBCOMPS_INCLUDE_PATH})
-diff -dur -x '*~' libcomps-libcomps-0.1.6.orig/libcomps/src/python/src/python3/CMakeLists.txt libcomps-libcomps-0.1.6/libcomps/src/python/src/python3/CMakeLists.txt
---- libcomps-libcomps-0.1.6.orig/libcomps/src/python/src/python3/CMakeLists.txt        2014-01-29 12:10:07.000000000 +0100
-+++ libcomps-libcomps-0.1.6/libcomps/src/python/src/python3/CMakeLists.txt     2015-11-30 18:24:37.748571365 +0100
-@@ -1,7 +1,6 @@
- find_package (PythonLibs 3.0)
- find_package (PythonInterp 3.0)
- 
--execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
- 
- include_directories(${PYTHON_INCLUDE_PATH})
- include_directories(${LIBCOMPS_INCLUDE_PATH})
+--- libcomps-libcomps-0.1.15/libcomps/src/python/src/CMakeLists.txt~   2020-03-31 11:39:29.000000000 +0200
++++ libcomps-libcomps-0.1.15/libcomps/src/python/src/CMakeLists.txt    2021-03-11 22:02:58.111049060 +0100
+@@ -115,8 +115,6 @@
+     INSTALL(FILES libcomps/__init__.py DESTINATION libcomps/src/python/src/libcomps)
+     INSTALL(TARGETS pycomps LIBRARY DESTINATION libcomps/src/python/src/libcomps)
+ ELSE ()
+-    EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
+-
+     INSTALL(FILES ${pycomps_SRCDIR}/libcomps/__init__.py DESTINATION ${PYTHON_INSTALL_DIR}/libcomps)
+     #INSTALL(FILES ${pycomps_SRCDIR}/tests/__test.py DESTINATION
+     #              ${PYTHON_INSTALL_DIR}/libcomps/)