Browse code
Upgrading hawkey
Change-Id: I30a90f7e5286d1530d1bb45dc2ea6c5e37632cf0
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2389
Reviewed-by: Priyesh Padmavilasom <ppadmavilasom@vmware.com>
Reviewed-by: Xiaolin Li <xiaolinl@vmware.com>
Tested-by: gerrit-photon <photon-checkins@vmware.com>
DheerajSShetty authored on 2017/04/12 16:06:40Showing 3 changed files
| ... | ... |
@@ -1,11 +1,11 @@ |
| 1 | 1 |
Summary: Hawkey |
| 2 | 2 |
Name: hawkey |
| 3 |
-Version: 2014.1 |
|
| 4 |
-Release: 6%{?dist}
|
|
| 3 |
+Version: 2017.1 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: LGPLv2+ |
| 6 | 6 |
URL: http://fedoraproject.org/wiki/Features/Hawkey |
| 7 | 7 |
Source0: https://github.com/rpm-software-management/hawkey/archive/%{name}-%{version}.tar.gz
|
| 8 |
-%define sha1 hawkey=4caad007e243d0fa3f4c2912bd393cc6b326b272 |
|
| 8 |
+%define sha1 hawkey=864e83a84f2e2fec24370a3421401c45c900c104 |
|
| 9 | 9 |
Group: Development/Libraries |
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| ... | ... |
@@ -34,6 +34,10 @@ Summary: Python 2 bindings for the hawkey library |
| 34 | 34 |
Group: Development/Languages |
| 35 | 35 |
BuildRequires: python2-devel |
| 36 | 36 |
BuildRequires: python2-libs |
| 37 |
+BuildRequires: python-pip |
|
| 38 |
+BuildRequires: python-requests |
|
| 39 |
+BuildRequires: python-setuptools |
|
| 40 |
+BuildRequires: python-sphinx |
|
| 37 | 41 |
Requires: %{name} = %{version}-%{release}
|
| 38 | 42 |
Requires: python2 |
| 39 | 43 |
|
| ... | ... |
@@ -41,7 +45,8 @@ Requires: python2 |
| 41 | 41 |
Python 2 bindings for the hawkey library. |
| 42 | 42 |
|
| 43 | 43 |
%prep |
| 44 |
-%setup -qn %{name}
|
|
| 44 |
+%setup -qn hawkey-hawkey-0.6.4-1 |
|
| 45 |
+sed -i 's/ADD_SUBDIRECTORY (doc)//' CMakeLists.txt |
|
| 45 | 46 |
%build |
| 46 | 47 |
cmake \ |
| 47 | 48 |
-DCMAKE_INSTALL_PREFIX=%{_prefix}
|
| ... | ... |
@@ -71,6 +76,8 @@ tests/test_main tests/repos/ |
| 71 | 71 |
%exclude %{python_sitearch}/*
|
| 72 | 72 |
|
| 73 | 73 |
%changelog |
| 74 |
+* Wed Apr 05 2017 Dheeraj Shetty <dheerajs@vmware.com> 2017.1-1 |
|
| 75 |
+- Upgrading to version 2017.1 which is 0.6.4-1. |
|
| 74 | 76 |
* Mon Dec 19 2016 Xiaolin Li <xiaolinl@vmware.com> 2014.1-6 |
| 75 | 77 |
- BuildRequires libsolv-devel. |
| 76 | 78 |
* Thu Oct 06 2016 ChangLee <changlee@vmware.com> 2014.1-5 |
| 77 | 79 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,28 @@ |
| 0 |
+diff -dupr a/client/api.c b/client/api.c |
|
| 1 |
+--- a/client/api.c 2016-11-06 00:14:07.000000000 -0700 |
|
| 2 |
+@@ -155,7 +155,7 @@ TDNFCheckLocalPackages( |
|
| 3 |
+ } |
|
| 4 |
+ fprintf(stdout, "Checking all packages from: %s\n", pszLocalPath); |
|
| 5 |
+ |
|
| 6 |
+- hSack = hy_sack_create(NULL, NULL, NULL, 0); |
|
| 7 |
++ hSack = hy_sack_create(NULL, NULL, NULL, NULL, 0); |
|
| 8 |
+ if(!hSack) |
|
| 9 |
+ {
|
|
| 10 |
+ dwError = ERROR_TDNF_INVALID_PARAMETER; |
|
| 11 |
+diff -dupr a/client/init.c b/client/init.c |
|
| 12 |
+--- a/client/init.c 2016-11-06 00:14:07.000000000 -0700 |
|
| 13 |
+@@ -69,7 +69,11 @@ TDNFInitSack( |
|
| 14 |
+ |
|
| 15 |
+ pszHawkeyCacheDir = pTdnf->pConf->pszCacheDir; |
|
| 16 |
+ |
|
| 17 |
+- hSack = hy_sack_create(pszHawkeyCacheDir, NULL, pTdnf->pArgs->pszInstallRoot, 0); |
|
| 18 |
++ hSack = hy_sack_create(pszHawkeyCacheDir, |
|
| 19 |
++ NULL, |
|
| 20 |
++ pTdnf->pArgs->pszInstallRoot, |
|
| 21 |
++ NULL, |
|
| 22 |
++ 0); |
|
| 23 |
+ if(!hSack) |
|
| 24 |
+ {
|
|
| 25 |
+ dwError = ERROR_TDNF_INVALID_PARAMETER; |
| ... | ... |
@@ -19,6 +19,7 @@ BuildRequires: openssl-devel |
| 19 | 19 |
BuildRequires: libsolv-devel |
| 20 | 20 |
BuildRequires: librepo-devel |
| 21 | 21 |
Source0: %{name}-%{version}.tar.gz
|
| 22 |
+Patch0: hy_sack_create.patch |
|
| 22 | 23 |
%define sha1 tdnf=15544a87ea01d6215fed35bd2d1299776f7daca1 |
| 23 | 24 |
|
| 24 | 25 |
%description |
| ... | ... |
@@ -35,6 +36,7 @@ Development files for tdnf |
| 35 | 35 |
|
| 36 | 36 |
%prep |
| 37 | 37 |
%setup -q |
| 38 |
+%patch0 -p1 |
|
| 38 | 39 |
|
| 39 | 40 |
%build |
| 40 | 41 |
autoreconf -i |