rpms/cryptsetup-luks/F-7 cryptsetup-1.0.5-luksInit_header.patch, NONE, 1.1 cryptsetup-luks.spec, 1.32, 1.33 cryptsetup-luks-1.0.1-sepol.patch, 1.1, NONE

[Till Maas (till)]

Author: till

Update of /cvs/pkgs/rpms/cryptsetup-luks/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1705

Modified Files:
	cryptsetup-luks.spec 
Added Files:
	cryptsetup-1.0.5-luksInit_header.patch 
Removed Files:
	cryptsetup-luks-1.0.1-sepol.patch 
Log Message:
sync to devel


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/F-7/cryptsetup-luks.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cryptsetup-luks.spec	5 Feb 2007 21:00:59 -0000	1.32
+++ cryptsetup-luks.spec	8 Aug 2007 10:57:58 -0000	1.33
@@ -1,13 +1,13 @@
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
-Version: 1.0.3
-Release: 4%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://clemens.endorphin.org/LUKS
-Source: http://luks.endorphin.org/source/cryptsetup-luks-%{version}.tar.bz2
+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
@@ -33,42 +33,63 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n cryptsetup-%{version}
 %patch -p1
-%patch2 -p1
+%patch3 -p1
 
 %build
-%configure --enable-static
-LDADD=-all-static make %{?_smp_mflags}
+%configure --sbindir=/sbin --libdir=/%{_lib} --enable-static
+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/%{_lib}/*.la $RPM_BUILD_ROOT/%{_lib}/cryptsetup
+
+# move libcryptsetup.so to %{_libdir}
+pushd $RPM_BUILD_ROOT/%{_lib}
+rm libcryptsetup.so
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}
+ln -s ../../%{_lib}/$(ls libcryptsetup.so.?.?.?) $RPM_BUILD_ROOT/%{_libdir}/libcryptsetup.so
+popd 
+%find_lang cryptsetup
 
-%find_lang %{name}
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%files -f %{name}.lang
-%defattr(-,root,root)
-%doc COPYING ChangeLog AUTHORS INSTALL NEWS README
-%{_mandir}/man*/*
-/sbin/*
-%{_libdir}/lib*.so.*
+%files -f cryptsetup.lang
+%defattr(-,root,root,-)
+%doc COPYING ChangeLog AUTHORS INSTALL NEWS README TODO
+%{_mandir}/man8/cryptsetup.8.gz
+/sbin/cryptsetup
+/%{_lib}/libcryptsetup.so.*
 
-%files devel
-%defattr(-,root,root)
-%{_includedir}/*
-%{_libdir}/lib*.so
-%{_libdir}/lib*.a
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/libcryptsetup.h
+%{_libdir}/libcryptsetup.so
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Aug 08 2007 Till Maas <opensource till name> - 1.0.5-1
+- disable patch2, libsepol is now detected by configure
+- move libcryptsetup.so to %%{_libdir} instead of /%%{_lib}
+- Use /%%{_lib} instead of /lib to use /lib64 on 64bit archs (#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
+
+* Mon Jun 04 2007 Peter Jones <pjones at redhat.com> - 1.0.3-5
+- Don't build static any more.
+
 * Mon Feb 05 2007 Alasdair Kergon <agk at redhat.com> - 1.0.3-4
 - Add build dependency on new device-mapper-devel package.
 - Add preun and post ldconfig requirements.


--- cryptsetup-luks-1.0.1-sepol.patch DELETED ---