Browse code
rpm,libsolv: rich dependencies support
Change-Id: I4e5ad00ff0385655ff9aac486bb69d0c792d76d0
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3909
Reviewed-by: Sharath George
Tested-by: Sharath George
Alexey Makhalov authored on 2017/09/30 04:40:44Showing 45 changed files
- SPECS/asciidoc/asciidoc.spec
- SPECS/autoconf/autoconf.spec
- SPECS/automake/automake.spec
- SPECS/cloud-init/cloud-init.spec
- SPECS/deltarpm/deltarpm.spec
- SPECS/distrib-compat/distrib-compat.spec
- SPECS/docbook-xml/docbook-xml.spec
- SPECS/docbook-xsl/docbook-xsl.spec
- SPECS/finger/finger.spec
- SPECS/gnome-common/gnome-common.spec
- SPECS/gtk-doc/gtk-doc.spec
- SPECS/hdparm/hdparm.spec
- SPECS/httpd-mod_jk/httpd-mod_jk.spec
- SPECS/intltool/intltool.spec
- SPECS/ipxe/ipxe.spec
- SPECS/itstool/itstool.spec
- SPECS/jna/jna.spec
- SPECS/libhif/libhif.spec
- SPECS/libnss-ato/libnss-ato.spec
- SPECS/libsolv/libsolv.spec
- SPECS/libtar/libtar.spec
- SPECS/mkinitcpio/mkinitcpio.spec
- SPECS/netkit-telnet/netkit-telnet.spec
- SPECS/perl-Crypt-SSLeay/perl-Crypt-SSLeay.spec
- SPECS/perl-IO-Socket-SSL/perl-IO-Socket-SSL.spec
- SPECS/perl-Path-Class/perl-Path-Class.spec
- SPECS/perl-Try-Tiny/perl-Try-Tiny.spec
- SPECS/procmail/procmail.spec
- SPECS/python-antlrpythonruntime/python-antlrpythonruntime.spec
- SPECS/python-jinja2/python-jinja2.spec
- SPECS/python-lockfile/python-lockfile.spec
- SPECS/python-pip/python-pip.spec
- SPECS/python-pycparser/python-pycparser.spec
- SPECS/rpm-ostree/rpm-ostree.spec
- SPECS/rpm/rpm-4.11.2-cve-2014-8118.patch
- SPECS/rpm/rpm.spec
- SPECS/runit/runit.spec
- SPECS/sysstat/sysstat.spec
- SPECS/tcsh/tcsh.spec
- SPECS/tdnf/tdnf.spec
- SPECS/thin-provisioning-tools/thin-provisioning-tools.spec
- SPECS/traceroute/traceroute.spec
- SPECS/unzip/unzip.spec
- SPECS/vsftpd/vsftpd.spec
- SPECS/xfsprogs/xfsprogs.spec
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Create deltas between rpms |
| 2 | 2 |
Name: deltarpm |
| 3 | 3 |
Version: 3.6 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
License: BSD |
| 6 | 6 |
Group: Applications/System |
| 7 | 7 |
Vendor: VMware, Inc. |
| ... | ... |
@@ -63,8 +63,10 @@ deltarpms can also work with installed rpms. |
| 63 | 63 |
%{python_sitelib}/*
|
| 64 | 64 |
|
| 65 | 65 |
%changelog |
| 66 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.6-2 |
|
| 67 |
-- GA - Bump release of all rpms |
|
| 66 |
+* Fri Sep 29 2017 Alexey Makhalov <amakhalov@vmware.com> 3.6-3 |
|
| 67 |
+- rpm version update |
|
| 68 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.6-2 |
|
| 69 |
+- GA - Bump release of all rpms |
|
| 68 | 70 |
* Tue Apr 28 2015 Fabio Rapposelli <fabio@vmware.com> - 3.6-2 |
| 69 | 71 |
- Fixed Python install. |
| 70 | 72 |
|
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
Summary: Simple package manager built on top of hawkey and librepo |
| 5 | 5 |
Name: libhif |
| 6 | 6 |
Version: 0.2.2 |
| 7 |
-Release: 2%{?dist}
|
|
| 7 |
+Release: 3%{?dist}
|
|
| 8 | 8 |
License: LGPLv2+ |
| 9 | 9 |
URL: https://github.com/hughsie/libhif |
| 10 | 10 |
Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
|
| ... | ... |
@@ -82,9 +82,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libhif*.la
|
| 82 | 82 |
%{_datadir}/gir-1.0/*.gir
|
| 83 | 83 |
|
| 84 | 84 |
%changelog |
| 85 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.2.2-2 |
|
| 86 |
-- GA - Bump release of all rpms |
|
| 87 |
-* Tue Feb 23 2016 Kumar Kaushik <kaushikk@vmware.com> 0.2.2-1 |
|
| 88 |
-- Updated to new version. |
|
| 89 |
-* Wed Jun 17 2015 Anish Swaminathan <anishs@vmware.com> 0.2.0-1 |
|
| 90 |
-- Updated version |
|
| 85 |
+* Fri Sep 29 2017 Alexey Makhalov <amakhalov@vmware.com> 0.2.2-3 |
|
| 86 |
+- rpm version update |
|
| 87 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.2.2-2 |
|
| 88 |
+- GA - Bump release of all rpms |
|
| 89 |
+* Tue Feb 23 2016 Kumar Kaushik <kaushikk@vmware.com> 0.2.2-1 |
|
| 90 |
+- Updated to new version. |
|
| 91 |
+* Wed Jun 17 2015 Anish Swaminathan <anishs@vmware.com> 0.2.0-1 |
|
| 92 |
+- Updated version |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Libsolv-0.6.19 |
| 2 | 2 |
Name: libsolv |
| 3 | 3 |
Version: 0.6.19 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
License: BSD |
| 6 | 6 |
URL: https://github.com/openSUSE/libsolv |
| 7 | 7 |
Source0: https://github.com/openSUSE/libsolv/archive/%{name}-%{version}.tar.gz
|
| ... | ... |
@@ -24,7 +24,9 @@ It supports debian, rpm, archlinux and haiku style distributions. |
| 24 | 24 |
%build |
| 25 | 25 |
cmake \ |
| 26 | 26 |
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
| 27 |
- -DRPM5=ON |
|
| 27 |
+ -DRPM5=ON \ |
|
| 28 |
+ -DENABLE_RPMDB=ON \ |
|
| 29 |
+ -DENABLE_COMPLEX_DEPS=ON |
|
| 28 | 30 |
make %{?_smp_mflags}
|
| 29 | 31 |
%install |
| 30 | 32 |
make DESTDIR=%{buildroot} install
|
| ... | ... |
@@ -38,8 +40,10 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
| 38 | 38 |
/usr/share/* |
| 39 | 39 |
%{_includedir}/*
|
| 40 | 40 |
%changelog |
| 41 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6.19-2 |
|
| 42 |
-- GA - Bump release of all rpms |
|
| 41 |
+* Fri Sep 29 2017 Alexey Makhalov <amakhalov@vmware.com> 0.6.19-3 |
|
| 42 |
+- added compile flag to support rich dependencies |
|
| 43 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6.19-2 |
|
| 44 |
+- GA - Bump release of all rpms |
|
| 43 | 45 |
* Tue Feb 23 2016 Anish Swaminathan <anishs@vmware.com> 0.6.19-1 |
| 44 | 46 |
- Upgrade to 0.6.19 |
| 45 | 47 |
* Fri Jan 22 2016 Xiaolin Li <xiaolinl@vmware.com> 0.6.17-1 |
| ... | ... |
@@ -1,3 +1,6 @@ |
| 1 |
+# FIXME: noarch or generate debuginfo |
|
| 2 |
+%define debug_package %{nil}
|
|
| 3 |
+ |
|
| 1 | 4 |
%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
|
| 2 | 5 |
%{!?python3_version: %define python3_version %(python3 -c "import sys; sys.stdout.write(sys.version[:3])")}
|
| 3 | 6 |
|
| ... | ... |
@@ -1,3 +1,6 @@ |
| 1 |
+# FIXME: noarch or generate debuginfo |
|
| 2 |
+%define debug_package %{nil}
|
|
| 3 |
+ |
|
| 1 | 4 |
%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
|
| 2 | 5 |
%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
|
| 3 | 6 |
|
| ... | ... |
@@ -1,3 +1,6 @@ |
| 1 |
+# FIXME: noarch or generate debuginfo |
|
| 2 |
+%define debug_package %{nil}
|
|
| 3 |
+ |
|
| 1 | 4 |
%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
|
| 2 | 5 |
%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
|
| 3 | 6 |
Summary: Python C parser |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Commit RPMs to an OSTree repository |
| 2 | 2 |
Name: rpm-ostree |
| 3 | 3 |
Version: 2015.7 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
Source0: rpm-ostree-%{version}.tar.gz
|
| 6 | 6 |
%define sha1 rpm-ostree=9a0fa260d8671d9998b5f5509de1bbadd42f7127 |
| 7 | 7 |
Source1: libglnx-58a9a5c.tar.gz |
| ... | ... |
@@ -87,6 +87,8 @@ find %{buildroot} -name '*.la' -delete
|
| 87 | 87 |
%{_datadir}/gir-1.0/*-1.0.gir
|
| 88 | 88 |
|
| 89 | 89 |
%changelog |
| 90 |
+* Fri Sep 29 2017 Alexey Makhalov <amakhalov@vmware.com> 2015.7-3 |
|
| 91 |
+- rpm version update |
|
| 90 | 92 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2015.7-2 |
| 91 | 93 |
- GA - Bump release of all rpms |
| 92 | 94 |
* Thu Jun 18 2015 Anish Swaminathan <anishs@vmware.com> 2015.7-1 |
| 93 | 95 |
deleted file mode 100644 |
| ... | ... |
@@ -1,12 +0,0 @@ |
| 1 |
-+++ b/lib/cpio.c 2016-10-18 22:37:07.136000000 +0000 |
|
| 2 |
-@@ -296,6 +296,9 @@ |
|
| 3 |
- st->st_rdev = makedev(major, minor); |
|
| 4 |
- |
|
| 5 |
- GET_NUM_FIELD(hdr.namesize, nameSize); |
|
| 6 |
-+ if (nameSize <= 0 || nameSize > 4096) {
|
|
| 7 |
-+ return CPIOERR_BAD_HEADER; |
|
| 8 |
-+ } |
|
| 9 |
- |
|
| 10 |
- *path = xmalloc(nameSize + 1); |
|
| 11 |
- read = Fread(*path, nameSize, 1, cpio->fd); |
| ... | ... |
@@ -3,20 +3,19 @@ |
| 3 | 3 |
|
| 4 | 4 |
Summary: Package manager |
| 5 | 5 |
Name: rpm |
| 6 |
-Version: 4.11.2 |
|
| 7 |
-Release: 14%{?dist}
|
|
| 6 |
+Version: 4.13.0.1 |
|
| 7 |
+Release: 1%{?dist}
|
|
| 8 | 8 |
License: GPLv2+ |
| 9 | 9 |
URL: http://rpm.org |
| 10 | 10 |
Group: Applications/System |
| 11 | 11 |
Vendor: VMware, Inc. |
| 12 | 12 |
Distribution: Photon |
| 13 |
-Source0: http://rpm.org/releases/rpm-4.11.x/%{name}-%{version}.tar.bz2
|
|
| 14 |
-%define sha1 rpm-4.11.2=ceef44bd180d48d4004c437bc31a3ea038f54e3e |
|
| 13 |
+Source0: https://github.com/rpm-software-management/rpm/archive/%{name}-%{version}-release.tar.gz
|
|
| 14 |
+%define sha1 rpm=2119489397d7e4da19320ef9330ab717ac05587d |
|
| 15 | 15 |
Source1: http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz |
| 16 | 16 |
%define sha1 db=fa3f8a41ad5101f43d08bc0efb6241c9b6fc1ae9 |
| 17 | 17 |
Source2: rpm-system-configuring-scripts-2.2.tar.gz |
| 18 | 18 |
%define sha1 rpm-system-configuring-scripts=9461cdc0b65f7ecc244bfa09886b4123e55ab5a8 |
| 19 |
-Patch0: rpm-4.11.2-cve-2014-8118.patch |
|
| 20 | 19 |
Patch1: find-debuginfo-do-not-generate-non-existing-build-id.patch |
| 21 | 20 |
Patch2: find-debuginfo-do-not-generate-dir-entries.patch |
| 22 | 21 |
#Requires: nspr |
| ... | ... |
@@ -73,15 +72,15 @@ Requires: python3 |
| 73 | 73 |
Python3 rpm. |
| 74 | 74 |
|
| 75 | 75 |
%prep |
| 76 |
-%setup -q |
|
| 77 |
-%setup -q -T -D -a 1 |
|
| 78 |
-%setup -q -T -D -a 2 |
|
| 76 |
+%setup -n rpm-%{name}-%{version}-release
|
|
| 77 |
+%setup -n rpm-%{name}-%{version}-release -T -D -a 1
|
|
| 78 |
+%setup -n rpm-%{name}-%{version}-release -T -D -a 2
|
|
| 79 | 79 |
mv db-5.3.28 db |
| 80 |
-%patch0 -p1 |
|
| 81 | 80 |
%patch1 -p1 |
| 82 | 81 |
%patch2 -p1 |
| 83 | 82 |
|
| 84 | 83 |
%build |
| 84 |
+sed -i '/define _GNU_SOURCE/a #include "../config.h"' tools/sepdebugcrcfix.c |
|
| 85 | 85 |
./autogen.sh --noconfigure |
| 86 | 86 |
./configure \ |
| 87 | 87 |
CPPFLAGS='-I/usr/include/nspr -I/usr/include/nss -DLUA_COMPAT_APIINTCASTS' \ |
| ... | ... |
@@ -99,6 +98,7 @@ mv db-5.3.28 db |
| 99 | 99 |
--sharedstatedir=%{_sharedstatedir} \
|
| 100 | 100 |
--mandir=%{_mandir} \
|
| 101 | 101 |
--infodir=%{_infodir} \
|
| 102 |
+ --without-archive \ |
|
| 102 | 103 |
--disable-dependency-tracking \ |
| 103 | 104 |
--disable-static \ |
| 104 | 105 |
--enable-python \ |
| ... | ... |
@@ -153,9 +153,7 @@ rm -rf %{buildroot}
|
| 153 | 153 |
%{_libdir}/rpm/config.guess
|
| 154 | 154 |
%{_libdir}/rpm/config.sub
|
| 155 | 155 |
%{_libdir}/rpm/debugedit
|
| 156 |
-%{_libdir}/rpm/desktop-file.prov
|
|
| 157 | 156 |
%{_libdir}/rpm/elfdeps
|
| 158 |
-%{_libdir}/rpm/fontconfig.prov
|
|
| 159 | 157 |
%{_libdir}/rpm/libtooldeps.sh
|
| 160 | 158 |
%{_libdir}/rpm/macros
|
| 161 | 159 |
%{_libdir}/rpm/mkinstalldirs
|
| ... | ... |
@@ -168,7 +166,7 @@ rm -rf %{buildroot}
|
| 168 | 168 |
%{_libdir}/rpm/rpm2cpio.sh
|
| 169 | 169 |
%{_libdir}/rpm/rpmdb_*
|
| 170 | 170 |
%{_libdir}/rpm/rpmdeps
|
| 171 |
-%{_libdir}/rpm/rpmpopt-4.11.2
|
|
| 171 |
+%{_libdir}/rpm/rpmpopt*
|
|
| 172 | 172 |
%{_libdir}/rpm/rpmrc
|
| 173 | 173 |
%{_libdir}/rpm/tgpg
|
| 174 | 174 |
%{_libdir}/librpmbuild.so
|
| ... | ... |
@@ -195,27 +193,22 @@ rm -rf %{buildroot}
|
| 195 | 195 |
%{_bindir}/rpmbuild
|
| 196 | 196 |
%{_bindir}/rpmsign
|
| 197 | 197 |
%{_bindir}/rpmspec
|
| 198 |
-%{_libdir}/rpm/osgideps.pl
|
|
| 199 |
-%{_libdir}/rpm/perldeps.pl
|
|
| 200 |
-%{_libdir}/rpm/macros.perl
|
|
| 201 |
-%{_libdir}/rpm/perl.prov
|
|
| 198 |
+%{_libdir}/rpm/macros.*
|
|
| 202 | 199 |
%{_libdir}/rpm/perl.req
|
| 203 |
-%{_libdir}/rpm/perldeps.pl
|
|
| 204 | 200 |
%{_libdir}/rpm/find-debuginfo.sh
|
| 205 | 201 |
%{_libdir}/rpm/find-lang.sh
|
| 206 | 202 |
%{_libdir}/rpm/find-provides
|
| 207 | 203 |
%{_libdir}/rpm/find-requires
|
| 208 | 204 |
%{_libdir}/rpm/brp-*
|
| 205 |
+%{_libdir}/rpm/*.prov
|
|
| 209 | 206 |
%{_libdir}/rpm/mono-find-provides
|
| 210 | 207 |
%{_libdir}/rpm/mono-find-requires
|
| 211 | 208 |
%{_libdir}/rpm/ocaml-find-provides.sh
|
| 212 | 209 |
%{_libdir}/rpm/ocaml-find-requires.sh
|
| 213 |
-%{_libdir}/rpm/macros.perl
|
|
| 214 |
-%{_libdir}/rpm/macros.php
|
|
| 215 |
-%{_libdir}/rpm/macros.python
|
|
| 210 |
+%{_libdir}/rpm/macros.*
|
|
| 216 | 211 |
%{_libdir}/rpm/fileattrs/*
|
| 217 | 212 |
%{_libdir}/rpm/script.req
|
| 218 |
-%{_libdir}/rpm/tcl.req
|
|
| 213 |
+%{_libdir}/rpm/sepdebugcrcfix
|
|
| 219 | 214 |
|
| 220 | 215 |
%{_mandir}/man1/gendiff.1*
|
| 221 | 216 |
%{_mandir}/man8/rpmbuild.8*
|
| ... | ... |
@@ -241,6 +234,8 @@ rm -rf %{buildroot}
|
| 241 | 241 |
%{python3_sitelib}/*
|
| 242 | 242 |
|
| 243 | 243 |
%changelog |
| 244 |
+* Fri Sep 29 2017 Alexey Makhalov <amakhalov@vmware.com> 4.13.0.1-1 |
|
| 245 |
+- rpm version update |
|
| 244 | 246 |
* Mon Jul 10 2017 Divya Thaluru <dthaluru@vmware.com> 4.11.2-14 |
| 245 | 247 |
- Do not allow -debuginfo to own directories to avoid conflicts with |
| 246 | 248 |
- find-debuginfo...patch: exclude non existing .build-id from packaging |
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
Summary: dnf/yum equivalent using C libs |
| 5 | 5 |
Name: tdnf |
| 6 | 6 |
Version: 1.1.0 |
| 7 |
-Release: 1%{?dist}
|
|
| 7 |
+Release: 2%{?dist}
|
|
| 8 | 8 |
Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
License: VMware |
| ... | ... |
@@ -91,6 +91,8 @@ ln -sf %{_bindir}/tdnf %{buildroot}%{_bindir}/tyum
|
| 91 | 91 |
%{_libdir}/pkgconfig/tdnf.pc
|
| 92 | 92 |
|
| 93 | 93 |
%changelog |
| 94 |
+* Fri Sep 29 2017 Alexey Makhalov <amakhalov@vmware.com> 1.1.0-2 |
|
| 95 |
+- rpm version update |
|
| 94 | 96 |
* Thu Dec 08 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.1.0-1 |
| 95 | 97 |
- update to v1.1.0 |
| 96 | 98 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0.9-2 |