@@ -1,7 +1,7 @@

 Summary:        Libsolv-0.6.19

 Name:           libsolv

 Version:        0.6.26

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        BSD

 URL:            https://github.com/openSUSE/libsolv

 Source0:        https://github.com/openSUSE/libsolv/archive/%{name}-%{version}.tar.gz

@@ -32,7 +32,9 @@ for developing applications that use libsolv.

 %build

 cmake \

     -DCMAKE_INSTALL_PREFIX=%{_prefix} \

-    -DRPM5=ON

+    -DRPM5=ON \

+    -DENABLE_RPMDB=ON \

+    -DENABLE_COMPLEX_DEPS=ON

 make %{?_smp_mflags}

 %install

 make DESTDIR=%{buildroot} install

@@ -59,6 +61,8 @@ make %{?_smp_mflags} test

 %{_mandir}/man3/*

 %changelog

+*   Fri Apr 21 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6.26-3

+-   update libdb make config

 *   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 0.6.26-2

 -   Requires expat-libs and expat-devel.

 *   Tue Apr 04 2017 Kumar Kaushik <kaushikk@vmware.com>  0.6.26-1

@@ -1,9 +1,9 @@

 Summary:        Git for operating system binaries

 Name:           ostree

-Version:        2015.7

-Release:        10%{?dist}

+Version:        2017.4

+Release:        1%{?dist}

 Source0:        http://ftp.gnome.org/pub/GNOME/sources/ostree/%{version}/%{name}-%{version}.tar.gz

-%define sha1    ostree=baa502aa46363cd4828d257fb87f5e18a7ed000a

+%define sha1    ostree=eb3546c552849ace2f4e3701bc0b826611f569cc

 Source1:        91-ostree.preset

 License:        LGPLv2+

 URL:            http://live.gnome.org/OSTree

@@ -17,6 +17,7 @@ BuildRequires:  gtk-doc

 BuildRequires:  e2fsprogs-devel

 BuildRequires:  libsoup-devel

 BuildRequires:  autogen

+Requires:       fuse

 Requires:       libgsystem

 Requires:       gpgme

 Requires:       libassuan

@@ -28,6 +29,7 @@ Requires:       dracut

 Requires:       dracut-tools

 Requires:       libarchive

 BuildRequires:  attr-devel

+BuildRequires:  fuse-devel

 BuildRequires:  libgpg-error-devel

 BuildRequires:  python2-libs

 BuildRequires:  python2

@@ -63,7 +65,7 @@ The %{name}-devel package includes the header files for the %{name} library

 %prep

 %setup -n %{name}-%{version}

-(git clone git://git.gnome.org/libglnx libglnx  && cd libglnx && git checkout 900b25f)

+(git clone git://git.gnome.org/libglnx libglnx  && cd libglnx && git checkout 602fdd9)

 (git clone https://github.com/mendsley/bsdiff bsdiff && cd bsdiff && git checkout 1edf9f6)

 %build

@@ -104,8 +106,8 @@ rm -rf %{buildroot}

 %files

 %doc COPYING README.md

 %{_bindir}/ostree

+%{_bindir}/rofiles-fuse

 %{_libdir}/*.so.1*

-%{_sbindir}/*

 %{_mandir}/man*/*.gz

 %{_prefix}/lib/systemd/system-preset/91-ostree.preset

 %{_prefix}/lib/systemd/system/ostree*.service

@@ -116,19 +118,25 @@ rm -rf %{buildroot}

 %{_sysconfdir}/ostree-mkinitcpio.conf

 %dir %{_sysconfdir}/ostree/remotes.d

 %{_libdir}/girepository-*/OSTree-*.typelib

-%{_libexecdir}/ostree/grub2*

