rpms/cryptsetup-luks/devel .cvsignore, 1.10, 1.11 cryptsetup-luks.spec, 1.55, 1.56 sources, 1.10, 1.11 cryptsetup-1.0.6-pre2-key_slot_num_fix.patch, 1.1, NONE cryptsetup-1.0.6-pre2-luksRemoveKey.patch, 1.1, NONE

[Till Maas (till)]

Author: till

Update of /cvs/pkgs/rpms/cryptsetup-luks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17162

Modified Files:
	.cvsignore cryptsetup-luks.spec sources 
Removed Files:
	cryptsetup-1.0.6-pre2-key_slot_num_fix.patch 
	cryptsetup-1.0.6-pre2-luksRemoveKey.patch 
Log Message:
* Thu Mar 13 2008 Till Maas <opensource till name> - 1.0.6-1
- Update to latest version
- remove patches that have been merged upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Mar 2008 21:49:17 -0000	1.10
+++ .cvsignore	13 Mar 2008 19:07:41 -0000	1.11
@@ -1 +1 @@
-cryptsetup-1.0.6-pre2.tar.bz2
+cryptsetup-1.0.6.tar.bz2


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- cryptsetup-luks.spec	3 Mar 2008 21:49:17 -0000	1.55
+++ cryptsetup-luks.spec	13 Mar 2008 19:07:41 -0000	1.56
@@ -1,15 +1,13 @@
-%define devrelease pre2
+#define devrelease pre1
 
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
 Version: 1.0.6
-Release: 0.1%{?devrelease:.%{devrelease}}%{?dist}
+Release: 1%{?devrelease:.%{devrelease}}%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://luks.endorphin.org/
 Source: http://luks.endorphin.org/source/cryptsetup-%{version}%{?devrelease:-%{devrelease}}.tar.bz2
-Patch1: cryptsetup-1.0.6-pre2-key_slot_num_fix.patch
-Patch2: cryptsetup-1.0.6-pre2-luksRemoveKey.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
@@ -38,9 +36,6 @@
 
 %prep
 %setup -q -n cryptsetup-%{version}%{?devrelease:-%{devrelease}}
-%patch1 -p1 -b .key_slot_num_fix
-%patch2 -p1 -b .luksRemoveKey
-
 recode latin1..utf-8 ChangeLog
 
 
@@ -84,6 +79,11 @@
 
 
 %changelog
+* Thu Mar 13 2008 Till Maas <opensource till name> - 1.0.6-1
+- Update to latest version
+- remove patches that have been merged upstream
+
+
 * Mon Mar 03 2008 Till Maas <opensource till name> - 1.0.6-0.1.pre2
 - Update to new version with several bugfixes
 - remove patches that have been merged upstream


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Mar 2008 21:49:17 -0000	1.10
+++ sources	13 Mar 2008 19:07:41 -0000	1.11
@@ -1 +1 @@
-1ce62e5a6c3117ac4826e12abef3e2dd  cryptsetup-1.0.6-pre2.tar.bz2
+00d452eb7a76e39f5749545d48934a10  cryptsetup-1.0.6.tar.bz2


--- cryptsetup-1.0.6-pre2-key_slot_num_fix.patch DELETED ---


--- cryptsetup-1.0.6-pre2-luksRemoveKey.patch DELETED ---