Bump Version, keep upstream version
When modules are added from another collection, the resulting collection version may be different from the version of the base collection (fedora.linux_mgmt). Adjust macros for that and bump the collection version to 1.1.0 becasue of redfish_* addition. Related: rhbz2112434
This commit is contained in:
parent
27a40dfbc9
commit
201700f72e
@ -8,6 +8,7 @@
|
|||||||
|
|
||||||
%global collection_namespace_orig fedora
|
%global collection_namespace_orig fedora
|
||||||
%global collection_name_orig linux_mgmt
|
%global collection_name_orig linux_mgmt
|
||||||
|
%global collection_version_orig 1.0.0
|
||||||
|
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
%global collection_namespace redhat
|
%global collection_namespace redhat
|
||||||
@ -20,13 +21,13 @@
|
|||||||
Name: ansible-collection-%{collection_namespace}-%{collection_name}
|
Name: ansible-collection-%{collection_namespace}-%{collection_name}
|
||||||
Url: https://github.com/pcahyna/fedora.linux_mgmt/
|
Url: https://github.com/pcahyna/fedora.linux_mgmt/
|
||||||
Summary: Ansible Collection of general system management and utility modules and other plugins
|
Summary: Ansible Collection of general system management and utility modules and other plugins
|
||||||
Version: 1.0.0
|
Version: 1.1.0
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
|
|
||||||
%global collection_version %{version}
|
%global collection_version %{version}
|
||||||
%global archivename %{collection_namespace_orig}.%{collection_name_orig}-%{version}
|
%global archivename %{collection_namespace_orig}.%{collection_name_orig}-%{collection_version_orig}
|
||||||
%global extractdir %{archivename}
|
%global extractdir %{archivename}
|
||||||
|
|
||||||
# Helper macros originally from macros.ansible by Igor Raits <ignatenkobrain>
|
# Helper macros originally from macros.ansible by Igor Raits <ignatenkobrain>
|
||||||
@ -60,7 +61,7 @@ Requires: ansible >= 2.9.10
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Source: https://github.com/pcahyna/fedora.linux_mgmt/archive/%{version}/%{archivename}.tar.gz
|
Source: https://github.com/pcahyna/fedora.linux_mgmt/archive/%{collection_version_orig}/%{archivename}.tar.gz
|
||||||
|
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
# Collection tarballs from Galaxy
|
# Collection tarballs from Galaxy
|
||||||
|
Loading…
Reference in New Issue
Block a user