rpms/cryptsetup-luks/devel .cvsignore, 1.11, 1.12 cryptsetup-luks.spec, 1.66, 1.67 sources, 1.11, 1.12 cryptsetup-descriptive-errors.patch, 1.1, NONE cryptsetup-detect-dm.patch, 1.1, NONE cryptsetup-fix-fd.patch, 1.1, NONE cryptsetup-luks-1.0.6-duplicate_sentence.patch, 1.1, NONE cryptsetup-prompt.patch, 1.1, NONE cryptsetup-remove-udev.patch, 1.2, NONE cryptsetup-wipe-headers.patch, 1.1, NONE

[Milan Broz]

Author: mbroz

Update of /cvs/pkgs/rpms/cryptsetup-luks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7978

Modified Files:
	.cvsignore cryptsetup-luks.spec sources 
Removed Files:
	cryptsetup-descriptive-errors.patch cryptsetup-detect-dm.patch 
	cryptsetup-fix-fd.patch 
	cryptsetup-luks-1.0.6-duplicate_sentence.patch 
	cryptsetup-prompt.patch cryptsetup-remove-udev.patch 
	cryptsetup-wipe-headers.patch 
Log Message:
Update to new upstream 1.0.7-rc1.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	13 Mar 2008 19:07:41 -0000	1.11
+++ .cvsignore	22 Jun 2009 15:08:16 -0000	1.12
@@ -1 +1 @@
-cryptsetup-1.0.6.tar.bz2
+cryptsetup-1.0.7-rc1.tar.bz2


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- cryptsetup-luks.spec	24 Feb 2009 09:53:12 -0000	1.66
+++ cryptsetup-luks.spec	22 Jun 2009 15:08:17 -0000	1.67
@@ -1,29 +1,10 @@
-#define devrelease pre1
-
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
-Version: 1.0.6
-Release: 7%{?devrelease:.%{devrelease}}%{?dist}
+Version: 1.0.7
+Release: 0.1%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cryptsetup.googlecode.com/
-Source: http://cryptsetup.googlecode.com/files/cryptsetup-%{version}%{?devrelease:-%{devrelease}}.tar.bz2
-# Upstream SCM: http://code.google.com/p/cryptsetup/source/list
-# 2008-04-15: sent to upstream via personal e-mail to Clemens Fruhwirth
-# 2008-11-06: not merged in revision 40.
-Patch0: cryptsetup-prompt.patch
-# Merged in changeset 39:
-Patch1: cryptsetup-luks-1.0.6-duplicate_sentence.patch
-# Merged in changeset 30:
-Patch2: cryptsetup-fix-fd.patch
-# Merged in changeset 32:
-Patch3: cryptsetup-remove-udev.patch
-# Merged in changeset 31:
-Patch4: cryptsetup-detect-dm.patch
-# Merged in changeset 33:
-Patch5: cryptsetup-descriptive-errors.patch
-# Merged in changeset 38:
-Patch6: cryptsetup-wipe-headers.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel
 BuildRequires: libgpg-error-devel, e2fsprogs-devel, libsepol-devel
@@ -31,6 +12,8 @@ BuildRequires: libselinux-devel
 Provides: cryptsetup = %{version}-%{release}
 Obsoletes: cryptsetup <= 0.1
 
+%define upstream_version %{version}-rc1
+Source0: http://cryptsetup.googlecode.com/files/cryptsetup-%{upstream_version}.tar.bz2
 
 %description
 This package contains cryptsetup, a utility for setting up
@@ -50,14 +33,7 @@ used for writing code that makes use of 
 
 
 %prep
-%setup -q -n cryptsetup-%{version}%{?devrelease:-%{devrelease}}
-%patch0 -p1 -b .prompt
-%patch1 -p1 -b .duplicate_sentence
-%patch2 -p1 -b .fd
-%patch3 -p1 -b .udev
-%patch4 -p1 -b .dm
-%patch5 -p1 -b .errors
-%patch6 -p1 -b .wipe
+%setup -q -n cryptsetup-%{upstream_version}
 
 iconv -f latin1 -t utf8 ChangeLog > ChangeLog.new
 mv -f ChangeLog.new ChangeLog 
@@ -103,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 22 2009 Milan Broz <mbroz at redhat.com> - 1.0.7-0.1
+- Update to new upstream 1.0.7-rc1.
+
+- Wipe old fs headers to not confuse blkid (#468062)
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 Mar 2008 19:07:41 -0000	1.11
+++ sources	22 Jun 2009 15:08:17 -0000	1.12
@@ -1 +1 @@
-00d452eb7a76e39f5749545d48934a10  cryptsetup-1.0.6.tar.bz2
+0910632173fb960252412bf7342b42fc  cryptsetup-1.0.7-rc1.tar.bz2


--- cryptsetup-descriptive-errors.patch DELETED ---


--- cryptsetup-detect-dm.patch DELETED ---


--- cryptsetup-fix-fd.patch DELETED ---


--- cryptsetup-luks-1.0.6-duplicate_sentence.patch DELETED ---


--- cryptsetup-prompt.patch DELETED ---


--- cryptsetup-remove-udev.patch DELETED ---


--- cryptsetup-wipe-headers.patch DELETED ---