- new URLs, updated to 1.1.2 (new soname)

- removed obsolete udev,diet patches

Changed files:
    cryptsetup-luks-udev.patch -> 1.2
    cryptsetup.spec -> 1.46
    diet.patch -> 1.3

diff --git a/cryptsetup-luks-udev.patch b/cryptsetup-luks-udev.patch
deleted file mode 100644 (file)
index bf84e10..0000000
--- a/cryptsetup-luks-udev.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cryptsetup-1.0.6/lib/libdevmapper.c~       2007-10-25 10:11:19.000000000 +0300
-+++ cryptsetup-1.0.6/lib/libdevmapper.c        2008-11-12 23:13:25.312499650 +0200
-@@ -18,7 +18,7 @@
- 
- #define       CRYPT_TARGET    "crypt"
- 
--#define UDEVSETTLE    "/sbin/udevsettle"
-+#define UDEVSETTLE    "/sbin/udevadm settle"
- 
- static void run_udevsettle(void)
- {

diff --git a/cryptsetup.spec b/cryptsetup.spec
index 925e0732fb7b10276be6ec06605a7b0bcec29a7a..54150eb9a2887097aff963cc088e6ea90b8a6537 100644 (file)
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -7,31 +7,29 @@
 Summary:       LUKS for dm-crypt implemented in cryptsetup
 Summary(pl.UTF-8):     LUKS dla dm-crypta zaimplementowany w cryptsetup
 Name:          cryptsetup-luks
-Version:       1.0.6
-Release:       10
+Version:       1.1.2
+Release:       1
 License:       GPL v2
 Group:         Base
-Source0:       http://luks.endorphin.org/source/%{realname}-%{version}.tar.bz2
-# Source0-md5: 00d452eb7a76e39f5749545d48934a10
+Source0:       http://cryptsetup.googlecode.com/files/%{realname}-%{version}.tar.bz2
+# Source0-md5: f3928c1f1d49fcee39bb1e8d42fe707a
 Source1:       %{name}-initramfs-root-conf
 Source2:       %{name}-initramfs-root-hook
 Source3:       %{name}-initramfs-root-local-top
 Source4:       %{name}-initramfs-passdev-hook
 Source5:       %{name}-initramfs-README
-Patch1:                %{name}-nostatic.patch
-Patch2:                %{name}-udev.patch
-Patch3:                %{name}-diet.patch
-URL:           http://luks.endorphin.org/
-BuildRequires: autoconf
+Patch0:                %{name}-nostatic.patch
+URL:           http://code.google.com/p/cryptsetup/
+BuildRequires: autoconf >= 2.57
 BuildRequires: automake
-BuildRequires: device-mapper-devel
-BuildRequires: gettext-devel
+BuildRequires: device-mapper-devel >= 1.02.03
+BuildRequires: gettext-devel >= 0.15
 BuildRequires: libgcrypt-devel >= 1.1.42
 BuildRequires: libselinux-devel
 BuildRequires: libsepol-devel
 BuildRequires: libtool
 BuildRequires: libuuid-devel
-BuildRequires: popt-devel
+BuildRequires: popt-devel >= 1.7
 %if %{with initrd}
 BuildRequires: libgpg-error-static
        %if %{with dietlibc}
@@ -49,6 +47,7 @@ BuildRequires:        libuuid-static
 BuildRequires: popt-static
        %endif
 %endif
+Requires:      popt >= 1.7
 Provides:      cryptsetup = %{version}
 Obsoletes:     cryptsetup
 Conflicts:     udev < 1:118-1
@@ -56,7 +55,6 @@ Conflicts:    udev-core < 1:115
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sbindir        /sbin
-%define                _noautoreqdep   libcryptsetup.so.0
 
 %description
 LUKS is the upcoming standard for Linux hard disk encryption. By
@@ -136,9 +134,7 @@ initramfs-tools.
 
 %prep
 %setup -q -n %{realname}-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch0 -p1
 
 install %{SOURCE5} README.initramfs
 
@@ -219,7 +215,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog TODO
 %attr(755,root,root) %{_sbindir}/cryptsetup
 %attr(755,root,root) /%{_lib}/libcryptsetup.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libcryptsetup.so.0
+%attr(755,root,root) %ghost /%{_lib}/libcryptsetup.so.1
 %{_mandir}/man8/cryptsetup.8*
 
 %files devel
@@ -227,6 +223,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libcryptsetup.so
 %{_libdir}/libcryptsetup.la
 %{_includedir}/libcryptsetup.h
+%{_pkgconfigdir}/libcryptsetup.pc
 
 %files static
 %defattr(644,root,root,755)

diff --git a/diet.patch b/diet.patch
deleted file mode 100644 (file)
index 5bd680b..0000000
--- a/diet.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- cryptsetup-1.0.6/lib/utils.c~      2007-12-01 17:29:27.000000000 +0100
-+++ cryptsetup-1.0.6/lib/utils.c       2009-03-18 22:32:25.000000000 +0100
-@@ -31,7 +31,9 @@
-           free(error);
-           error=NULL;
-       }
--
-+#ifdef __dietlibc__
-+      if (fmt)
-+#endif
-         vasprintf(&error, fmt, va);
- }
-