dist-git conversion

- Drop no longer necessary references to BuildRoot:

.cvsignore

@@ -1 +0,0 @@
-volume_key-0.3.1.tar.bz2

.gitignore

@@ -0,0 +1 @@
+volume_key-0.3.3.tar.xz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: volume_key
-# $Id: Makefile,v 1.1 2009/07/21 15:25:19 tibbs Exp $
-NAME := volume_key
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-c5fc7956e691db0ca428a8686bfa47db  volume_key-0.3.1.tar.bz2
+9d2d902e9f17d5c4a0d8fe7e907660a0  volume_key-0.3.3.tar.xz

volume_key-0.3.1-empty-passphrase.patch

@@ -1,56 +0,0 @@
-commit 02ba974efaf3b12f548d83f0584917dfcfd1cb1b
-Author: Miloslav Trmač <mitr@redhat.com>
-Date:   Fri Feb 5 17:53:21 2010 +0100
-
-    Fix crash if passphrase_ui_cb () fails.
-    
-    2010-02-05  Miloslav Trmač  <mitr@redhat.com>
-    
-    	* src/volume_key.c (pos_init): Set *error if passphrase_ui_cb () fails.
-
-diff --git a/ChangeLog b/ChangeLog
-index 72f053b..1ab28d0 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,7 @@
-+2010-02-05  Miloslav Trmač  <mitr@redhat.com>
-+
-+	* src/volume_key.c (pos_init): Set *error if passphrase_ui_cb () fails.
-+
- 2009-12-11  Miloslav Trmač  <mitr@redhat.com>
- 
- 	* configure.ac: Release 0.3.1.
-diff --git a/src/volume_key.c b/src/volume_key.c
-index 361aa86..68c837a 100644
---- a/src/volume_key.c
-+++ b/src/volume_key.c
-@@ -581,7 +581,7 @@ pos_init (struct packet_output_state *pos, GError **error)
- 					 : _("Passphrases do not match.  "
- 					     "New packet passphrase"), failed);
- 	  if (passphrase == NULL)
--	    return -1;
-+	    goto no_passphrase;
- 	  passphrase2 = passphrase_ui_cb (NULL,
- 					  _("Repeat new packet passphrase"),
- 					  failed);
-@@ -589,7 +589,7 @@ pos_init (struct packet_output_state *pos, GError **error)
- 	    {
- 	      memset (passphrase, 0, strlen (passphrase));
- 	      g_free (passphrase);
--	      return -1;
-+	      goto no_passphrase;
- 	    }
- 	  passphrase_ok = strcmp (passphrase, passphrase2) == 0;
- 	  memset (passphrase2, 0, strlen (passphrase2));
-@@ -607,6 +607,11 @@ pos_init (struct packet_output_state *pos, GError **error)
-       pos->passphrase = passphrase;
-     }
-   return 0;
-+
-+ no_passphrase:
-+  g_set_error (error, LIBVK_ERROR, LIBVK_ERROR_UI_NO_RESPONSE,
-+	       _("Passphrase not provided"));
-+  return -1;
- }
- 
- /* Free data in POS */

volume_key.spec

@@ -2,17 +2,14 @@
 
 Summary: An utility for manipulating storage encryption keys and passphrases
 Name: volume_key
-Version: 0.3.1
-Release: 2%{?dist}
+Version: 0.3.3
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/volume_key/
 Requires: volume_key-libs = %{version}-%{release}
 
-Source0: https://fedorahosted.org/releases/v/o/volume_key/volume_key-%{version}.tar.bz2
-# Committed upstrean
-Patch0: volume_key-0.3.1-empty-passphrase.patch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Source0: https://fedorahosted.org/releases/v/o/volume_key/volume_key-%{version}.tar.xz
 BuildRequires: cryptsetup-luks-devel, gettext-devel, glib2-devel, gnupg
 BuildRequires: gpgme-devel, libblkid-devel, nss-devel, python-devel
 
@@ -76,15 +73,12 @@ for other formats is possible, some formats are planned for future releases.
 
 %prep
 %setup -q
-%patch0 -p1 -b .empty-passphrase
 
 %build
 %configure
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 %find_lang volume_key
@@ -119,6 +113,13 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/volume_key.py*
 
 %changelog
+* Fri Mar 26 2010 Miloslav Trmač <mitr@redhat.com> - 0.3.3-1
+- Update to volume_key-0.3.3
+
+* Thu Mar  4 2010 Miloslav Trmač <mitr@redhat.com> - 0.3.2-1
+- Update to volume_key-0.3.2
+- Drop no longer necessary references to BuildRoot:
+
 * Fri Feb  5 2010 Miloslav Trmač <mitr@redhat.com> - 0.3.1-2
 - Fix a crash when an empty passphrase is provided
   Resolves: #558410