Browse code
Fixed ostree build error by checking out the right version of bsdiff and libglnx required by ostree release 2015.7.
Change-Id: I07ab9692c81e61ff2d5bb5ef08feb0c8378df286
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2038
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: suezzelur <anishs@vmware.com>
xiaolin-vmware authored on 2017/02/02 04:47:49Showing 1 changed files
| ... | ... |
@@ -1,39 +1,39 @@ |
| 1 |
-Summary: Git for operating system binaries |
|
| 2 |
-Name: ostree |
|
| 3 |
-Version: 2015.7 |
|
| 4 |
-Release: 9%{?dist}
|
|
| 5 |
-Source0: http://ftp.gnome.org/pub/GNOME/sources/ostree/%{version}/%{name}-%{version}.tar.gz
|
|
| 6 |
-%define sha1 ostree=baa502aa46363cd4828d257fb87f5e18a7ed000a |
|
| 7 |
-Source1: 91-ostree.preset |
|
| 8 |
-License: LGPLv2+ |
|
| 9 |
-URL: http://live.gnome.org/OSTree |
|
| 10 |
-Vendor: VMware, Inc. |
|
| 11 |
-Distribution: Photon |
|
| 12 |
-BuildRequires: git |
|
| 13 |
-BuildRequires: which |
|
| 14 |
-BuildRequires: libgsystem |
|
| 15 |
-BuildRequires: xz-devel |
|
| 16 |
-BuildRequires: gtk-doc |
|
| 17 |
-BuildRequires: e2fsprogs-devel |
|
| 1 |
+Summary: Git for operating system binaries |
|
| 2 |
+Name: ostree |
|
| 3 |
+Version: 2015.7 |
|
| 4 |
+Release: 10%{?dist}
|
|
| 5 |
+Source0: http://ftp.gnome.org/pub/GNOME/sources/ostree/%{version}/%{name}-%{version}.tar.gz
|
|
| 6 |
+%define sha1 ostree=baa502aa46363cd4828d257fb87f5e18a7ed000a |
|
| 7 |
+Source1: 91-ostree.preset |
|
| 8 |
+License: LGPLv2+ |
|
| 9 |
+URL: http://live.gnome.org/OSTree |
|
| 10 |
+Vendor: VMware, Inc. |
|
| 11 |
+Distribution: Photon |
|
| 12 |
+BuildRequires: git |
|
| 13 |
+BuildRequires: which |
|
| 14 |
+BuildRequires: libgsystem |
|
| 15 |
+BuildRequires: xz-devel |
|
| 16 |
+BuildRequires: gtk-doc |
|
| 17 |
+BuildRequires: e2fsprogs-devel |
|
| 18 | 18 |
BuildRequires: libsoup-devel |
| 19 | 19 |
BuildRequires: autogen |
| 20 |
-Requires: libgsystem |
|
| 21 |
-Requires: gpgme |
|
| 22 |
-Requires: libassuan |
|
| 23 |
-Requires: libgpg-error |
|
| 24 |
-Requires: systemd |
|
| 25 |
-Requires: libsoup |
|
| 26 |
-Requires: mkinitcpio |
|
| 27 |
-Requires: dracut |
|
| 28 |
-Requires: dracut-tools |
|
| 29 |
-Requires: libarchive |
|
| 30 |
-BuildRequires: attr-devel |
|
| 31 |
-BuildRequires: libgpg-error-devel |
|
| 32 |
-BuildRequires: python2-libs |
|
| 33 |
-BuildRequires: python2 |
|
| 34 |
-BuildRequires: gobject-introspection |
|
| 35 |
-BuildRequires: gobject-introspection-devel |
|
| 36 |
-BuildRequires: gobject-introspection-python |
|
| 20 |
+Requires: libgsystem |
|
| 21 |
+Requires: gpgme |
|
| 22 |
+Requires: libassuan |
|
| 23 |
+Requires: libgpg-error |
|
| 24 |
+Requires: systemd |
|
| 25 |
+Requires: libsoup |
|
| 26 |
+Requires: mkinitcpio |
|
| 27 |
+Requires: dracut |
|
| 28 |
+Requires: dracut-tools |
|
| 29 |
+Requires: libarchive |
|
| 30 |
+BuildRequires: attr-devel |
|
| 31 |
+BuildRequires: libgpg-error-devel |
|
| 32 |
+BuildRequires: python2-libs |
|
| 33 |
+BuildRequires: python2 |
|
| 34 |
+BuildRequires: gobject-introspection |
|
| 35 |
+BuildRequires: gobject-introspection-devel |
|
| 36 |
+BuildRequires: gobject-introspection-python |
|
| 37 | 37 |
BuildRequires: gpgme-devel |
| 38 | 38 |
BuildRequires: libcap-devel |
| 39 | 39 |
BuildRequires: libsoup |
| ... | ... |
@@ -63,19 +63,18 @@ The %{name}-devel package includes the header files for the %{name} library
|
| 63 | 63 |
|
| 64 | 64 |
%prep |
| 65 | 65 |
%setup -n %{name}-%{version}
|
| 66 |
-git clone git://git.gnome.org/libglnx libglnx |
|
| 67 |
-git clone https://github.com/mendsley/bsdiff bsdiff |
|
| 66 |
+(git clone git://git.gnome.org/libglnx libglnx && cd libglnx && git checkout 900b25f) |
|
| 67 |
+(git clone https://github.com/mendsley/bsdiff bsdiff && cd bsdiff && git checkout 1edf9f6) |
|
| 68 | 68 |
|
| 69 | 69 |
%build |
| 70 | 70 |
env NOCONFIGURE=1 ./autogen.sh |
| 71 | 71 |
%configure \ |
| 72 |
- --disable-silent-rules \ |
|
| 73 |
- --enable-gtk-doc \ |
|
| 74 |
- --with-dracut \ |
|
| 75 |
- --with-mkinitcpio \ |
|
| 72 |
+ --disable-silent-rules \ |
|
| 73 |
+ --enable-gtk-doc \ |
|
| 74 |
+ --with-dracut \ |
|
| 75 |
+ --with-mkinitcpio \ |
|
| 76 | 76 |
--enable-libsoup-client-certs \ |
| 77 |
- --prefix=%{_prefix}
|
|
| 78 |
- |
|
| 77 |
+ --prefix=%{_prefix}
|
|
| 79 | 78 |
make %{?_smp_mflags}
|
| 80 | 79 |
|
| 81 | 80 |
%install |
| ... | ... |
@@ -130,6 +129,9 @@ rm -rf %{buildroot}
|
| 130 | 130 |
%{_datadir}/gir-1.0/OSTree-1.0.gir
|
| 131 | 131 |
|
| 132 | 132 |
%changelog |
| 133 |
+* Wed Feb 01 2017 Xiaolin Li <xiaolinl@vmware.com> 2015.7-10 |
|
| 134 |
+- libglnx: checkout commit 900b25f. |
|
| 135 |
+- bsdiff: checkout commit 1edf9f6. |
|
| 133 | 136 |
* Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 2015.7-9 |
| 134 | 137 |
- BuildRequired attr-devel and libgpg-error-devel |
| 135 | 138 |
* Fri Nov 18 2016 Anish Swaminathan <anishs@vmware.com> 2015.7-8 |