diff --git a/.gitignore b/.gitignore index e3ffee7..78b6b31 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/bubblewrap-0.1.1.tar.gz -SOURCES/rpm-ostree-2016.11.tar.xz +SOURCES/rpm-ostree-2016.13.tar.xz diff --git a/.rpm-ostree.metadata b/.rpm-ostree.metadata index e7eb271..cfa53ca 100644 --- a/.rpm-ostree.metadata +++ b/.rpm-ostree.metadata @@ -1,2 +1,2 @@ 903322415b3e8824c6d6513a25a8b3ca03083186 SOURCES/bubblewrap-0.1.1.tar.gz -d883126d557e57ac4136efca874cff417080e055 SOURCES/rpm-ostree-2016.11.tar.xz +d2a5234a6b1bc97edb8d16652fffb4f78be6b652 SOURCES/rpm-ostree-2016.13.tar.xz diff --git a/SOURCES/0001-daemon-use-refspec-after-pulling-ancestry.patch b/SOURCES/0001-daemon-use-refspec-after-pulling-ancestry.patch deleted file mode 100644 index ca4af71..0000000 --- a/SOURCES/0001-daemon-use-refspec-after-pulling-ancestry.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 47ba21aca15be084deda0f9d80336ce0cb2717cc Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon -Date: Mon, 31 Oct 2016 12:19:08 -0400 -Subject: [PATCH] daemon: use refspec after pulling ancestry - -Previously, in preparation for validating e.g. versions during 'deploy' -operations, we would pull the latest commit metadata. However, we would -then do resolve on the branch name only rather than the full refspec. -But this can sometimes give the wrong checksum. For example, if we have -multiple remotes holding the same branch name, ostree_repo_resolve_rev -will just start looking in each remote for the specified ref, and we may -thus end up with the checksum from the wrong remote. - -Related: RHBZ#1390259 - -Closes: #507 -Approved by: cgwalters ---- - src/daemon/rpmostreed-utils.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/daemon/rpmostreed-utils.c b/src/daemon/rpmostreed-utils.c -index d0f0abb..2f3aa5c 100644 ---- a/src/daemon/rpmostreed-utils.c -+++ b/src/daemon/rpmostreed-utils.c -@@ -301,7 +301,7 @@ rpmostreed_repo_pull_ancestry (OstreeRepo *repo, - /* First pass only. Now we can resolve the ref to a checksum. */ - if (checksum == NULL) - { -- if (!ostree_repo_resolve_rev (repo, ref, FALSE, &checksum, error)) -+ if (!ostree_repo_resolve_rev (repo, refspec, FALSE, &checksum, error)) - goto out; - } - --- -2.7.4 - diff --git a/SPECS/rpm-ostree.spec b/SPECS/rpm-ostree.spec index de92ead..d486c6c 100644 --- a/SPECS/rpm-ostree.spec +++ b/SPECS/rpm-ostree.spec @@ -1,14 +1,13 @@ %global bubblewrap_version 0.1.1 Summary: Client side upgrade program and server side compose tool Name: rpm-ostree -Version: 2016.11 -Release: 2.atomic%{?dist} +Version: 2016.13 +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 -Patch0: 0001-daemon-use-refspec-after-pulling-ancestry.patch License: LGPLv2+ URL: https://github.com/projectatomic/rpm-ostree Source1: bubblewrap-%{bubblewrap_version}.tar.gz @@ -133,6 +132,10 @@ python autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Mon Dec 12 2016 walters@redhat.com - 2016.13-1.atomic +- New upstream version +- Resolves: #1403933 + * Mon Oct 24 2016 Colin Walters - New upstream version