From 190ca1796d2869c434a54a8473f9a9cf457ac069 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 23 2016 23:04:20 +0000
Subject: import rpm-ostree-client-2016.3.1.g5bd7211-2.atomic.el7.1


---

diff --git a/.gitignore b/.gitignore
index 78b3923..2cb11ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-SOURCES/rpm-ostree-client-2015.11.tar.xz
+SOURCES/libhif.tar.gz
+SOURCES/rpm-ostree-client-2016.3.1.g5bd7211.tar.xz
diff --git a/.rpm-ostree-client.metadata b/.rpm-ostree-client.metadata
index e62068f..dc214c7 100644
--- a/.rpm-ostree-client.metadata
+++ b/.rpm-ostree-client.metadata
@@ -1 +1,2 @@
-a5384d48e9ebe1301ddf09f16315466c39f825bb SOURCES/rpm-ostree-client-2015.11.tar.xz
+c88de10d768aef159dfe56ae0fc46f65d7263958 SOURCES/libhif.tar.gz
+26a5e166e508cadd156ef01e3c12724830663b35 SOURCES/rpm-ostree-client-2016.3.1.g5bd7211.tar.xz
diff --git a/SPECS/rpm-ostree-client.spec b/SPECS/rpm-ostree-client.spec
index daafb33..9f8c467 100644
--- a/SPECS/rpm-ostree-client.spec
+++ b/SPECS/rpm-ostree-client.spec
@@ -1,27 +1,59 @@
+%bcond_without bundled_libhif
 Summary: Client side upgrade program
 Name: rpm-ostree-client
-Version: 2015.11
-Release: 1.atomic%{?dist}.1
+Version: 2016.3.1.g5bd7211
+Release: 2.atomic%{?dist}.1
 #VCS: https://github.com/cgwalters/rpm-ostree
 # This tarball is generated via "make -f Makefile.dist-packaging dist-snapshot-without-compose-tooling"
 Source0: rpm-ostree-client-%{version}.tar.xz
 License: LGPLv2+
 URL: https://github.com/projectatomic/rpm-ostree
-BuildRequires: git
+# 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
+
 # We always run autogen.sh
-BuildRequires: autoconf automake libtool
+BuildRequires: autoconf automake libtool git
 # For docs
+BuildRequires: chrpath
 BuildRequires: gtk-doc
 BuildRequires: gnome-common
-BuildRequires: pkgconfig(ostree-1) >= 2014.7
+BuildRequires: gobject-introspection
+# Core requirements
+BuildRequires: pkgconfig(ostree-1) >= 2015.1
 BuildRequires: pkgconfig(libgsystem)
 BuildRequires: pkgconfig(json-glib-1.0)
-BuildRequires: pkgconfig(hawkey) >= 0.5.0
-BuildRequires: pkgconfig(libhif)
 BuildRequires: pkgconfig(rpm)
+BuildRequires: pkgconfig(libarchive)
 BuildRequires: libcap-devel
-
-Requires: ostree >= 2014.7
+BuildRequires: libattr-devel
+
+# We currently interact directly with librepo
+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)
+BuildRequires: python-devel
+BuildRequires: python-sphinx
+%if (0%{?rhel} != 0 && 0%{?rhel} <= 7)
+BuildRequires: libsolv-devel
+%else
+BuildRequires: pkgconfig(libsolv)
+%endif
+%else
+BuildRequires: pkgconfig(libhif)
+%endif
 
 Conflicts: rpm-ostree
 
@@ -32,13 +64,53 @@ usable on client systems to upgrade and rollback.
 
 %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 .
+ 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 --disable-compose-tooling
+%configure --disable-silent-rules --enable-gtk-doc --disable-compose-tooling LDFLAGS='-Wl,-rpath=%{_libdir}/rpm-ostree'
 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
+)
+%endif
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
 find $RPM_BUILD_ROOT -name '*.la' -delete
 rm $RPM_BUILD_ROOT/%{_libdir}/lib*.so
@@ -84,6 +156,9 @@ python autofiles.py > files \
 %doc COPYING README.md
 
 %changelog
+* Tue Jun 14 2016 Colin Walters <walters@redhat.com> - 2016.3.1.g5bd7211-2.atomic.1
+- New upstream version
+
 * Tue Dec 15 2015 Colin Walters <walters@redhat.com> - 2015.11-1.atomic.1
 - New upstream version