+%{_libexecdir}/libostree/grub2*

 %{_libdir}/initcpio/*

-%{_libdir}/lib*.so

-%dir %{_datadir}/gtk-doc/html/ostree

+%{_libdir}/ostree/ostree-prepare-root

+%{_libdir}/ostree/ostree-remount

+%exclude %{_libexecdir}/libostree/ostree-trivial-httpd

+

 %files devel

 %{_includedir}/*

+%{_libdir}/lib*.so

 %{_libdir}/pkgconfig/*

+%dir %{_datadir}/gtk-doc/html/ostree

 %{_datadir}/gtk-doc/html/ostree/*

 %{_datadir}/ostree/*

 %{_datadir}/gir-1.0/OSTree-1.0.gir

 %changelog

+*   Mon Apr 17 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2017.4-1

+-   Update to 2017.4

 *   Wed Feb 01 2017 Xiaolin Li <xiaolinl@vmware.com> 2015.7-10

 -   libglnx: checkout commit 900b25f.

 -   bsdiff:  checkout commit 1edf9f6.

new file mode 100644

@@ -0,0 +1,16 @@

+--- libdnf/CMakeLists.txt	2017-04-18 04:13:32.064049371 +0000

+@@ -26,10 +26,11 @@

+ 

+ # hawkey dependencies

+ find_package (PkgConfig REQUIRED)

++SET (CMAKE_MODULE_PATH /usr/share/cmake/Modules)

++find_package (LibSolv 0.6.26 REQUIRED COMPONENTS ext)

+ SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)

+ PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.44.0 REQUIRED)

+ FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)

+-find_package (LibSolv 0.6.21 REQUIRED COMPONENTS ext)

+ if (ENABLE_RHSM_SUPPORT)

+     pkg_check_modules (RHSM REQUIRED librhsm)

+     include_directories (${RHSM_INCLUDE_DIRS})

+

@@ -1,18 +1,23 @@

 Summary:        Commit RPMs to an OSTree repository

 Name:           rpm-ostree

-Version:        2015.7

-Release:        5%{?dist}

+Version:        2017.4

+Release:        1%{?dist}

 Source0:        rpm-ostree-%{version}.tar.gz

-%define sha1    rpm-ostree=9a0fa260d8671d9998b5f5509de1bbadd42f7127

-Source1:        libglnx-58a9a5c.tar.gz

-%define sha1    libglnx=ba892544e28201508450dd123a4ebd4dfe6d5ea7

+%define sha1    rpm-ostree=d34882a455afbf0b57617c0962725276967e838a

+Source1:        libglnx-0c52d85.tar.gz

+%define sha1    libglnx=137767ad957f37d6210aaa6b28e4333a42aa9fad

+Source2:        libdnf-2086268.tar.gz

+%define sha1    libdnf=4e913da416c61a5525f94ef09f38c658179e3e25

+Patch0:         rpm-ostree-libdnf-build.patch

 License:        LGPLv2+

-URL:            https://github.com/cgwalters/rpm-ostree

+URL:            https://github.com/projectatomic/rpm-ostree

 Vendor:         VMware, Inc.

 Distribution:   Photon

 # We always run autogen.sh

 BuildRequires:  autoconf

 BuildRequires:  automake

+BuildRequires:  check

+BuildRequires:  cmake

 BuildRequires:  libtool

 BuildRequires:  git

 BuildRequires:  json-glib-devel

@@ -24,8 +29,6 @@ BuildRequires:  docbook-xsl

 BuildRequires:  libxslt

 BuildRequires:  gobject-introspection-devel

 BuildRequires:  openssl-devel

-BuildRequires:  libhif-devel >= 0.2.0

-BuildRequires:  hawkey-devel >= 0.4.6

 BuildRequires:  rpm-devel >= 4.11.0

 BuildRequires:  librepo-devel >= 1.7.11

 BuildRequires:  attr-devel

@@ -33,18 +36,19 @@ BuildRequires:  python2-libs

 BuildRequires:  python2

 BuildRequires:  gobject-introspection-python

 BuildRequires:  autogen

-BuildRequires:  libsolv-devel

-

+BuildRequires:  libsolv-devel >= 0.6.26-3

+BuildRequires:  systemd-devel

+BuildRequires:  libarchive-devel

+BuildRequires:  gperf

 BuildRequires:  which

 BuildRequires:  popt-devel

+

 Requires:   libcap

 Requires:   librepo

-Requires:   hawkey

-Requires:   libhif

 Requires:   openssl

 Requires:   ostree

 Requires:   json-glib

-

+Requires:   libsolv >= 0.6.26-3

 %description

 This tool takes a set of packages, and commits them to an OSTree

@@ -60,11 +64,14 @@ Includes the header files for the rpm-ostree library.

 %prep

 %setup -q

-tar xf /usr/src/photon/SOURCES/libglnx-58a9a5c.tar.gz --no-same-owner

+tar xf /usr/src/photon/SOURCES/libglnx-0c52d85.tar.gz --no-same-owner

+tar xf /usr/src/photon/SOURCES/libdnf-2086268.tar.gz --no-same-owner

+%patch0 -p0

 %build

+sed -i '/-DBUILD_SHARED_LIBS/a -DWITH_MAN=OFF \\' configure.ac

 env NOCONFIGURE=1 ./autogen.sh

-%configure --disable-silent-rules --enable-usrbinatomic

+%configure --disable-silent-rules --enable-gtk-doc

 make %{?_smp_mflags}

 %install

@@ -75,22 +82,26 @@ find %{buildroot} -name '*.la' -delete

 make %{?_smp_mflags}  check

 %files

-%{_bindir}/rpm-ostree

-%{_bindir}/atomic

+%{_bindir}/*

 %{_libdir}/%{name}/

 %{_mandir}/man*/*.gz

 %{_libdir}/*.so.1*

 %{_libdir}/girepository-1.0/*.typelib

-

-

+%{_sysconfdir}/dbus-1/system.d/*

+%{_prefix}%{_unitdir}/*.service

+%{_libexecdir}/*

+%{_datadir}/dbus-1/system-services/*

 %files devel

 %{_libdir}/lib*.so

 %{_includedir}/*

 %{_libdir}/pkgconfig/*

+%{_datadir}/gtk-doc/html/*

 %{_datadir}/gir-1.0/*-1.0.gir

 %changelog

+*   Fri Apr 21 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2017.4-1

+-   Update to 2017.4

 *   Mon Dec 19 2016 Xiaolin Li <xiaolinl@vmware.com> 2015.7-5

 -   BuildRequires libsolv-devel.

 *   Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 2015.7-4