walters pushed to rpm-ostree (master). "Add patch to use yum-deprecated (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 8 16:42:24 UTC 2015
>From 7800f4f443746aeb03345122e1aa555f1504b43f Mon Sep 17 00:00:00 2001
From: Colin Walters <walters at verbum.org>
Date: Wed, 8 Apr 2015 12:42:10 -0400
Subject: Add patch to use yum-deprecated
Resolves: #1209695
diff --git a/0001-treepkgdiff-Adapt-to-Hawkey-0.5.3-API-break.patch b/0001-treepkgdiff-Adapt-to-Hawkey-0.5.3-API-break.patch
deleted file mode 100644
index b4f735a..0000000
--- a/0001-treepkgdiff-Adapt-to-Hawkey-0.5.3-API-break.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 9dcc4c115f1eec17c9fb3dee4d57f63e90c2300c Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Thu, 5 Feb 2015 09:31:48 -0500
-Subject: [PATCH] Adapt to API break
-
----
- configure.ac | 2 ++
- src/rpmostree-treepkgdiff.c | 11 ++++++++++-
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index dcb75a1..6240c88 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -45,6 +45,8 @@ PKG_CHECK_MODULES(PKGDEP_GIO_UNIX, [gio-unix-2.0])
- PKG_CHECK_MODULES(PKGDEP_RPMOSTREE, [gio-unix-2.0 json-glib-1.0
- ostree-1 >= 2015.1 libgsystem >= 2015.1
- rpm hawkey])
-+AS_IF([pkg-config --atleast-version=0.5.3 hawkey],
-+ [AC_DEFINE([BUILDOPT_HAWKEY_SACK_CREATE2], 1, [Hawkey ABI change in 0.5.3])])
- AC_PATH_PROG([XSLTPROC], [xsltproc])
-
- GLIB_TESTS
-diff --git a/src/rpmostree-treepkgdiff.c b/src/rpmostree-treepkgdiff.c
-index f722e7e..6771ad8 100644
---- a/src/rpmostree-treepkgdiff.c
-+++ b/src/rpmostree-treepkgdiff.c
-@@ -38,7 +38,16 @@ rpmostree_get_pkglist_for_root (GFile *root,
- _cleanup_hyquery_ HyQuery query = NULL;
- _cleanup_hypackagelist_ HyPackageList pkglist = NULL;
-
-- sack = hy_sack_create (NULL, NULL, gs_file_get_path_cached (root), 0);
-+#ifdef BUILDOPT_HAWKEY_SACK_CREATE2
-+ sack = hy_sack_create (NULL, NULL,
-+ gs_file_get_path_cached (root),
-+ NULL,
-+ HY_MAKE_CACHE_DIR);
-+#else
-+ sack = hy_sack_create (NULL, NULL,
-+ gs_file_get_path_cached (root),
-+ HY_MAKE_CACHE_DIR);
-+#endif
- if (sack == NULL)
- {
- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
---
-1.8.3.1
-
diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index 0e58fea..b6e0d43 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -1,11 +1,11 @@
Summary: Client side upgrade program and server side compose tool
Name: rpm-ostree
Version: 2015.3
-Release: 5%{?dist}
+Release: 7%{?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
-Patch0: 0001-treepkgdiff-Adapt-to-Hawkey-0.5.3-API-break.patch
+Patch0: 2015.3-yumbased.patch
License: LGPLv2+
URL: https://github.com/cgwalters/rpm-ostree
# We always run autogen.sh
@@ -36,7 +36,7 @@ on client systems as well as server-side composes.
%build
env NOCONFIGURE=1 ./autogen.sh
-%configure --disable-silent-rules --enable-patched-hawkey-and-libsolv
+%configure --disable-silent-rules --enable-patched-hawkey-and-libsolv --with-yum-binary=/usr/bin/yum-deprecated
make %{?_smp_mflags}
%install
@@ -49,6 +49,10 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
%{_mandir}/man*/*.gz
%changelog
+* Wed Apr 08 2015 Colin Walters <walters at redhat.com> - 2015.3-7
+- Add patch to use yum-deprecated
+ Resolves: #1209695
+
* Fri Feb 27 2015 Colin Walters <walters at redhat.com> - 2015.3-5
- Drop /usr/bin/atomic, now provided by the "atomic" package
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/rpm-ostree.git/commit/?h=master&id=7800f4f443746aeb03345122e1aa555f1504b43f
More information about the scm-commits
mailing list