diff --git a/.gitignore b/.gitignore index d63ee25..09fe7c0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ volume_key-0.3.3.tar.xz /volume_key-0.3.4.tar.xz /volume_key-0.3.5.tar.xz /volume_key-0.3.6.tar.xz +/volume_key-0.3.7.tar.xz diff --git a/sources b/sources index e8b031e..f21958a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -117e1762f0fe7761d7eb52271f7d69e3 volume_key-0.3.6.tar.xz +f21b09c67fcaa7be19771d3d3d34a2d7 volume_key-0.3.7.tar.xz diff --git a/volume_key-0.3.6-typo.patch b/volume_key-0.3.6-typo.patch deleted file mode 100644 index cd208e5..0000000 --- a/volume_key-0.3.6-typo.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 9ac4d71ba39c0056cfe5130c70e86325b756e8c2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= -Date: Fri, 10 Jun 2011 19:27:56 +0200 -Subject: [PATCH] Fix a typo in volume_key.8 - ---- - ChangeLog | 5 +++++ - doc/volume_key.8 | 6 +++--- - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index d4c0813..7570b3b 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,8 @@ -+2011-06-10 Miloslav Trmač -+ -+ * doc/volume_key.8: Fix a typo reported by Jacquelynn East -+ . -+ - 2011-03-31 Miloslav Trmač - - * configure.ac: Release 0.3.6. -diff --git a/doc/volume_key.8 b/doc/volume_key.8 -index be75b99..38052e6 100644 ---- a/doc/volume_key.8 -+++ b/doc/volume_key.8 -@@ -1,6 +1,6 @@ - .\" A man page for volume_key(8). - .\" --.\" Copyright (C) 2009, 2010 Red Hat, Inc. All rights reserved. -+.\" Copyright (C) 2009, 2010, 2011 Red Hat, Inc. All rights reserved. - .\" - .\" This copyrighted material is made available to anyone wishing to use, - .\" modify, copy, or redistribute it subject to the terms and conditions of the -@@ -16,7 +16,7 @@ - .\" Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - .\" - .\" Author: Miloslav Trmač ]) --.TH volume_key 8 "Sep 2010" volume_key -+.TH volume_key 8 "Jun 2011" volume_key - - .SH NAME - volume_key \- work with volume encryption secrets and escrow packets -@@ -254,7 +254,7 @@ and - outside of the computer. - - If the user forgets a passphrase, --and the you can access the computer, -+and you can access the computer, - decrypt - .I PACKET_DEFAULT - using the certificate private key --- -1.7.5.2 - diff --git a/volume_key.spec b/volume_key.spec index 446df44..5badc71 100644 --- a/volume_key.spec +++ b/volume_key.spec @@ -2,16 +2,14 @@ Summary: An utility for manipulating storage encryption keys and passphrases Name: volume_key -Version: 0.3.6 -Release: 2%{?dist} +Version: 0.3.7 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: https://fedorahosted.org/volume_key/ Requires: volume_key-libs%{?_isa} = %{version}-%{release} Source0: https://fedorahosted.org/releases/v/o/volume_key/volume_key-%{version}.tar.xz -# Upstream commit 9ac4d71ba39c0056cfe5130c70e86325b756e8c2 -Patch0: volume_key-0.3.6-typo.patch BuildRequires: cryptsetup-luks-devel, gettext-devel, glib2-devel, gnupg BuildRequires: gpgme-devel, libblkid-devel, nss-devel, python-devel @@ -75,7 +73,6 @@ for other formats is possible, some formats are planned for future releases. %prep %setup -q -%patch0 -p1 -b .typo %build %configure @@ -116,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/volume_key.py* %changelog +* Wed Aug 24 2011 Miloslav Trmač - 0.3.7-1 +- Update to volume_key-0.3.7 + * Fri Jun 10 2011 Miloslav Trmač - 0.3.6-2 - Fix a typo Resolves: #712256