From b661c14e5968f844ccaf0c2648f89b9af428cceb Mon Sep 17 00:00:00 2001
From: Milan Broz <mbroz@fedoraproject.org>
Date: Nov 09 2011 13:02:54 +0000
Subject: Update to cryptsetup 1.4.1.

Add Python cryptsetup bindings.
Obsolete separate python-cryptsetup package.

---

diff --git a/.gitignore b/.gitignore
index 6e829cc..0c1280f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/cryptsetup-1.4.0.tar.bz2
+/cryptsetup-1.4.1.tar.bz2
diff --git a/cryptsetup-1.4.0.tar.bz2.asc b/cryptsetup-1.4.0.tar.bz2.asc
deleted file mode 100644
index 87ba4d8..0000000
--- a/cryptsetup-1.4.0.tar.bz2.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iEYEABECAAYFAk6oSuUACgkQf1Jlc7shgi82tgCgjnXpdC2zWQduAF8betHUFN9N
-CVYAnRRe7Q2rcfZrPi5Uoe3EXvSVybMl
-=hnkE
------END PGP SIGNATURE-----
diff --git a/cryptsetup-1.4.1.tar.bz2.asc b/cryptsetup-1.4.1.tar.bz2.asc
new file mode 100644
index 0000000..f4fa9b9
--- /dev/null
+++ b/cryptsetup-1.4.1.tar.bz2.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAk66cjgACgkQf1Jlc7shgi8zmQCeI8JsH4Dma49+YoQLfZdzHoIH
+OHgAn2z9CBsNJizgHJe+46OcaIPL/gQi
+=E/yV
+-----END PGP SIGNATURE-----
diff --git a/cryptsetup.spec b/cryptsetup.spec
index ec19dd5..3bedde2 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -1,13 +1,13 @@
 Summary: A utility for setting up encrypted disks
 Name: cryptsetup
-Version: 1.4.0
+Version: 1.4.1
 Release: 1%{?dist}
-License: GPLv2
+License: GPLv2 and LGPLv2+
 Group: Applications/System
 URL: http://cryptsetup.googlecode.com/
 BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel
 BuildRequires: libgpg-error-devel, libuuid-devel, libsepol-devel
-BuildRequires: libselinux-devel
+BuildRequires: libselinux-devel, python-devel
 Provides: cryptsetup-luks = %{version}-%{release}
 Obsoletes: cryptsetup-luks < 1.4.0
 Requires: cryptsetup-libs = %{version}-%{release}
@@ -42,11 +42,23 @@ Obsoletes: cryptsetup-luks-libs < 1.4.0
 %description libs
 This package contains the cryptsetup shared library, libcryptsetup.
 
+%package python
+Group: System Environment/Libraries
+Summary: Python bindings for libcryptsetup
+Requires: %{name}-libs = %{version}-%{release}
+Provides: python-cryptsetup = %{version}-%{release}
+Obsoletes: python-cryptsetup < 1.4.0
+
+%description python
+This package provides Python bindings for libcryptsetup, a library
+for setting up disk encryption using dm-crypt kernel module.
+
 %prep
 %setup -q -n cryptsetup-%{upstream_version}
+chmod -x python/pycryptsetup-test.py
 
 %build
-%configure  --sbindir=%{_root_sbindir} --libdir=/%{_lib}
+%configure  --sbindir=%{_root_sbindir} --libdir=/%{_lib} --enable-python
 # remove rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -85,9 +97,19 @@ popd
 %doc COPYING
 /%{_lib}/libcryptsetup.so.*
 
+%files python
+%doc COPYING.LGPL python/pycryptsetup-test.py
+%exclude %{python_sitearch}/pycryptsetup.la
+%{python_sitearch}/pycryptsetup.so
+
 %clean
 
 %changelog
+* Wed Nov 09 2011 Milan Broz <mbroz@redhat.com> - 1.4.1-1
+- Update to cryptsetup 1.4.1.
+- Add Python cryptsetup bindings.
+- Obsolete separate python-cryptsetup package.
+
 * Wed Oct 26 2011 Milan Broz <mbroz@redhat.com> - 1.4.0-1
 - Update to cryptsetup 1.4.0.
 
diff --git a/sources b/sources
index 64b051a..b1f1039 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4328641ba4532c229526c6ef282e5286  cryptsetup-1.4.0.tar.bz2
+9253b3f29abf5c6f333eb74128b0df1c  cryptsetup-1.4.1.tar.bz2