New upstream version

This commit is contained in:
Colin Walters 2016-03-28 12:10:24 -04:00
parent 6d29112807
commit ee00821e45
4 changed files with 6 additions and 29 deletions

1
.gitignore vendored
View File

@ -29,3 +29,4 @@
/rpm-ostree-2015.11.tar.xz
/rpm-ostree-2015.11.43.ga2c052b.tar.xz
/libhif.tar.gz
/rpm-ostree-2016.1.tar.xz

View File

@ -1,25 +0,0 @@
From f46302c2ab64b48cb3df533421eedb97ba676633 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 23 Feb 2016 13:43:26 -0500
Subject: [PATCH] unpacker: Fix a 32 bit format string error
---
src/libpriv/rpmostree-unpacker.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libpriv/rpmostree-unpacker.c b/src/libpriv/rpmostree-unpacker.c
index 5bb61a3..5487a6d 100644
--- a/src/libpriv/rpmostree-unpacker.c
+++ b/src/libpriv/rpmostree-unpacker.c
@@ -894,7 +894,7 @@ get_lead_sig_header_as_bytes (RpmOstreeUnpacker *self,
if (bytes_remaining > 0)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
- "Failed to read %" G_GUINT64_FORMAT " bytes of metadata",
+ "Failed to read %" G_GSIZE_FORMAT " bytes of metadata",
bytes_remaining);
goto out;
}
--
1.8.3.1

View File

@ -1,6 +1,6 @@
Summary: Client side upgrade program and server side compose tool
Name: rpm-ostree
Version: 2015.11.43.ga2c052b
Version: 2016.1
Release: 2%{?dist}
#VCS: https://github.com/cgwalters/rpm-ostree
# This tarball is generated via "make -f Makefile.dist-packaging dist-snapshot"
@ -9,7 +9,6 @@ Source0: rpm-ostree-%{version}.tar.xz
# Bundled because the library is API/ABI unstable, and we're trying to
# avoid being version locked with PackageKit/dnf right now.
Source1: libhif.tar.gz
Patch0: 0001-unpacker-Fix-a-32-bit-format-string-error.patch
Provides: bundled(libhif) = 0.7.0
License: LGPLv2+
URL: https://github.com/projectatomic/rpm-ostree
@ -146,6 +145,9 @@ python autofiles.py > files.devel \
%files devel -f files.devel
%changelog
* Thu Mar 24 2016 Colin Walters <walters@redhat.com> - 2016.1-2
- New upstream version
* Tue Feb 23 2016 Colin Walters <walters@redhat.com> - 2015.11.43.ga2c052b-2
- New git snapshot, just getting some new code out there
- We are now bundling a copy of libhif, as otherwise coordinated releases with

View File

@ -1,2 +1 @@
9d791bf0b79b0607084e23b82cb29fdd libhif.tar.gz
462accee44deef4f9f3b4581976b950c rpm-ostree-2015.11.43.ga2c052b.tar.xz
5fdb7cb4a125c2c2b6259e2c7df28859 rpm-ostree-2016.1.tar.xz