From bf70febde4b7541c4da593371abd66fb4aa80fd6 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 03 2016 20:24:00 +0000
Subject: import rpm-ostree-2016.5-1.atomic.el7


---

diff --git a/.gitignore b/.gitignore
index 2c973cb..b2234d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/libhif.tar.gz
-SOURCES/rpm-ostree-2016.3.1.g5bd7211.tar.xz
+SOURCES/bubblewrap-0.1.1.tar.gz
+SOURCES/rpm-ostree-2016.5.tar.xz
diff --git a/.rpm-ostree.metadata b/.rpm-ostree.metadata
index 9964098..9f81a3b 100644
--- a/.rpm-ostree.metadata
+++ b/.rpm-ostree.metadata
@@ -1,2 +1,2 @@
-c88de10d768aef159dfe56ae0fc46f65d7263958 SOURCES/libhif.tar.gz
-a8d96d36425c030ac8360f1a825c4d6b078860be SOURCES/rpm-ostree-2016.3.1.g5bd7211.tar.xz
+903322415b3e8824c6d6513a25a8b3ca03083186 SOURCES/bubblewrap-0.1.1.tar.gz
+8698ea1e0e1218a5f5a7595c6ef4eb6dd0a3d2b3 SOURCES/rpm-ostree-2016.5.tar.xz
diff --git a/SPECS/rpm-ostree.spec b/SPECS/rpm-ostree.spec
index c561c7a..4b109c4 100644
--- a/SPECS/rpm-ostree.spec
+++ b/SPECS/rpm-ostree.spec
@@ -1,24 +1,18 @@
-%bcond_without bundled_libhif
+%global bubblewrap_version 0.1.1
 Summary: Client side upgrade program and server side compose tool
 Name: rpm-ostree
-Version: 2016.3.1.g5bd7211
+Version: 2016.5
 Release: 1.atomic%{?dist}
 #VCS: https://github.com/cgwalters/rpm-ostree
 # This tarball is generated via "make -f Makefile.dist-packaging dist-snapshot"
 # because github doesn't support placing submodules in tarballs and RPM
 # doesn't understand git.
 Source0: rpm-ostree-%{version}.tar.xz
-# https://github.com/rpm-software-management/libhif
-# Bundled because the library is API/ABI unstable, and we're trying to
-# avoid being version locked with PackageKit/dnf right now.
-# This source is generated via
-#   git archive --format=tar --prefix=libhif/ 
-%if %{with bundled_libhif}
-Source1: libhif.tar.gz
-Provides: bundled(libhif) = 0.7.0
-%endif
 License: LGPLv2+
 URL: https://github.com/projectatomic/rpm-ostree
+Source1: bubblewrap-%{bubblewrap_version}.tar.gz
+
+Requires: ostree-fuse
 
 # We always run autogen.sh
 BuildRequires: autoconf automake libtool git
@@ -33,6 +27,8 @@ BuildRequires: pkgconfig(libgsystem)
 BuildRequires: pkgconfig(json-glib-1.0)
 BuildRequires: pkgconfig(rpm)
 BuildRequires: pkgconfig(libarchive)
+BuildRequires: pkgconfig(libsystemd)
+BuildRequires: gperf
 BuildRequires: libcap-devel
 BuildRequires: libattr-devel
 
@@ -42,7 +38,6 @@ BuildRequires: pkgconfig(librepo)
 # We're using RPATH to pick up our bundled version
 %global __requires_exclude ^libhif[.]so[.].*$
 
-%if %{with bundled_libhif}
 BuildRequires: cmake
 BuildRequires: pkgconfig(expat)
 BuildRequires: pkgconfig(check)
@@ -53,9 +48,6 @@ BuildRequires: libsolv-devel
 %else
 BuildRequires: pkgconfig(libsolv)
 %endif
-%else
-BuildRequires: pkgconfig(libhif)
-%endif
 
 %description
 This tool binds together the world of RPM packages with the OSTree
