rpms/cryptsetup-luks/devel cryptsetup-1.0.5-luksInit_header.patch, NONE, 1.1 cryptsetup-luks.spec, 1.34, 1.35

[Till Maas (till)]

Author: till

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

Modified Files:
	cryptsetup-luks.spec 
Added Files:
	cryptsetup-1.0.5-luksInit_header.patch 
Log Message:
- Build static again (#243228)
- sync header and library (#215349)
- do not use %%makeinstall (recommended by PackageGuidelines)
- select sbindir with %%configure instead with make
- add TODO


cryptsetup-1.0.5-luksInit_header.patch:

--- NEW FILE cryptsetup-1.0.5-luksInit_header.patch ---
diff -ru cryptsetup-1.0.5.orig/lib/libcryptsetup.h cryptsetup-1.0.5/lib/libcryptsetup.h
--- cryptsetup-1.0.5.orig/lib/libcryptsetup.h	2006-11-21 10:06:47.000000000 +0100
+++ cryptsetup-1.0.5/lib/libcryptsetup.h	2007-07-26 18:52:20.267303000 +0200
@@ -39,7 +39,7 @@
 int crypt_resize_device(struct crypt_options *options);
 int crypt_query_device(struct crypt_options *options);
 int crypt_remove_device(struct crypt_options *options);
-int crypt_luksInit(struct crypt_options *options);
+int crypt_luksFormat(struct crypt_options *options);
 int crypt_luksOpen(struct crypt_options *options);
 int crypt_luksDelKey(struct crypt_options *options);
 int crypt_luksAddKey(struct crypt_options *options);


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cryptsetup-luks.spec	13 Jun 2007 21:43:10 -0000	1.34
+++ cryptsetup-luks.spec	26 Jul 2007 21:20:28 -0000	1.35
@@ -1,13 +1,14 @@
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
 Version: 1.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://clemens.endorphin.org/LUKS
 Source: http://luks.endorphin.org/source/cryptsetup-%{version}.tar.bz2
 Patch: cryptsetup-luks-1.0.1-proto.patch
 Patch2: cryptsetup-luks-1.0.1-sepol.patch
+Patch3: cryptsetup-1.0.5-luksInit_header.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libgcrypt-devel >= 1.1.42, popt, device-mapper-devel
 BuildRequires: libgpg-error-devel, e2fsprogs-devel, libsepol-devel
@@ -36,15 +37,16 @@
 %setup -q -n cryptsetup-%{version}
 %patch -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
-%configure
+%configure --enable-static --sbindir=/sbin
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall sbindir=$RPM_BUILD_ROOT/sbin
-rm -rf  $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/cryptsetup
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf  $RPM_BUILD_ROOT/%{_libdir}/*.{la,a} $RPM_BUILD_ROOT/%{_libdir}/cryptsetup
 
 %find_lang cryptsetup
 
@@ -53,14 +55,14 @@
 %postun -p /sbin/ldconfig
 
 %files -f cryptsetup.lang
-%defattr(-,root,root)
-%doc COPYING ChangeLog AUTHORS INSTALL NEWS README
+%defattr(-,root,root,-)
+%doc COPYING ChangeLog AUTHORS INSTALL NEWS README TODO
 %{_mandir}/man*/*
 /sbin/*
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/lib*.so
 
@@ -68,6 +70,13 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Jul 26 2007 Till Maas <opensource till name> - 1.0.5-2
+- Build static again (#243228)
+- sync header and library (#215349)
+- do not use %%makeinstall (recommended by PackageGuidelines)
+- select sbindir with %%configure instead with make
+- add TODO
+
 * Wed Jun 13 2007 Jeremy Katz <katzj at redhat.com> - 1.0.5-1
 - update to 1.0.5