From c0616a9433b1bbdbb6f1971dfe9cdb9b79d962b255825c6f2671167ac11c6cf3 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Fri, 1 Mar 2019 13:39:56 +0000 Subject: [PATCH 01/14] 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 --- ...etests-version-even-when-which-comma.patch | 26 ++++++++++++ ...turns-number-of-bytes-written-or-1-f.patch | 27 ------------- 0002-Add-missing-sentinal.patch | 26 ------------ ...-linking-when-Wl-no-undefined-is-set.patch | 25 ++++++++++++ 0003-Fix-misc-test.patch | 40 ------------------- _service | 16 ++++++++ _servicedata | 4 ++ createrepo_c-0.12.0.tar.gz | 3 -- createrepo_c-0.12.1.tar.gz | 3 ++ createrepo_c.changes | 19 +++++++++ createrepo_c.spec | 7 ++-- 11 files changed, 96 insertions(+), 100 deletions(-) create mode 100644 0001-Find-correct-nosetests-version-even-when-which-comma.patch delete mode 100644 0001-zck_end_chunk-returns-number-of-bytes-written-or-1-f.patch delete mode 100644 0002-Add-missing-sentinal.patch create mode 100644 0002-fix-linking-when-Wl-no-undefined-is-set.patch delete mode 100644 0003-Fix-misc-test.patch create mode 100644 _service create mode 100644 _servicedata delete mode 100644 createrepo_c-0.12.0.tar.gz create mode 100644 createrepo_c-0.12.1.tar.gz diff --git a/0001-Find-correct-nosetests-version-even-when-which-comma.patch b/0001-Find-correct-nosetests-version-even-when-which-comma.patch new file mode 100644 index 0000000..9c55552 --- /dev/null +++ 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 +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 + diff --git 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 deleted file mode 100644 index 9931fdf..0000000 --- a/0001-zck_end_chunk-returns-number-of-bytes-written-or-1-f.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 19af36bcd4984359509deb95e2df83449ce471f6 Mon Sep 17 00:00:00 2001 -From: Jonathan Dieter -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 ---- - 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 - diff --git a/0002-Add-missing-sentinal.patch b/0002-Add-missing-sentinal.patch deleted file mode 100644 index 255c712..0000000 --- a/0002-Add-missing-sentinal.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2eb66187dd8ab5840b4c82c18e817d04caa258ca Mon Sep 17 00:00:00 2001 -From: Jonathan Dieter -Date: Tue, 15 Jan 2019 23:23:47 +0000 -Subject: [PATCH 2/3] Add missing sentinal - -Signed-off-by: Jonathan Dieter ---- - 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 - diff --git a/0002-fix-linking-when-Wl-no-undefined-is-set.patch b/0002-fix-linking-when-Wl-no-undefined-is-set.patch new file mode 100644 index 0000000..99f13ad --- /dev/null +++ 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?= +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 + diff --git a/0003-Fix-misc-test.patch b/0003-Fix-misc-test.patch deleted file mode 100644 index 00d76d5..0000000 --- a/0003-Fix-misc-test.patch +++ /dev/null @@ -1,40 +0,0 @@ -From ccd8f0ec32b9ca82a727b35fcc8724ea6f6d3556 Mon Sep 17 00:00:00 2001 -From: Jonathan Dieter -Date: Tue, 15 Jan 2019 23:23:58 +0000 -Subject: [PATCH 3/3] Fix misc test - -Signed-off-by: Jonathan Dieter ---- - 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, ©filetest->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 - diff --git a/_service b/_service new file mode 100644 index 0000000..5739a12 --- /dev/null +++ b/_service @@ -0,0 +1,16 @@ + + + git://github.com/rpm-software-management/createrepo_c.git + git + .git + 0.12.1 + @PARENT_TAG@ + enable + + + *.tar + gz + + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..d854982 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + git://github.com/rpm-software-management/createrepo_c.git + 7744554ddef7c5be2cd7fbcac49c8b24ce60ef88 \ No newline at end of file diff --git a/createrepo_c-0.12.0.tar.gz b/createrepo_c-0.12.0.tar.gz deleted file mode 100644 index ac4d077..0000000 --- a/createrepo_c-0.12.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c55334e6e8f41c4c9c527ffe3d55dc8e08815f3f06c6972ee7e99306a3b8219e -size 363013 diff --git a/createrepo_c-0.12.1.tar.gz b/createrepo_c-0.12.1.tar.gz new file mode 100644 index 0000000..77916ea --- /dev/null +++ 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 diff --git a/createrepo_c.changes b/createrepo_c.changes index a8feded..74cfbcc 100644 --- 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 @@ -31,6 +49,7 @@ Wed Aug 1 12:06:35 UTC 2018 - Neal Gompa - 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 diff --git a/createrepo_c.spec b/createrepo_c.spec index bd9e272..4150724 100644 --- 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 From 5e104311c2ca6fe471e3699eda92c674cacbef3e07e0e744e4f3d147716036a6 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Thu, 16 May 2019 09:31:04 +0000 Subject: [PATCH 02/14] Accepting request 703277 from home:Pharaoh_Atem:branches:system:packagemanager - Update to 0.14.0 + Fix crash when dumping updateinfo and module is omitted (rh#1707981) + Add --pkgorigins mode - Update to 0.13.1 + Fix tests to work properly when modulemd support is not enabled - Enable modulemd support on openSUSE Leap 15.1+ and Tumbleweed - Update to 0.13.0 + Add support for handling modulemd + Add support for Koji simple merge mode + Add support for zchunked modulemd + Fixed --keep-all-metadata to keep all additional metadata - Disable tests if modulemd support is not enabled to prevent wrong failures - Drop patches included in this release + 0001-Find-correct-nosetests-version-even-when-which-comma.patch + 0002-fix-linking-when-Wl-no-undefined-is-set.patch OBS-URL: https://build.opensuse.org/request/show/703277 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/createrepo_c?expand=0&rev=34 --- ...etests-version-even-when-which-comma.patch | 26 ----------------- ...-linking-when-Wl-no-undefined-is-set.patch | 25 ---------------- _service | 2 +- _servicedata | 2 +- createrepo_c-0.12.1.tar.gz | 3 -- createrepo_c-0.14.0.tar.gz | 3 ++ createrepo_c.changes | 29 ++++++++++++++++++- createrepo_c.spec | 18 +++++++----- 8 files changed, 44 insertions(+), 64 deletions(-) delete mode 100644 0001-Find-correct-nosetests-version-even-when-which-comma.patch delete mode 100644 0002-fix-linking-when-Wl-no-undefined-is-set.patch delete mode 100644 createrepo_c-0.12.1.tar.gz create mode 100644 createrepo_c-0.14.0.tar.gz diff --git a/0001-Find-correct-nosetests-version-even-when-which-comma.patch b/0001-Find-correct-nosetests-version-even-when-which-comma.patch deleted file mode 100644 index 9c55552..0000000 --- a/0001-Find-correct-nosetests-version-even-when-which-comma.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 91637830c366b18c59d2576967e00b2a624e19f5 Mon Sep 17 00:00:00 2001 -From: Jan Pazdziora -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 - diff --git a/0002-fix-linking-when-Wl-no-undefined-is-set.patch b/0002-fix-linking-when-Wl-no-undefined-is-set.patch deleted file mode 100644 index 99f13ad..0000000 --- a/0002-fix-linking-when-Wl-no-undefined-is-set.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0f29df0f2e974e28fcb45668d6a8af267b4d40ff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= -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 - diff --git a/_service b/_service index 5739a12..41ebf34 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ git://github.com/rpm-software-management/createrepo_c.git git .git - 0.12.1 + 0.14.0 @PARENT_TAG@ enable diff --git a/_servicedata b/_servicedata index d854982..18756f3 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/rpm-software-management/createrepo_c.git - 7744554ddef7c5be2cd7fbcac49c8b24ce60ef88 \ No newline at end of file + 8cffea9751b14366a7f6f3664f5d39fe4f0f9253 diff --git a/createrepo_c-0.12.1.tar.gz b/createrepo_c-0.12.1.tar.gz deleted file mode 100644 index 77916ea..0000000 --- a/createrepo_c-0.12.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:28f5b47f558f3ebdddc98a93aa634ea097a44659c9d3d96fa8d88bf391372bf8 -size 374660 diff --git a/createrepo_c-0.14.0.tar.gz b/createrepo_c-0.14.0.tar.gz new file mode 100644 index 0000000..53ba98c --- /dev/null +++ b/createrepo_c-0.14.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e25617079372e668959f8784800045714c82ba38a2904daf1e37ce7ac894f6f1 +size 590674 diff --git a/createrepo_c.changes b/createrepo_c.changes index 74cfbcc..f4b6981 100644 --- a/createrepo_c.changes +++ b/createrepo_c.changes @@ -1,5 +1,32 @@ ------------------------------------------------------------------- -Fri Mar 01 09:37:11 UTC 2019 - FSchreiner@suse.com +Wed May 15 23:17:38 UTC 2019 - Neal Gompa + +- Update to 0.14.0 + + Fix crash when dumping updateinfo and module is omitted (rh#1707981) + + Add --pkgorigins mode + +------------------------------------------------------------------- +Sat May 4 22:17:16 UTC 2019 - Neal Gompa + +- Update to 0.13.1 + + Fix tests to work properly when modulemd support is not enabled +- Enable modulemd support on openSUSE Leap 15.1+ and Tumbleweed + +------------------------------------------------------------------- +Sat May 4 01:39:34 UTC 2019 - Neal Gompa + +- Update to 0.13.0 + + Add support for handling modulemd + + Add support for Koji simple merge mode + + Add support for zchunked modulemd + + Fixed --keep-all-metadata to keep all additional metadata +- Disable tests if modulemd support is not enabled to prevent wrong failures +- Drop patches included in this release + + 0001-Find-correct-nosetests-version-even-when-which-comma.patch + + 0002-fix-linking-when-Wl-no-undefined-is-set.patch + +------------------------------------------------------------------- +Fri Mar 01 09:37:11 UTC 2019 - Frank Schreiner - Added upstream patches * 0001-Find-correct-nosetests-version-even-when-which-comma.patch * 0002-fix-linking-when-Wl-no-undefined-is-set.patch diff --git a/createrepo_c.spec b/createrepo_c.spec index 4150724..36cd02b 100644 --- a/createrepo_c.spec +++ b/createrepo_c.spec @@ -17,13 +17,13 @@ # -# Enable Python and tests selectively %if 0%{?is_opensuse} || 0%{?suse_version} >= 1330 +# Enable Python bindings on openSUSE %bcond_without python3 %bcond_without tests %else -%bcond_with tests %bcond_with python3 +%bcond_with tests %endif %if ( 0%{?sle_version} || 0%{?suse_version} ) @@ -36,6 +36,10 @@ %if (0%{?is_opensuse} && 0%{?sle_version} >= 150100) || 0%{?suse_version} >= 1550 %bcond_without zchunk +%bcond_without libmodulemd +%else +%bcond_with zchunk +%bcond_with libmodulemd %endif %{!?make_build: %global make_build %{__make} %{?_smp_mflags}} @@ -45,7 +49,7 @@ %define devname lib%{name}-devel Name: createrepo_c -Version: 0.12.1 +Version: 0.14.0 Release: 0 Summary: Creates a common metadata repository License: GPL-2.0-or-later @@ -53,10 +57,6 @@ Group: System/Packages URL: https://github.com/rpm-software-management/createrepo_c Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# Backports from upstream -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 %endif @@ -82,6 +82,9 @@ BuildRequires: zlib-devel BuildRequires: zchunk BuildRequires: zchunk-devel >= 0.9.11 %endif +%if %{with libmodulemd} +BuildRequires: libmodulemd-devel >= 2.3.0 +%endif Requires: %{libname}%{?_isa} = %{version}-%{release} %if %{with tests} BuildRequires: python3-nose @@ -151,6 +154,7 @@ sed -i -e '/HTML_TIMESTAMP/d' doc/Doxyfile.in.in %define __builddir build %cmake \ %{!?with_zchunk:-DWITH_ZCHUNK=OFF} \ + %{!?with_libmodulemd:-DWITH_LIBMODULEMD=OFF} \ %{!?with_drpm:-DENABLE_DRPM=OFF} \ %{!?with_python3:-DENABLE_PYTHON=OFF} \ -DPYTHON_DESIRED:str=3 From bb221fa6b8ccbd86fc53de7dd6ee0f90ec52e794c653be19b14c979fd1f4c5d7 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Mon, 1 Jul 2019 13:54:01 +0000 Subject: [PATCH 03/14] Accepting request 712529 from home:Pharaoh_Atem:branches:system:packagemanager - Update to 0.14.2 + Fix issue with createrepo_c hanging at the end (rh#1714666) + Don't include packages with forbidden control chars in repodata (boo#1110914) + Correct pkg count in headers if there were invalid pkgs (rh#1596211) + Prevent exiting with 0 if errors occur while finalizing repodata OBS-URL: https://build.opensuse.org/request/show/712529 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/createrepo_c?expand=0&rev=35 --- _service | 2 +- _servicedata | 8 +++++--- createrepo_c-0.14.0.tar.gz | 3 --- createrepo_c-0.14.2.tar.gz | 3 +++ createrepo_c.changes | 9 +++++++++ createrepo_c.spec | 2 +- 6 files changed, 19 insertions(+), 8 deletions(-) delete mode 100644 createrepo_c-0.14.0.tar.gz create mode 100644 createrepo_c-0.14.2.tar.gz diff --git a/_service b/_service index 41ebf34..0e345a0 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ git://github.com/rpm-software-management/createrepo_c.git git .git - 0.14.0 + 0.14.2 @PARENT_TAG@ enable diff --git a/_servicedata b/_servicedata index 18756f3..0ffc02a 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,6 @@ - - git://github.com/rpm-software-management/createrepo_c.git - 8cffea9751b14366a7f6f3664f5d39fe4f0f9253 + + git://github.com/rpm-software-management/createrepo_c.git + f390af98c8f1bb04010e293ea864eae160f75879 + + diff --git a/createrepo_c-0.14.0.tar.gz b/createrepo_c-0.14.0.tar.gz deleted file mode 100644 index 53ba98c..0000000 --- a/createrepo_c-0.14.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e25617079372e668959f8784800045714c82ba38a2904daf1e37ce7ac894f6f1 -size 590674 diff --git a/createrepo_c-0.14.2.tar.gz b/createrepo_c-0.14.2.tar.gz new file mode 100644 index 0000000..669e751 --- /dev/null +++ b/createrepo_c-0.14.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e4fb2e96abf288fdc35f835ef84286b672a282590d4c58d2bbdcfad5fb11cde +size 594019 diff --git a/createrepo_c.changes b/createrepo_c.changes index f4b6981..c146b9e 100644 --- a/createrepo_c.changes +++ b/createrepo_c.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Jun 29 13:06:18 UTC 2019 - Neal Gompa + +- Update to 0.14.2 + + Fix issue with createrepo_c hanging at the end (rh#1714666) + + Don't include packages with forbidden control chars in repodata (boo#1110914) + + Correct pkg count in headers if there were invalid pkgs (rh#1596211) + + Prevent exiting with 0 if errors occur while finalizing repodata + ------------------------------------------------------------------- Wed May 15 23:17:38 UTC 2019 - Neal Gompa diff --git a/createrepo_c.spec b/createrepo_c.spec index 36cd02b..647d50f 100644 --- a/createrepo_c.spec +++ b/createrepo_c.spec @@ -49,7 +49,7 @@ %define devname lib%{name}-devel Name: createrepo_c -Version: 0.14.0 +Version: 0.14.2 Release: 0 Summary: Creates a common metadata repository License: GPL-2.0-or-later From 75cb54091d10d40856f8fe71fc459a5dd72622cdfe96a8d2674a0db333a3f330 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Wed, 3 Jul 2019 07:49:21 +0000 Subject: [PATCH 04/14] Accepting request 712926 from home:Pharaoh_Atem:branches:system:packagemanager Fix changes file to include information about dropping patches in the history for Factory submission OBS-URL: https://build.opensuse.org/request/show/712926 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/createrepo_c?expand=0&rev=36 --- createrepo_c.changes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/createrepo_c.changes b/createrepo_c.changes index c146b9e..1549c4a 100644 --- a/createrepo_c.changes +++ b/createrepo_c.changes @@ -39,6 +39,10 @@ Fri Mar 01 09:37:11 UTC 2019 - Frank Schreiner - Added upstream patches * 0001-Find-correct-nosetests-version-even-when-which-comma.patch * 0002-fix-linking-when-Wl-no-undefined-is-set.patch +- Drop included patches + * 0001-zck_end_chunk-returns-number-of-bytes-written-or-1-f.patch + * 0002-Add-missing-sentinal.patch + * 0003-Fix-misc-test.patch - Disable drpm support - Update to version 0.12.1: * Release 0.12.1 From 454cbad2c17995f181022b79526766e75be0376847b471ff1170e7ba738ec33d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 10 Sep 2019 09:55:52 +0000 Subject: [PATCH 05/14] Accepting request 686181 from home:jengelh:branches:system:packagemanager - Use noun phrase in summary. OBS-URL: https://build.opensuse.org/request/show/686181 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/createrepo_c?expand=0&rev=37 --- createrepo_c.changes | 5 +++++ createrepo_c.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/createrepo_c.changes b/createrepo_c.changes index 1549c4a..83fcd29 100644 --- a/createrepo_c.changes +++ b/createrepo_c.changes @@ -34,6 +34,11 @@ Sat May 4 01:39:34 UTC 2019 - Neal Gompa + 0001-Find-correct-nosetests-version-even-when-which-comma.patch + 0002-fix-linking-when-Wl-no-undefined-is-set.patch +------------------------------------------------------------------- +Mon Mar 18 17:16:27 UTC 2019 - Jan Engelhardt + +- Use noun phrase in summary. + ------------------------------------------------------------------- Fri Mar 01 09:37:11 UTC 2019 - Frank Schreiner - Added upstream patches diff --git a/createrepo_c.spec b/createrepo_c.spec index 647d50f..457133b 100644 --- a/createrepo_c.spec +++ b/createrepo_c.spec @@ -51,7 +51,7 @@ Name: createrepo_c Version: 0.14.2 Release: 0 -Summary: Creates a common metadata repository +Summary: RPM repository metadata generation utility License: GPL-2.0-or-later Group: System/Packages URL: https://github.com/rpm-software-management/createrepo_c From 8bfb695fe607f2e8dbe290f8753543dc8092193eca95f486f54d06e4a511dac5 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Tue, 17 Sep 2019 11:45:15 +0000 Subject: [PATCH 06/14] - Update to version 0.15.1: * Release 0.15.1 * Fix null pointer crash in cr_dumper_thread() if it fails to get checksum * Fix search in string with missing terminating zero (RhBug:1750673) * Depend on DRPM minimum version 0.4.0 * Release 0.15.0 * Revise drpm dependency check and bump the minimum version to 0.3.0 * Release 0.14.4 * Update documentation and regenerate man pages to sync up * Use drpm_make from drpm instead of deltarpm (RhBug:1687843) * Fix some DEBUG build warnings * Switch off html timestamps on documentation (RhBug:1731050) * Update documentation for mergerepo_c merge methods (RhBug:1722803) * Update documentation for --retain-old-md and --compatibility * Fix --read-pkgs-list to only list actually read packages * Release 0.14.3 * Add missing python metadata to python2/3-createrepo_c (RhBug:1695677) * detect plain tar file as non compressed OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/createrepo_c?expand=0&rev=38 --- _service | 2 +- _servicedata | 4 ++-- createrepo_c.changes | 22 ++++++++++++++++++++++ createrepo_c.spec | 2 +- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/_service b/_service index 0e345a0..dfe01ad 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ git://github.com/rpm-software-management/createrepo_c.git git .git - 0.14.2 + 0.15.1 @PARENT_TAG@ enable diff --git a/_servicedata b/_servicedata index 0ffc02a..9c14f86 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ git://github.com/rpm-software-management/createrepo_c.git - f390af98c8f1bb04010e293ea864eae160f75879 + bc67f19ed09593e3886ebeee2391e9d51cc3439f - + \ No newline at end of file diff --git a/createrepo_c.changes b/createrepo_c.changes index 83fcd29..e6d9c47 100644 --- a/createrepo_c.changes +++ b/createrepo_c.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Sep 17 11:43:49 UTC 2019 - FSchreiner@suse.com + +- Update to version 0.15.1: + * Release 0.15.1 + * Fix null pointer crash in cr_dumper_thread() if it fails to get checksum + * Fix search in string with missing terminating zero (RhBug:1750673) + * Depend on DRPM minimum version 0.4.0 + * Release 0.15.0 + * Revise drpm dependency check and bump the minimum version to 0.3.0 + * Release 0.14.4 + * Update documentation and regenerate man pages to sync up + * Use drpm_make from drpm instead of deltarpm (RhBug:1687843) + * Fix some DEBUG build warnings + * Switch off html timestamps on documentation (RhBug:1731050) + * Update documentation for mergerepo_c merge methods (RhBug:1722803) + * Update documentation for --retain-old-md and --compatibility + * Fix --read-pkgs-list to only list actually read packages + * Release 0.14.3 + * Add missing python metadata to python2/3-createrepo_c (RhBug:1695677) + * detect plain tar file as non compressed + ------------------------------------------------------------------- Sat Jun 29 13:06:18 UTC 2019 - Neal Gompa diff --git a/createrepo_c.spec b/createrepo_c.spec index 457133b..c542e3d 100644 --- a/createrepo_c.spec +++ b/createrepo_c.spec @@ -49,7 +49,7 @@ %define devname lib%{name}-devel Name: createrepo_c -Version: 0.14.2 +Version: 0.15.1 Release: 0 Summary: RPM repository metadata generation utility License: GPL-2.0-or-later From acbd50ec2d58bb8c313ff542a807d18f6de7756e6f16231cff7e933e0cdcfc8f Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Tue, 17 Sep 2019 12:42:06 +0000 Subject: [PATCH 07/14] added correct source tar OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/createrepo_c?expand=0&rev=39 --- createrepo_c-0.14.2.tar.gz | 3 --- createrepo_c-0.15.1.tar.gz | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 createrepo_c-0.14.2.tar.gz create mode 100644 createrepo_c-0.15.1.tar.gz diff --git a/createrepo_c-0.14.2.tar.gz b/createrepo_c-0.14.2.tar.gz deleted file mode 100644 index 669e751..0000000 --- a/createrepo_c-0.14.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e4fb2e96abf288fdc35f835ef84286b672a282590d4c58d2bbdcfad5fb11cde -size 594019 diff --git a/createrepo_c-0.15.1.tar.gz b/createrepo_c-0.15.1.tar.gz new file mode 100644 index 0000000..bc7e640 --- /dev/null +++ b/createrepo_c-0.15.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9462300c41501bc8a53aeda2a5180ce3a96b8a3442b4c399567f3831e754dce6 +size 595037 From d3b8dbd64ec68bdaa4d2dfa3c64c85e03dfd0f1fb58e353aad87efae51ac4a39 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Tue, 17 Sep 2019 12:51:06 +0000 Subject: [PATCH 08/14] Accepting request 731519 from home:dirkmueller:branches:system:packagemanager - fix build by adding missing tarball and updating filelist OBS-URL: https://build.opensuse.org/request/show/731519 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/createrepo_c?expand=0&rev=40 --- createrepo_c.changes | 5 +++++ createrepo_c.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/createrepo_c.changes b/createrepo_c.changes index e6d9c47..eecd9be 100644 --- a/createrepo_c.changes +++ b/createrepo_c.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 17 12:00:42 UTC 2019 - Dirk Mueller + +- fix build by adding missing tarball and updating filelist + ------------------------------------------------------------------- Tue Sep 17 11:43:49 UTC 2019 - FSchreiner@suse.com diff --git a/createrepo_c.spec b/createrepo_c.spec index c542e3d..a33fce1 100644 --- a/createrepo_c.spec +++ b/createrepo_c.spec @@ -247,6 +247,7 @@ fi %files -n python3-%{name} %license COPYING %{python3_sitearch}/createrepo_c/ +%{python3_sitearch}/*egg-info %endif %changelog From 4b5ef20dc6e19d3869095c3943654153164a2363e0389707aa9f7464fedf85f9 Mon Sep 17 00:00:00 2001 From: Frank Schreiner Date: Mon, 25 Nov 2019 13:08:44 +0000 Subject: [PATCH 09/14] Accepting request 749170 from home:StevenK:branches:system:packagemanager - Add BuildRequires on python3, it won't be pulled in side effect of requiring python3-nose OBS-URL: https://build.opensuse.org/request/show/749170 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/createrepo_c?expand=0&rev=41 --- createrepo_c.changes | 6 ++++++ createrepo_c.spec | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/createrepo_c.changes b/createrepo_c.changes index eecd9be..fa7395d 100644 --- a/createrepo_c.changes +++ b/createrepo_c.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 18 05:57:08 UTC 2019 - Steve Kowalik + +- Add BuildRequires on python3, it won't be pulled in side effect of + requiring python3-nose + ------------------------------------------------------------------- Tue Sep 17 12:00:42 UTC 2019 - Dirk Mueller diff --git a/createrepo_c.spec b/createrepo_c.spec index a33fce1..be2bc80 100644 --- a/createrepo_c.spec +++ b/createrepo_c.spec @@ -1,7 +1,7 @@ # # spec file for package createrepo_c # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # Copyright (c) 2019 Neal Gompa . # # All modifications and additions to the file contributed by third parties @@ -87,6 +87,7 @@ BuildRequires: libmodulemd-devel >= 2.3.0 %endif Requires: %{libname}%{?_isa} = %{version}-%{release} %if %{with tests} +BuildRequires: python3 BuildRequires: python3-nose %endif %if 0%{?suse_version} >= 1330 From 1a3674616ec28be1b551fa4dbd5f145fbe20f164d9f9e954a367d90a0a4c137b Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 25 Nov 2019 13:42:07 +0000 Subject: [PATCH 10/14] - Update to 0.15.2 + Fix file mode for cache (rh#1686812) + Honor umask on cache files (rh#1686812) - Enable DeltaRPM support for openSUSE targets on Leap 15.2+ and TW OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/createrepo_c?expand=0&rev=42 --- _service | 16 ---------------- _servicedata | 6 ------ createrepo_c-0.15.1.tar.gz | 3 --- createrepo_c-0.15.2.tar.gz | 3 +++ createrepo_c.changes | 8 ++++++++ createrepo_c.spec | 11 +++++------ 6 files changed, 16 insertions(+), 31 deletions(-) delete mode 100644 _service delete mode 100644 _servicedata delete mode 100644 createrepo_c-0.15.1.tar.gz create mode 100644 createrepo_c-0.15.2.tar.gz diff --git a/_service b/_service deleted file mode 100644 index dfe01ad..0000000 --- a/_service +++ /dev/null @@ -1,16 +0,0 @@ - - - git://github.com/rpm-software-management/createrepo_c.git - git - .git - 0.15.1 - @PARENT_TAG@ - enable - - - *.tar - gz - - - - diff --git a/_servicedata b/_servicedata deleted file mode 100644 index 9c14f86..0000000 --- a/_servicedata +++ /dev/null @@ -1,6 +0,0 @@ - - - git://github.com/rpm-software-management/createrepo_c.git - bc67f19ed09593e3886ebeee2391e9d51cc3439f - - \ No newline at end of file diff --git a/createrepo_c-0.15.1.tar.gz b/createrepo_c-0.15.1.tar.gz deleted file mode 100644 index bc7e640..0000000 --- a/createrepo_c-0.15.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9462300c41501bc8a53aeda2a5180ce3a96b8a3442b4c399567f3831e754dce6 -size 595037 diff --git a/createrepo_c-0.15.2.tar.gz b/createrepo_c-0.15.2.tar.gz new file mode 100644 index 0000000..602a6b5 --- /dev/null +++ b/createrepo_c-0.15.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:352b6fe91733b2d1610cdf18c6c2a971fd0c11de759a1be58bf9f5e35da2d1d3 +size 595090 diff --git a/createrepo_c.changes b/createrepo_c.changes index fa7395d..b316aa7 100644 --- a/createrepo_c.changes +++ b/createrepo_c.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Nov 25 13:39:11 UTC 2019 - Neal Gompa + +- Update to 0.15.2 + + Fix file mode for cache (rh#1686812) + + Honor umask on cache files (rh#1686812) +- Enable DeltaRPM support for openSUSE targets on Leap 15.2+ and TW + ------------------------------------------------------------------- Mon Nov 18 05:57:08 UTC 2019 - Steve Kowalik diff --git a/createrepo_c.spec b/createrepo_c.spec index be2bc80..4dffc4b 100644 --- a/createrepo_c.spec +++ b/createrepo_c.spec @@ -26,12 +26,11 @@ %bcond_with tests %endif -%if ( 0%{?sle_version} || 0%{?suse_version} ) -# Disabled DeltaRPM support for SUSE -%bcond_with drpm -%else +%if (0%{?is_opensuse} && 0%{?sle_version} >= 150200) || 0%{?suse_version} >= 1550 # Enable enhanced DeltaRPM support %bcond_without drpm +%else +%bcond_with drpm %endif %if (0%{?is_opensuse} && 0%{?sle_version} >= 150100) || 0%{?suse_version} >= 1550 @@ -49,7 +48,7 @@ %define devname lib%{name}-devel Name: createrepo_c -Version: 0.15.1 +Version: 0.15.2 Release: 0 Summary: RPM repository metadata generation utility License: GPL-2.0-or-later @@ -94,7 +93,7 @@ BuildRequires: python3-nose BuildRequires: bash-completion-devel %endif %if %{with drpm} -BuildRequires: drpm-devel +BuildRequires: drpm-devel >= 0.4.0 %endif Requires: %{libname} = %{version}-%{release} From 606f5b78967e7800015750ff7e0d0b463dd40c091fccb835cfbad0a2eba94ef2 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 25 Nov 2019 13:52:08 +0000 Subject: [PATCH 11/14] Fix rhbz references and changelog entry authors OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/createrepo_c?expand=0&rev=43 --- createrepo_c.changes | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/createrepo_c.changes b/createrepo_c.changes index b316aa7..9f70759 100644 --- a/createrepo_c.changes +++ b/createrepo_c.changes @@ -18,25 +18,25 @@ Tue Sep 17 12:00:42 UTC 2019 - Dirk Mueller - fix build by adding missing tarball and updating filelist ------------------------------------------------------------------- -Tue Sep 17 11:43:49 UTC 2019 - FSchreiner@suse.com +Tue Sep 17 11:43:49 UTC 2019 - Frank Schreiner - Update to version 0.15.1: * Release 0.15.1 * Fix null pointer crash in cr_dumper_thread() if it fails to get checksum - * Fix search in string with missing terminating zero (RhBug:1750673) + * Fix search in string with missing terminating zero (rh#1750673) * Depend on DRPM minimum version 0.4.0 * Release 0.15.0 * Revise drpm dependency check and bump the minimum version to 0.3.0 * Release 0.14.4 * Update documentation and regenerate man pages to sync up - * Use drpm_make from drpm instead of deltarpm (RhBug:1687843) + * Use drpm_make from drpm instead of deltarpm (rh#1687843) * Fix some DEBUG build warnings - * Switch off html timestamps on documentation (RhBug:1731050) - * Update documentation for mergerepo_c merge methods (RhBug:1722803) + * Switch off html timestamps on documentation (rh#1731050) + * Update documentation for mergerepo_c merge methods (rh#1722803) * Update documentation for --retain-old-md and --compatibility * Fix --read-pkgs-list to only list actually read packages * Release 0.14.3 - * Add missing python metadata to python2/3-createrepo_c (RhBug:1695677) + * Add missing python metadata to python2/3-createrepo_c (rh#1695677) * detect plain tar file as non compressed ------------------------------------------------------------------- From a163c167e64552f1cfb199bf507fd4430dc1f4a236c7596a7dc8eefe49e98872 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 29 Nov 2019 12:48:56 +0000 Subject: [PATCH 12/14] - Update to 0.15.3 + Export all changelog entries in compatibility mode + Libmagic to follow symlinks (rh#1776399) + Add shortcut to detect *.yaml files as not compressed - Ensure createrepo_c fully replaces createrepo on Tumbleweed - Remove old and now unused dependency on deltarpm as drpm is used now OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/createrepo_c?expand=0&rev=44 --- createrepo_c-0.15.2.tar.gz | 3 --- createrepo_c-0.15.3.tar.gz | 3 +++ createrepo_c.changes | 10 ++++++++++ createrepo_c.spec | 34 ++++++++++++++++++++++++++++++---- 4 files changed, 43 insertions(+), 7 deletions(-) delete mode 100644 createrepo_c-0.15.2.tar.gz create mode 100644 createrepo_c-0.15.3.tar.gz diff --git a/createrepo_c-0.15.2.tar.gz b/createrepo_c-0.15.2.tar.gz deleted file mode 100644 index 602a6b5..0000000 --- a/createrepo_c-0.15.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:352b6fe91733b2d1610cdf18c6c2a971fd0c11de759a1be58bf9f5e35da2d1d3 -size 595090 diff --git a/createrepo_c-0.15.3.tar.gz b/createrepo_c-0.15.3.tar.gz new file mode 100644 index 0000000..044f649 --- /dev/null +++ b/createrepo_c-0.15.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a3ad8f29f45799e85a5a097dce5b6f08525984ef1dc6d19dcd07281d674efd5 +size 595144 diff --git a/createrepo_c.changes b/createrepo_c.changes index 9f70759..9a83c94 100644 --- a/createrepo_c.changes +++ b/createrepo_c.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Nov 29 12:42:37 UTC 2019 - Neal Gompa + +- Update to 0.15.3 + + Export all changelog entries in compatibility mode + + Libmagic to follow symlinks (rh#1776399) + + Add shortcut to detect *.yaml files as not compressed +- Ensure createrepo_c fully replaces createrepo on Tumbleweed +- Remove old and now unused dependency on deltarpm as drpm is used now + ------------------------------------------------------------------- Mon Nov 25 13:39:11 UTC 2019 - Neal Gompa diff --git a/createrepo_c.spec b/createrepo_c.spec index 4dffc4b..8f7cbb5 100644 --- a/createrepo_c.spec +++ b/createrepo_c.spec @@ -41,6 +41,12 @@ %bcond_with libmodulemd %endif +%if 0%{?sle_version} && 0%{?sle_version} < 160000 +%bcond_with as_createrepo +%else +%bcond_without as_createrepo +%endif + %{!?make_build: %global make_build %{__make} %{?_smp_mflags}} %define major 0 @@ -48,7 +54,7 @@ %define devname lib%{name}-devel Name: createrepo_c -Version: 0.15.2 +Version: 0.15.3 Release: 0 Summary: RPM repository metadata generation utility License: GPL-2.0-or-later @@ -98,8 +104,15 @@ BuildRequires: drpm-devel >= 0.4.0 Requires: %{libname} = %{version}-%{release} +%if %{with as_createrepo} +# Fully replaces createrepo +Requires(pre): update-alternatives +Obsoletes: createrepo < 0.11.0 +Provides: createrepo = %{version}-%{release} +%else Requires(post): update-alternatives Requires(postun): update-alternatives +%endif Provides: createrepo-implementation @@ -114,10 +127,7 @@ rpm packages and maintaining it. %package -n %{libname} Summary: Library for repodata manipulation -# The function to create DeltaRPMs calls /usr/bin/makedeltarpm, -# which is part of the 'deltarpm' package Group: System/Libraries -Requires: deltarpm %description -n %{libname} Libraries for applications using the createrepo_c library @@ -172,6 +182,12 @@ sed -i -e '/HTML_TIMESTAMP/d' doc/Doxyfile.in.in %define __builddir build %cmake_install +%if %{with as_createrepo} +for i in createrepo mergerepo modifyrepo sqliterepo;do + ln -s %{_bindir}/$i\_c %{buildroot}%{_bindir}/$i + echo ".so man8/$i\_c.8" > %{buildroot}%{_mandir}/man1/$i\.8 +done +%else mkdir -p %{buildroot}%{_sysconfdir}/alternatives for i in createrepo mergerepo modifyrepo sqliterepo;do ln -s %{_bindir}/$i\_c %{buildroot}%{_sysconfdir}/alternatives/$i @@ -179,10 +195,17 @@ for i in createrepo mergerepo modifyrepo sqliterepo;do ln -s %{_mandir}/man8/$i\_c.8.gz %{buildroot}%{_sysconfdir}/alternatives/$i\.8.gz ln -s %{_sysconfdir}/alternatives/$i\.8.gz %{buildroot}%{_mandir}/man8/$i\.8.gz done +%endif %fdupes %{buildroot}%{_prefix} %fdupes build/doc/html +%if %{with as_createrepo} +%pre +if [ -e %{_sysconfdir}/alternatives/createrepo ]; then + update-alternatives --remove createrepo %{_bindir}/createrepo_c +fi +%else %post update-alternatives --install \ %{_bindir}/createrepo createrepo %{_bindir}/createrepo_c 20 \ @@ -198,6 +221,7 @@ update-alternatives --install \ if [ ! -f %{_bindir}/createrepo_c ]; then update-alternatives --remove createrepo %{_bindir}/createrepo_c fi +%endif %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig @@ -222,6 +246,7 @@ fi %{_bindir}/mergerepo %{_bindir}/modifyrepo %{_bindir}/sqliterepo +%if ! %{with as_createrepo} %ghost %_sysconfdir/alternatives/createrepo %ghost %_sysconfdir/alternatives/mergerepo %ghost %_sysconfdir/alternatives/modifyrepo @@ -230,6 +255,7 @@ fi %ghost %_sysconfdir/alternatives/mergerepo.8.gz %ghost %_sysconfdir/alternatives/modifyrepo.8.gz %ghost %_sysconfdir/alternatives/sqliterepo.8.gz +%endif %files -n %{libname} %license COPYING From 03ec5776cffe917b3f4b6418b6f8c28205597a80563a7e444ced601c60730a51 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 29 Nov 2019 12:52:16 +0000 Subject: [PATCH 13/14] Fix soft link man page creation OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/createrepo_c?expand=0&rev=45 --- createrepo_c.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/createrepo_c.spec b/createrepo_c.spec index 8f7cbb5..d669381 100644 --- a/createrepo_c.spec +++ b/createrepo_c.spec @@ -185,7 +185,7 @@ sed -i -e '/HTML_TIMESTAMP/d' doc/Doxyfile.in.in %if %{with as_createrepo} for i in createrepo mergerepo modifyrepo sqliterepo;do ln -s %{_bindir}/$i\_c %{buildroot}%{_bindir}/$i - echo ".so man8/$i\_c.8" > %{buildroot}%{_mandir}/man1/$i\.8 + echo ".so man8/$i\_c.8" > %{buildroot}%{_mandir}/man8/$i\.8 done %else mkdir -p %{buildroot}%{_sysconfdir}/alternatives From 5e2532d250b3472a0fd901e71c50ef2e3378b97bf96b3963b9559b71b1a9455a Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 6 Dec 2019 11:49:02 +0000 Subject: [PATCH 14/14] - Update to 0.15.4 + Add reboot_suggested field to UpdateRecord (rh#1772466) + Skip directory matching --exclude right away + Add restart_suggested to updatecollectionpackage OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/createrepo_c?expand=0&rev=46 --- createrepo_c-0.15.3.tar.gz | 3 --- createrepo_c-0.15.4.tar.gz | 3 +++ createrepo_c.changes | 8 ++++++++ createrepo_c.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 createrepo_c-0.15.3.tar.gz create mode 100644 createrepo_c-0.15.4.tar.gz diff --git a/createrepo_c-0.15.3.tar.gz b/createrepo_c-0.15.3.tar.gz deleted file mode 100644 index 044f649..0000000 --- a/createrepo_c-0.15.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a3ad8f29f45799e85a5a097dce5b6f08525984ef1dc6d19dcd07281d674efd5 -size 595144 diff --git a/createrepo_c-0.15.4.tar.gz b/createrepo_c-0.15.4.tar.gz new file mode 100644 index 0000000..79ef304 --- /dev/null +++ b/createrepo_c-0.15.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80dad163abdb83fc24c3de519e8a4888c394a25337e3682fd5f68c04ac2b3d90 +size 595460 diff --git a/createrepo_c.changes b/createrepo_c.changes index 9a83c94..034a133 100644 --- a/createrepo_c.changes +++ b/createrepo_c.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Dec 6 11:47:37 UTC 2019 - Neal Gompa + +- Update to 0.15.4 + + Add reboot_suggested field to UpdateRecord (rh#1772466) + + Skip directory matching --exclude right away + + Add restart_suggested to updatecollectionpackage + ------------------------------------------------------------------- Fri Nov 29 12:42:37 UTC 2019 - Neal Gompa diff --git a/createrepo_c.spec b/createrepo_c.spec index d669381..8c9cacd 100644 --- a/createrepo_c.spec +++ b/createrepo_c.spec @@ -54,7 +54,7 @@ %define devname lib%{name}-devel Name: createrepo_c -Version: 0.15.3 +Version: 0.15.4 Release: 0 Summary: RPM repository metadata generation utility License: GPL-2.0-or-later