Accepting request 680499 from home:M0ses:branches:system:packagemanager

- Added upstream patches * 0001-Find-correct-nosetests-version-even-when-which-comma.patch * 0002-fix-linking-when-Wl-no-undefined-is-set.patch - Disable drpm support - Update to version 0.12.1: * Release 0.12.1 * For make test, xz and zchunk (not just *-devel) are required. * Make cmake variable PYTHON_EXECUTABLE global * Add zchunk support already to Fedora 29 * [spec] Fix spec to work for epel 7 * Add CMake support for python interpreter path * Add space after if statement * Fix misc test * Add missing sentinal * Add zchunk support to mergerepo_c for extra files - Backport fixes from upstream * 0001-zck_end_chunk-returns-number-of-bytes-written-or-1-f.patch * 0002-Add-missing-sentinal.patch * 0003-Fix-misc-test.patch - Update to 0.12.0 + Add basic support for zchunk metadata + Add support for building wheels to upload to PyPI - Drop Python 2 subpackage - Enable drpm support - Enable zchunk for openSUSE Leap 15.1+ and Tumbleweed - Adjust changes entries to use full author identities - Update to 0.11.1 + Add support for RPMs with large files + Identify Requires(missingok) as Recommends correctly + Enable legacy tags by default + Fix missing packages in mergerepo_c with multiple VR of same name + Add mergerepo_c --repo-prefix-search and --repo-prefix-replace + Build against Python 3 by default for bindings - Drop snapshot source service and snapshot tarball - Use license macro for license file - Drop trailing whitespace - Fix comment about drpm support - [boo#1125044] fix for huge rpm packages - fix spelling of old weakdeps feature switch (bsc#1088328) - [bnc#1075670] changed to provide createrepo as update-alternative because createrepo_c will replace createrepo because of switch to python3 - also provide createrepo-implementation - Disable tests on SLE12 due to the python-nose requirements - Switch to singlespec buidling of python bindings - Make sure to use cmake macros to have it easier to gork what is happending by overriding %__builddir - Sort out with spec-cleaner - Fix embedding of date and time to documentation - Enable Python bindings for openSUSE Leap. - Enable Python bindings for openSUSE Tumbleweed. - Updated upstream sources - Removed patch 000-Ensure_that_provides-requires_versions_are_factored_into_dep_filtering.diff (upstream included equal patch) - Added missing copyright statements - Fixed license tag and other misc cleanups - updated upstream sources - Added patch 000-Ensure_that_provides-requires_versions_are_factored_into_dep_filtering.diff - Run fdupes to eliminate duplicate .js files - Disable Python 3 bindings for SLE - Update to 0.10.0, add Python 3 bindings - Initial package based on Mageia package OBS-URL: https://build.opensuse.org/request/show/680499 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/createrepo_c?expand=0&rev=33
2019-03-01 13:39:56 +00:00 · 2019-03-01 13:39:56 +00:00 · c0616a9433
commit c0616a9433
parent 0ab09a191c
11 changed files with 96 additions and 100 deletions
--- a/0001-Find-correct-nosetests-version-even-when-which-comma.patch
+++ b/0001-Find-correct-nosetests-version-even-when-which-comma.patch
@ -0,0 +1,26 @@
+From 91637830c366b18c59d2576967e00b2a624e19f5 Mon Sep 17 00:00:00 2001
+From: Jan Pazdziora <jpazdziora@redhat.com>
+Date: Mon, 11 Feb 2019 16:16:39 +0100
+Subject: [PATCH] Find correct nosetests version even when which command is not
+ available.
+
+---
+ tests/python/tests/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/python/tests/CMakeLists.txt b/tests/python/tests/CMakeLists.txt
+index e9aab05..3c1fdb7 100644
+--- a/tests/python/tests/CMakeLists.txt
+++ b/tests/python/tests/CMakeLists.txt
+@@ -3,7 +3,7 @@ EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write('%
+ SET(NOSETEST_VERSION_SUFFIX "-${PYTHON_MAJOR_DOT_MINOR_VERSION}")
+ message("-- nosetests program is nosetests${NOSETEST_VERSION_SUFFIX}")
+ 
+-execute_process(COMMAND which nosetests${NOSETEST_VERSION_SUFFIX}
+execute_process(COMMAND nosetests${NOSETEST_VERSION_SUFFIX} --help
+                 OUTPUT_QUIET ERROR_QUIET
+                 RESULT_VARIABLE NOSE_CHECK_RESULT)
+ IF (NOT NOSE_CHECK_RESULT STREQUAL "0")
+-- 
+2.20.1
+
--- a/0001-zck_end_chunk-returns-number-of-bytes-written-or-1-f.patch
+++ b/0001-zck_end_chunk-returns-number-of-bytes-written-or-1-f.patch
@ -1,27 +0,0 @@
-From 19af36bcd4984359509deb95e2df83449ce471f6 Mon Sep 17 00:00:00 2001
-From: Jonathan Dieter <jdieter@gmail.com>
-Date: Sun, 6 Jan 2019 19:21:04 +0000
-Subject: [PATCH 1/3] zck_end_chunk returns number of bytes written or -1 for
- error
-
-Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---
- src/compression_wrapper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/compression_wrapper.c b/src/compression_wrapper.c
-index 43f213c..e5b58d2 100644
--- a/src/compression_wrapper.c
-+++ b/src/compression_wrapper.c
-@@ -880,7 +880,7 @@ cr_close(CR_FILE *cr_file, GError **err)
-             zckCtx *zck = (zckCtx *) cr_file->FILE;
-             ret = CRE_OK;
-             if (cr_file->mode == CR_CW_MODE_WRITE) {
-                if(!zck_end_chunk(zck)) {
-+                if(zck_end_chunk(zck) < 0) {
-                     ret = CRE_ZCK;
-                     g_set_error(err, ERR_DOMAIN, CRE_ZCK,
-                         "Unable to end final chunk: %s", zck_get_error(zck));
-- 
-2.20.1
-
--- a/0002-Add-missing-sentinal.patch
+++ b/0002-Add-missing-sentinal.patch
@ -1,26 +0,0 @@
-From 2eb66187dd8ab5840b4c82c18e817d04caa258ca Mon Sep 17 00:00:00 2001
-From: Jonathan Dieter <jdieter@gmail.com>
-Date: Tue, 15 Jan 2019 23:23:47 +0000
-Subject: [PATCH 2/3] Add missing sentinal
-
-Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---
- src/misc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/misc.c b/src/misc.c
-index ec8667b..288b0eb 100644
--- a/src/misc.c
-+++ b/src/misc.c
-@@ -1519,7 +1519,7 @@ cr_get_dict_file(const gchar *dir, const gchar *file)
-     assert(dict_file);
- 
-     snprintf(dict_file, strlen(file) + 7, "%s.zdict", file);
-    gchar *full_path = g_build_path("/", dir, dict_file);
-+    gchar *full_path = g_build_path("/", dir, dict_file, NULL);
-     assert(full_path);
- 
-     free(dict_file);
-- 
-2.20.1
-
--- a/0002-fix-linking-when-Wl-no-undefined-is-set.patch
+++ b/0002-fix-linking-when-Wl-no-undefined-is-set.patch
@ -0,0 +1,25 @@
+From 0f29df0f2e974e28fcb45668d6a8af267b4d40ff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
+Date: Fri, 22 Feb 2019 09:49:15 +0100
+Subject: [PATCH] fix linking when -Wl,--no-undefined is set
+
+---
+ src/python/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
+index 14b6e9c..dbd9330 100644
+--- a/src/python/CMakeLists.txt
+++ b/src/python/CMakeLists.txt
+@@ -14,7 +14,7 @@ if (NOT SKBUILD)
+         FIND_PACKAGE(PythonInterp 2 EXACT REQUIRED)
+     elseif (${PYTHON_DESIRED} STREQUAL "3")
+         PYTHON_UNSET()
+-        SET(Python_ADDITIONAL_VERSIONS 3 CACHE INTERNAL "")
+        SET(Python_ADDITIONAL_VERSIONS 3.0 CACHE INTERNAL "")
+         FIND_PACKAGE(PythonLibs 3 EXACT)
+         FIND_PACKAGE(PythonInterp 3 EXACT REQUIRED)
+     elseif (EXISTS ${PYTHON_DESIRED})
+-- 
+2.20.1
+
--- a/0003-Fix-misc-test.patch
+++ b/0003-Fix-misc-test.patch
@ -1,40 +0,0 @@
-From ccd8f0ec32b9ca82a727b35fcc8724ea6f6d3556 Mon Sep 17 00:00:00 2001
-From: Jonathan Dieter <jdieter@gmail.com>
-Date: Tue, 15 Jan 2019 23:23:58 +0000
-Subject: [PATCH 3/3] Fix misc test
-
-Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---
- tests/test_misc.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/tests/test_misc.c b/tests/test_misc.c
-index 9d528c7..06144a6 100644
--- a/tests/test_misc.c
-+++ b/tests/test_misc.c
-@@ -531,8 +531,8 @@ compressfile_test_text_file(Copyfiletest *copyfiletest,
-     GError *tmp_err = NULL;
- 
-     g_assert(!g_file_test(copyfiletest->dst_file, G_FILE_TEST_EXISTS));
-    ret = cr_compress_file(TEST_TEXT_FILE, copyfiletest->dst_file,
-                           CR_CW_GZ_COMPRESSION, &tmp_err);
-+    ret = cr_compress_file(TEST_TEXT_FILE, &(copyfiletest->dst_file),
-+                           CR_CW_GZ_COMPRESSION, NULL, FALSE, &tmp_err);
-     g_assert(!tmp_err);
-     g_assert_cmpint(ret, ==, CRE_OK);
-     g_assert(g_file_test(copyfiletest->dst_file, G_FILE_TEST_IS_REGULAR));
-@@ -556,8 +556,9 @@ compressfile_with_stat_test_text_file(Copyfiletest *copyfiletest,
-     g_assert(!tmp_err);
- 
-     g_assert(!g_file_test(copyfiletest->dst_file, G_FILE_TEST_EXISTS));
-    ret = cr_compress_file_with_stat(TEST_TEXT_FILE, copyfiletest->dst_file,
-                                     CR_CW_GZ_COMPRESSION, stat, &tmp_err);
-+    ret = cr_compress_file_with_stat(TEST_TEXT_FILE, &copyfiletest->dst_file,
-+                                     CR_CW_GZ_COMPRESSION, stat, NULL, FALSE,
-+                                     &tmp_err);
-     g_assert(!tmp_err);
-     g_assert_cmpint(ret, ==, CRE_OK);
-     g_assert(g_file_test(copyfiletest->dst_file, G_FILE_TEST_IS_REGULAR));
-- 
-2.20.1
-
--- a/16
+++ b/16
@ -0,0 +1,16 @@
+<services>
+  <service name="tar_scm" mode="disabled">
+    <param name="url">git://github.com/rpm-software-management/createrepo_c.git</param>
+    <param name="scm">git</param>
+    <param name="exclude">.git</param>
+    <param name="revision">0.12.1</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="changesgenerate">enable</param>
+  </service>
+  <service name="recompress" mode="disabled">
+    <param name="file">*.tar</param>
+    <param name="compression">gz</param>
+  </service>
+  <service name="set_version" mode="disabled"/>
+</services>
+
--- a/4
+++ b/4
@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">git://github.com/rpm-software-management/createrepo_c.git</param>
+              <param name="changesrevision">7744554ddef7c5be2cd7fbcac49c8b24ce60ef88</param></service></servicedata>
--- a/createrepo_c-0.12.0.tar.gz
+++ b/createrepo_c-0.12.0.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c55334e6e8f41c4c9c527ffe3d55dc8e08815f3f06c6972ee7e99306a3b8219e
-size 363013
--- a/createrepo_c-0.12.1.tar.gz
+++ b/createrepo_c-0.12.1.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28f5b47f558f3ebdddc98a93aa634ea097a44659c9d3d96fa8d88bf391372bf8
+size 374660
--- a/createrepo_c.changes
+++ b/createrepo_c.changes
@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Mar 01 09:37:11 UTC 2019 - FSchreiner@suse.com
+- Added upstream patches
+  * 0001-Find-correct-nosetests-version-even-when-which-comma.patch
+  * 0002-fix-linking-when-Wl-no-undefined-is-set.patch
+- Disable drpm support
+- Update to version 0.12.1:
+  * Release 0.12.1
+  * For make test, xz and zchunk (not just *-devel) are required.
+  * Make cmake variable PYTHON_EXECUTABLE global
+  * Add zchunk support already to Fedora 29
+  * [spec] Fix spec to work for epel 7
+  * Add CMake support for python interpreter path
+  * Add space after if statement
+  * Fix misc test
+  * Add missing sentinal
+  * Add zchunk support to mergerepo_c for extra files
+
 -------------------------------------------------------------------
 Mon Feb  4 12:09:27 UTC 2019 - Neal Gompa <ngompa13@gmail.com>

@ -31,6 +49,7 @@ Wed Aug  1 12:06:35 UTC 2018 - Neal Gompa <ngompa13@gmail.com>
 - Use license macro for license file
 - Drop trailing whitespace
 - Fix comment about drpm support
+- [boo#1125044] fix for huge rpm packages

 -------------------------------------------------------------------
 Thu Apr  5 15:50:28 UTC 2018 - Adrian Schröter <adrian@suse.de>
--- a/createrepo_c.spec
+++ b/createrepo_c.spec
@ -45,7 +45,7 @@
 %define devname lib%{name}-devel

 Name:           createrepo_c
-Version:        0.12.0
+Version:        0.12.1
 Release:        0
 Summary:        Creates a common metadata repository
 License:        GPL-2.0-or-later
@ -54,9 +54,8 @@ URL:            https://github.com/rpm-software-management/createrepo_c
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz

 # Backports from upstream
-Patch0001:      0001-zck_end_chunk-returns-number-of-bytes-written-or-1-f.patch
-Patch0002:      0002-Add-missing-sentinal.patch
-Patch0003:      0003-Fix-misc-test.patch
+Patch0001:      0001-Find-correct-nosetests-version-even-when-which-comma.patch
+Patch0002:      0002-fix-linking-when-Wl-no-undefined-is-set.patch

 %if %{with python3}
 BuildRequires:  python3-devel