diff --git a/rpm-ostree.spec b/rpm-ostree.spec index f82ac87..d4c4d35 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -1,4 +1,3 @@ -%bcond_without bundled_libhif Summary: Client side upgrade program and server side compose tool Name: rpm-ostree Version: 2016.3.3.g17fb980 @@ -6,15 +5,6 @@ Release: 2%{?dist} #VCS: https://github.com/cgwalters/rpm-ostree # This tarball is generated via "make -f Makefile.dist-packaging dist-snapshot" 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 # We always run autogen.sh @@ -38,7 +28,7 @@ BuildRequires: libattr-devel # We currently interact directly with librepo BuildRequires: pkgconfig(librepo) -%if %{with bundled_libhif} +# libhif bundling # We're using RPATH to pick up our bundled version %global __requires_exclude ^libhif[.]so[.].*$ @@ -52,9 +42,6 @@ BuildRequires: libsolv-devel %else BuildRequires: pkgconfig(libsolv) %endif -%else -BuildRequires: pkgconfig(libhif) -%endif Requires: ostree >= 2014.6 @@ -78,58 +65,13 @@ 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 . - make %{?_smp_mflags} - cat > libhif/libhif.pc<