packages: cryptsetup/cryptsetup.spec, cryptsetup/dont-drag-more-libs.patch ...

[baggins]

Author: baggins                      Date: Sat Apr 28 17:49:57 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- build without dietlibc (devmapper doesn't build properly with it, so deps unfulfilled)
- drag more libs, devmapper really needs libudev

---- Files affected:
packages/cryptsetup:
   cryptsetup.spec (1.61 -> 1.62) , dont-drag-more-libs.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/cryptsetup/cryptsetup.spec
diff -u packages/cryptsetup/cryptsetup.spec:1.61 packages/cryptsetup/cryptsetup.spec:1.62
--- packages/cryptsetup/cryptsetup.spec:1.61	Sat Apr 28 19:03:07 2012
+++ packages/cryptsetup/cryptsetup.spec	Sat Apr 28 19:49:52 2012
@@ -2,21 +2,20 @@
 #
 # Conditonal build:
 %bcond_without	initrd		# don't build initrd version
-%bcond_without	dietlibc	# build initrd version with static glibc instead of dietlibc
+%bcond_with	dietlibc	# build initrd version with static glibc instead of dietlibc
 %bcond_without	python		# Python binding
 
 Summary:	LUKS for dm-crypt implemented in cryptsetup
 Summary(pl.UTF-8):	LUKS dla dm-crypta zaimplementowany w cryptsetup
 Name:		cryptsetup
 Version:	1.4.2
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Base
 #Source0Download: http://code.google.com/p/cryptsetup/downloads/list
 Source0:	http://cryptsetup.googlecode.com/files/%{name}-%{version}.tar.bz2
 # Source0-md5:	db2e6189e1b191a279a1f508396d3373
 Patch0:		diet.patch
-Patch1:		dont-drag-more-libs.patch
 URL:		http://code.google.com/p/cryptsetup/
 BuildRequires:	autoconf >= 2.67
 BuildRequires:	automake
@@ -49,6 +48,7 @@
 BuildRequires:	libsepol-static
 BuildRequires:	libuuid-static
 BuildRequires:	popt-static
+BuildRequires:	udev-static
 	%endif
 %endif
 Requires:	popt >= 1.7
@@ -146,7 +146,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %{__rm} po/stamp-po
 
@@ -162,7 +161,6 @@
 CC="%{__cc}"
 %configure \
 %if %{with dietlibc}
-%configure \
 	CC="diet ${CC#ccache } %{rpmcppflags} %{rpmcflags} %{rpmldflags} -Os" \
 	LIBS="-lcompat" \
 	ac_cv_lib_popt_poptConfigFileToString=yes \
@@ -175,7 +173,6 @@
 	--disable-shared \
 	--enable-static \
 	--enable-static-cryptsetup \
-	--disable-udev \
 	--disable-nls
 
 %{__make} -C lib
@@ -264,6 +261,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.62  2012/04/28 17:49:52  baggins
+- rel 3
+- build without dietlibc (devmapper doesn't build properly with it, so deps unfulfilled)
+- drag more libs, devmapper really needs libudev
+
 Revision 1.61  2012/04/28 17:03:07  baggins
 - rel 2
 - drop initramfs package, it was never properly tested, never really updated
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/cryptsetup/cryptsetup.spec?r1=1.61&r2=1.62