Change-Id: I875101afc5f7691cc35adac0949a690547a5e8f0
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4976
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Xiaolin Li <xiaolinl@vmware.com>
... | ... |
@@ -6,37 +6,37 @@ |
6 | 6 |
%define _mech_id 1.3.6.1.4.1.6876.11711.2.1.2 |
7 | 7 |
%define _python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))") |
8 | 8 |
|
9 |
-Summary: Photon Management Daemon |
|
10 |
-Name: pmd |
|
11 |
-Version: 0.0.5 |
|
12 |
-Release: 4%{?dist} |
|
13 |
-Vendor: VMware, Inc. |
|
14 |
-Distribution: Photon |
|
15 |
-License: Apache 2.0 |
|
9 |
+Summary: Photon Management Daemon |
|
10 |
+Name: pmd |
|
11 |
+Version: 0.0.5 |
|
12 |
+Release: 5%{?dist} |
|
13 |
+Vendor: VMware, Inc. |
|
14 |
+Distribution: Photon |
|
15 |
+License: Apache 2.0 |
|
16 | 16 |
URL: https://www.github.com/vmware/pmd |
17 |
-Group: Applications/System |
|
17 |
+Group: Applications/System |
|
18 | 18 |
Requires: copenapi |
19 |
-Requires: c-rest-engine >= 1.1 |
|
19 |
+Requires: c-rest-engine >= 1.1 |
|
20 | 20 |
Requires: jansson |
21 |
-Requires: likewise-open >= 6.2.9 |
|
21 |
+Requires: likewise-open >= 6.2.9 |
|
22 | 22 |
Requires: netmgmt |
23 |
-Requires: systemd |
|
24 |
-Requires: tdnf >= 1.2.0 |
|
23 |
+Requires: systemd |
|
24 |
+Requires: tdnf >= 1.2.3 |
|
25 | 25 |
Requires: lightwave-client-libs |
26 | 26 |
Requires: %{name}-libs = %{version}-%{release} |
27 | 27 |
Requires: shadow |
28 | 28 |
BuildRequires: copenapi-devel |
29 |
-BuildRequires: c-rest-engine-devel >= 1.1 |
|
30 |
-BuildRequires: curl-devel |
|
31 |
-BuildRequires: hawkey-devel >= 2017.1 |
|
29 |
+BuildRequires: c-rest-engine-devel >= 1.1 |
|
30 |
+BuildRequires: curl-devel |
|
31 |
+BuildRequires: hawkey-devel >= 2017.1 |
|
32 | 32 |
BuildRequires: jansson-devel |
33 |
-BuildRequires: krb5-devel |
|
34 |
-BuildRequires: likewise-open-devel >= 6.2.9 |
|
35 |
-BuildRequires: netmgmt-cli-devel |
|
36 |
-BuildRequires: netmgmt-devel |
|
37 |
-BuildRequires: tdnf-devel >= 1.2.0 |
|
33 |
+BuildRequires: krb5-devel |
|
34 |
+BuildRequires: likewise-open-devel >= 6.2.9 |
|
35 |
+BuildRequires: netmgmt-cli-devel |
|
36 |
+BuildRequires: netmgmt-devel |
|
37 |
+BuildRequires: tdnf-devel >= 1.2.3 |
|
38 | 38 |
BuildRequires: lightwave-devel |
39 |
-Source0: %{name}-%{version}-3.tar.gz |
|
39 |
+Source0: %{name}-%{version}-3.tar.gz |
|
40 | 40 |
%define sha1 pmd=fe9b4b81410497d209fc4b6efb9574a049557b25 |
41 | 41 |
Patch0: pmd-update-to-c-rest-engine-1.1.patch |
42 | 42 |
|
... | ... |
@@ -307,22 +307,24 @@ rm -rf %{buildroot}/* |
307 | 307 |
%{_python3_sitearch}/%{name}_python-*.egg-info |
308 | 308 |
|
309 | 309 |
%changelog |
310 |
-* Thu Nov 30 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.5-4 |
|
311 |
-- update to use c-rest-engine-1.11 |
|
312 |
-* Tue Oct 24 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.5-3 |
|
313 |
-- Bug fixes and net commands fixes |
|
314 |
-* Sat Sep 30 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.5-2 |
|
315 |
-- Apply patch for local rpc connection separation |
|
316 |
-- patch for couple of minor coverity scan fixes. |
|
317 |
-* Thu Sep 28 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.5-1 |
|
318 |
-- Update to version 0.0.5 |
|
319 |
-* Sat Sep 23 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.4-1 |
|
320 |
-- Add privilege separation |
|
321 |
-* Tue Aug 01 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.3-1 |
|
322 |
-- Fix REST param handling, CLI locale. |
|
323 |
-* Thu Jun 01 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.2-1 |
|
324 |
-- Fix python3 string issues. |
|
325 |
-* Tue May 23 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.1-2 |
|
326 |
-- Changes for lightwave dependencies |
|
327 |
-* Thu May 04 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.1-1 |
|
328 |
-- Initial build. First version |
|
310 |
+* Thu Apr 05 2018 Xiaolin Li <xiaolinl@vmware.com> 0.0.5-5 |
|
311 |
+- Rebuild with tdnf 1.2.3. |
|
312 |
+* Thu Nov 30 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.5-4 |
|
313 |
+- update to use c-rest-engine-1.11 |
|
314 |
+* Tue Oct 24 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.5-3 |
|
315 |
+- Bug fixes and net commands fixes |
|
316 |
+* Sat Sep 30 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.5-2 |
|
317 |
+- Apply patch for local rpc connection separation |
|
318 |
+- patch for couple of minor coverity scan fixes. |
|
319 |
+* Thu Sep 28 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.5-1 |
|
320 |
+- Update to version 0.0.5 |
|
321 |
+* Sat Sep 23 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.4-1 |
|
322 |
+- Add privilege separation |
|
323 |
+* Tue Aug 01 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.3-1 |
|
324 |
+- Fix REST param handling, CLI locale. |
|
325 |
+* Thu Jun 01 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.2-1 |
|
326 |
+- Fix python3 string issues. |
|
327 |
+* Tue May 23 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.1-2 |
|
328 |
+- Changes for lightwave dependencies |
|
329 |
+* Thu May 04 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.0.1-1 |
|
330 |
+- Initial build. First version |
... | ... |
@@ -3,8 +3,8 @@ |
3 | 3 |
# |
4 | 4 |
Summary: dnf/yum equivalent using C libs |
5 | 5 |
Name: tdnf |
6 |
-Version: 1.2.2 |
|
7 |
-Release: 3%{?dist} |
|
6 |
+Version: 1.2.3 |
|
7 |
+Release: 1%{?dist} |
|
8 | 8 |
Vendor: VMware, Inc. |
9 | 9 |
Distribution: Photon |
10 | 10 |
License: LGPLv2.1,GPLv2 |
... | ... |
@@ -22,40 +22,37 @@ BuildRequires: curl-devel |
22 | 22 |
Obsoletes: yum |
23 | 23 |
Provides: yum |
24 | 24 |
Source0: %{name}-%{version}.tar.gz |
25 |
-%define sha1 tdnf=51e084e294e1ae4eae800dbf6f4e435c3d18a8ff |
|
25 |
+%define sha1 tdnf=d04e003bcdf9d9f0bf2ec0f6e5ca26a4a0174db8 |
|
26 | 26 |
Source1: cache-updateinfo |
27 | 27 |
Source2: cache-updateinfo.service |
28 | 28 |
Source3: cache-updateinfo.timer |
29 | 29 |
Source4: updateinfo.sh |
30 |
-Patch0: tdnf_fix_protected_pkgs_in_obsolete.patch |
|
31 | 30 |
|
32 | 31 |
%description |
33 | 32 |
tdnf is a yum/dnf equivalent |
34 | 33 |
which uses libsolv and libhawkey |
35 | 34 |
|
36 |
-%package devel |
|
37 |
-Summary: A Library providing C API for tdnf |
|
38 |
-Group: Development/Libraries |
|
39 |
-Requires: tdnf = %{version}-%{release} |
|
40 |
-Requires: hawkey-devel >= 2017.1 |
|
35 |
+%package devel |
|
36 |
+Summary: A Library providing C API for tdnf |
|
37 |
+Group: Development/Libraries |
|
38 |
+Requires: tdnf = %{version}-%{release} |
|
39 |
+Requires: hawkey-devel >= 2017.1 |
|
41 | 40 |
|
42 | 41 |
%description devel |
43 | 42 |
Development files for tdnf |
44 | 43 |
|
45 |
-%package cli-libs |
|
46 |
-Summary: Library providing cli libs for tdnf like clients |
|
47 |
-Group: Development/Libraries |
|
44 |
+%package cli-libs |
|
45 |
+Summary: Library providing cli libs for tdnf like clients |
|
46 |
+Group: Development/Libraries |
|
48 | 47 |
|
49 | 48 |
%description cli-libs |
50 | 49 |
Library providing cli libs for tdnf like clients. |
51 | 50 |
|
52 | 51 |
%prep |
53 | 52 |
%setup -q |
54 |
-%patch0 -p1 |
|
55 |
- |
|
56 | 53 |
|
57 | 54 |
%build |
58 |
-sed -i 's/tdnf, 1.2.0/tdnf, 1.2.2/' configure.ac |
|
55 |
+sed -i 's/tdnf, 1.2.0/tdnf, 1.2.3/' configure.ac |
|
59 | 56 |
autoreconf -i |
60 | 57 |
./configure \ |
61 | 58 |
--prefix=%{_prefix} \ |
... | ... |
@@ -154,6 +151,8 @@ systemctl try-restart tdnf-cache-updateinfo.timer >/dev/null 2>&1 || : |
154 | 154 |
%{_libdir}/libtdnfcli.so.* |
155 | 155 |
|
156 | 156 |
%changelog |
157 |
+* Thu Apr 05 2018 Xiaolin Li <xiaolinl@vmware.com> 1.2.3-1 |
|
158 |
+- Update to v1.2.3 |
|
157 | 159 |
* Thu Feb 15 2018 Xiaolin Li <xiaolinl@vmware.com> 1.2.2-3 |
158 | 160 |
- Bump version after set SOLVER_FLAG_ALLOW_DOWNGRADE to |
159 | 161 |
- true for downgrade in hawkey. |