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