Browse code
photon-os-installer: Adding "jc" dependency
Upstream commits:
https://github.com/vmware/photon-os-installer/commit/d501ea6127ff06d5d50ad475b8ac9bb9aaf43f08
https://github.com/vmware/photon/commit/9650ab4c1d3896e5ce23142a2624f972fbdea76d
Change-Id: I3498b53ce3e107f5f08d0d87e960f2ed39abe7f2
Signed-off-by: Ankit Jain <ankit-aj.jain@broadcom.com>
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/c/photon/+/23712
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Oliver Kurth <okurth@vmware.com>
Ankit Jain authored on 2024/04/12 16:59:45Showing 2 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Convert output of command line tools and others to JSON |
| 2 | 2 |
Name: jc |
| 3 | 3 |
Version: 1.23.6 |
| 4 |
-Release: 1%{?dist}
|
|
| 4 |
+Release: 2%{?dist}
|
|
| 5 | 5 |
License: MIT |
| 6 | 6 |
URL: https://github.com/kellyjonbrazil/jc |
| 7 | 7 |
Group: Development/Languages/Python |
| ... | ... |
@@ -18,10 +18,6 @@ BuildRequires: python3-xmltodict |
| 18 | 18 |
BuildRequires: python3-ruamel-yaml |
| 19 | 19 |
BuildRequires: python3-Pygments |
| 20 | 20 |
|
| 21 |
-Requires: python3 |
|
| 22 |
-Requires: python3-xmltodict |
|
| 23 |
-Requires: python3-ruamel-yaml |
|
| 24 |
-Requires: python3-Pygments |
|
| 25 | 21 |
Requires: python3-%{name} = %{version}-%{release}
|
| 26 | 22 |
|
| 27 | 23 |
%if 0%{?with_check}
|
| ... | ... |
@@ -36,6 +32,10 @@ tools, file-types, and common strings to JSON, YAML, or Dictionaries. |
| 36 | 36 |
%package -n python3-%{name}
|
| 37 | 37 |
BuildArch: noarch |
| 38 | 38 |
Summary: Module to convert output of command line tools and others |
| 39 |
+Requires: python3 |
|
| 40 |
+Requires: python3-xmltodict |
|
| 41 |
+Requires: python3-ruamel-yaml |
|
| 42 |
+Requires: python3-Pygments |
|
| 39 | 43 |
|
| 40 | 44 |
%description -n python3-%{name}
|
| 41 | 45 |
Module to convert the output of popular command-line |
| ... | ... |
@@ -80,5 +80,7 @@ rm -rf %{buildroot}
|
| 80 | 80 |
%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info
|
| 81 | 81 |
|
| 82 | 82 |
%changelog |
| 83 |
+* Fri Apr 12 2024 Oliver Kurth <oliver.kurth@broadcom.com> 1.23.6-2 |
|
| 84 |
+- fix requires by moving them to the python package |
|
| 83 | 85 |
* Tue Oct 24 2023 Oliver Kurth <okurth@vmware.com> 1.23.6-1 |
| 84 | 86 |
- Initial build |
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
Summary: Photon OS Installer |
| 4 | 4 |
Name: photon-os-installer |
| 5 | 5 |
Version: 2.4 |
| 6 |
-Release: 2%{?dist}
|
|
| 6 |
+Release: 3%{?dist}
|
|
| 7 | 7 |
License: Apache 2.0 and GPL 2.0 |
| 8 | 8 |
Group: System Environment/Base |
| 9 | 9 |
Vendor: VMware, Inc. |
| ... | ... |
@@ -18,6 +18,7 @@ BuildRequires: python3-requests |
| 18 | 18 |
BuildRequires: python3-cracklib |
| 19 | 19 |
BuildRequires: python3-curses |
| 20 | 20 |
BuildRequires: python3-PyYAML |
| 21 |
+BuildRequires: python3-jc |
|
| 21 | 22 |
|
| 22 | 23 |
Requires: python3-pyinstaller |
| 23 | 24 |
Requires: python3-pyOpenSSL |
| ... | ... |
@@ -25,6 +26,7 @@ Requires: python3-requests |
| 25 | 25 |
Requires: python3-cracklib |
| 26 | 26 |
Requires: python3-curses |
| 27 | 27 |
Requires: python3-PyYAML |
| 28 |
+Requires: python3-jc |
|
| 28 | 29 |
|
| 29 | 30 |
Requires: dosfstools |
| 30 | 31 |
Requires: efibootmgr |
| ... | ... |
@@ -64,6 +66,8 @@ rm -rf %{buildroot}
|
| 64 | 64 |
%{_bindir}/photon-iso-builder
|
| 65 | 65 |
|
| 66 | 66 |
%changelog |
| 67 |
+* Fri Apr 12 2024 Ankit Jain <ankit-aj.jain@broadcom.com> 2.4-3 |
|
| 68 |
+- Add "jc" dependency |
|
| 67 | 69 |
* Wed Oct 25 2023 Ankit Jain <ankitja@vmware.com> 2.4-2 |
| 68 | 70 |
- Fix tmpfs mount issue |
| 69 | 71 |
* Fri Oct 13 2023 Piyush Gupta <gpiyush@vmware.com> 2.4-1 |