rpm/createrepo_c
SHA256
1
0
Fork 0
forked from pool/createrepo_c
Code Pull Requests Activity

Accepting request 703277 from home:Pharaoh_Atem:branches:system:packagemanager

Browse Source 
- 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
This commit is contained in:
Frank Schreiner 2019-05-16 09:31:04 +00:00 committed by Git OBS Bridge
parent c0616a9433
commit 5e104311c2
8 changed files with 44 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0001-Find-correct-nosetests-version-even-when-which-comma.patch
View File

@ -1,26 +0,0 @@
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

25
0002-fix-linking-when-Wl-no-undefined-is-set.patch
View File

@ -1,25 +0,0 @@
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

2
_service
View File

@ -3,7 +3,7 @@
<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="revision">0.14.0</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
</service>

2
_servicedata
View File

@ -1,4 +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>
<param name="changesrevision">8cffea9751b14366a7f6f3664f5d39fe4f0f9253</param></service></servicedata>

3
createrepo_c-0.12.1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:28f5b47f558f3ebdddc98a93aa634ea097a44659c9d3d96fa8d88bf391372bf8
size 374660

3
createrepo_c-0.14.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e25617079372e668959f8784800045714c82ba38a2904daf1e37ce7ac894f6f1
size 590674

29
createrepo_c.changes
View File

@ -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 <ngompa13@gmail.com>
- 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 <ngompa13@gmail.com>
- 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 <ngompa13@gmail.com>
- 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 <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

18
createrepo_c.spec
View File

@ -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