@@ -72,53 +64,23 @@ The %{name}-devel package includes the header files for the %{name} library.
 
 %prep
 %autosetup -Sgit -n %{name}-%{version}
-%if %{with bundled_libhif}
 tar xf %{SOURCE1}
-%endif
 
 %build
-%if %{with bundled_libhif}
-(cd libhif
- cmake \
-     -DCMAKE_INSTALL_PREFIX:PATH=%{_libexecdir}/rpm-ostree \
-     -DINCLUDE_INSTALL_DIR:PATH=%{_libexecdir}/rpm-ostree/include \
-     -DLIB_INSTALL_DIR:PATH=%{_libexecdir}/rpm-ostree \
-     -DSYSCONF_INSTALL_DIR:PATH=%{_libexecdir}/rpm-ostree/etc \
-     -DSHARE_INSTALL_PREFIX:PATH=%{_libexecdir}/rpm-ostree/share \
-     -DLIB_SUFFIX=64 \
-     -DBUILD_SHARED_LIBS:BOOL=ON .
+(cd bubblewrap-%{bubblewrap_version} &&
+ env NOCONFIGURE=1 ./autogen.sh &&
+ %configure --disable-silent-rules
  make %{?_smp_mflags}
- cat > libhif/libhif.pc<<EOF
-Name: libhif
-Description: Simple package manager interface and librepo
-Version: 
-Requires: glib-2.0, gobject-2.0, librepo, rpm
-Libs: -L$(pwd)/libhif -lhif
-Cflags: -I$(pwd) -I$(pwd)/libhif
-EOF
 )
-export PKG_CONFIG_PATH=$(pwd)/libhif/libhif${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
-export LD_LIBRARY_PATH=$(pwd)/libhif/libhif${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-%endif
 env NOCONFIGURE=1 ./autogen.sh
-%configure --disable-silent-rules --enable-gtk-doc LDFLAGS='-Wl,-rpath=%{_libdir}/rpm-ostree'
+%configure --disable-silent-rules --enable-gtk-doc  --with-bubblewrap=%{_libdir}/rpm-ostree/bwrap
 make %{?_smp_mflags}
 
 %install
-%if %{with bundled_libhif}
-(cd libhif
- make install DESTDIR=$RPM_BUILD_ROOT
- for path in %{_libdir}/python2.7 %{_libexecdir}/rpm-ostree/include %{_libexecdir}/rpm-ostree/pkg-config \
-	     %{_libexecdir}/rpm-ostree/share/man; do \
-     rm $RPM_BUILD_ROOT/${path} -rf; \
- done
- install -d $RPM_BUILD_ROOT/%{_libdir}/rpm-ostree
- # Cherry pick the shared library...
- mv $RPM_BUILD_ROOT/%{_libexecdir}/rpm-ostree/lib*/libhif*.so.* $RPM_BUILD_ROOT/%{_libdir}/rpm-ostree
- # and nuke everything else.
- rm $RPM_BUILD_ROOT/%{_libexecdir}/rpm-ostree -rf
+(cd bubblewrap-%{bubblewrap_version} &&
+ install -d -m 0755 $RPM_BUILD_ROOT/%{_libdir}/rpm-ostree
+ install -m 0755 bwrap $RPM_BUILD_ROOT/%{_libdir}/rpm-ostree
 )
-%endif
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
@@ -168,6 +130,12 @@ python autofiles.py > files.devel \
 %files devel -f files.devel
 
 %changelog
+* Mon Jul 25 2016 Colin Walters <walters@redhat.com> - 2016.5-1.atomic
+- New upstream version
+
+* Fri Jul 08 2016 Colin Walters <walters@redhat.com> - 2016.4-2.atomic
+- New upstream version
+
 * Tue Jun 14 2016 Colin Walters <walters@redhat.com> - 2016.3-3.atomic
 - New upstream version