rpms/volume_key/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 volume_key.spec, 1.3, 1.4 cryptsetup-svn-r62.patch, 1.1, NONE volume_key-0.2-libblkid-type.patch, 1.1, NONE

Miloslav Trmac mitr at fedoraproject.org
Wed Sep 30 15:47:30 UTC 2009


Author: mitr

Update of /cvs/pkgs/rpms/volume_key/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12227

Modified Files:
	.cvsignore sources volume_key.spec 
Removed Files:
	cryptsetup-svn-r62.patch volume_key-0.2-libblkid-type.patch 
Log Message:
* Wed Sep 30 2009 Miloslav Trmač <mitr at redhat.com> - 0.3-1
- Update to volume_key-0.3.
- Drop bundled libcryptsetup.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Jul 2009 23:16:04 -0000	1.2
+++ .cvsignore	30 Sep 2009 15:47:30 -0000	1.3
@@ -1,2 +1 @@
-volume_key-0.2.tar.bz2
-cryptsetup-1.0.7-rc1.tar.bz2
+volume_key-0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Jul 2009 23:16:05 -0000	1.2
+++ sources	30 Sep 2009 15:47:30 -0000	1.3
@@ -1,2 +1 @@
-882ec96bef41962a33a24d6ee5821a29  volume_key-0.2.tar.bz2
-0910632173fb960252412bf7342b42fc  cryptsetup-1.0.7-rc1.tar.bz2
+fa406b4c4fd444967e413e2fbd6ff528  volume_key-0.3.tar.bz2


Index: volume_key.spec
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/devel/volume_key.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- volume_key.spec	8 Aug 2009 03:34:48 -0000	1.3
+++ volume_key.spec	30 Sep 2009 15:47:30 -0000	1.4
@@ -2,25 +2,17 @@
 
 Summary: An utility for manipulating storage encryption keys and passphrases
 Name: volume_key
-Version: 0.2
-Release: 3
+Version: 0.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
-Source1: http://cryptsetup.googlecode.com/files/cryptsetup-1.0.7-rc1.tar.bz2
-# http://code.google.com/p/cryptsetup/issues/detail?id=15
-Patch0: https://fedorahosted.org/releases/v/o/volume_key/cryptsetup-svn-r62.patch
-Patch1: volume_key-0.2-libblkid-type.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: gettext-devel, glib2-devel, gnupg, gpgme-devel, libblkid-devel
-BuildRequires: nss-devel, python-devel
-
-# For cryptsetup
-BuildRequires: device-mapper-devel, e2fsprogs-devel, libgcrypt-devel
-BuildRequires: libgpg-error-devel, libselinux-devel, libsepol-devel, popt-devel
+BuildRequires: cryptsetup-luks-devel, gettext-devel, glib2-devel, gnupg
+BuildRequires: gpgme-devel, libblkid-devel, nss-devel, python-devel
 
 %description
 This package provides a command-line tool for manipulating storage volume
@@ -81,23 +73,10 @@ volume_key currently supports only the L
 for other formats is possible, some formats are planned for future releases.
 
 %prep
-%setup -q -a 1
-%patch1 -p1 -b .libblkid-type
-pushd cryptsetup-1.0.7-rc1
-%patch0 -p0 -b .cs-vk
-popd
+%setup -q
 
 %build
-cryptsetup_root=$(pwd)/cryptsetup-root
-
-pushd cryptsetup-1.0.7-rc1
-%configure --enable-static --disable-shared --with-pic
-make %{?_smp_mflags}
-make install "DESTDIR=$cryptsetup_root"
-popd
-
-%configure "CPPFLAGS=-I$cryptsetup_root"%{_includedir} \
-	"LDFLAGS=-L$cryptsetup_root"%{_libdir} --disable-static
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -137,6 +116,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/volume_key.py*
 
 %changelog
+* Wed Sep 30 2009 Miloslav Trmač <mitr at redhat.com> - 0.3-1
+- Update to volume_key-0.3.
+- Drop bundled libcryptsetup.
+
 * Sat Aug  8 2009 Miloslav Trmač <mitr at redhat.com> - 0.2-3
 - Handle changed "TYPE=crypto_LUKS" from libblkid
 - Preserve file timestamps during installation


--- cryptsetup-svn-r62.patch DELETED ---


--- volume_key-0.2-libblkid-type.patch DELETED ---




More information about the fedora-extras-commits mailing list