rpms/cryptsetup-luks/devel .cvsignore, 1.12, 1.13 cryptsetup-luks.spec, 1.68, 1.69 sources, 1.12, 1.13

[Milan Broz]

Author: mbroz

Update of /cvs/pkgs/rpms/cryptsetup-luks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14753

Modified Files:
	.cvsignore cryptsetup-luks.spec sources 
Log Message:
Update to upstream final release.
Split libs subpackage.
Remove rpath setting from cryptsetup binary.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	22 Jun 2009 15:08:16 -0000	1.12
+++ .cvsignore	22 Jul 2009 11:36:06 -0000	1.13
@@ -1 +1 @@
-cryptsetup-1.0.7-rc1.tar.bz2
+cryptsetup-1.0.7.tar.bz2


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- cryptsetup-luks.spec	15 Jul 2009 07:19:37 -0000	1.68
+++ cryptsetup-luks.spec	22 Jul 2009 11:36:06 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
 Version: 1.0.7
-Release: 0.2%{?dist}
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cryptsetup.googlecode.com/
@@ -11,26 +11,31 @@ BuildRequires: libgpg-error-devel, libuu
 BuildRequires: libselinux-devel
 Provides: cryptsetup = %{version}-%{release}
 Obsoletes: cryptsetup <= 0.1
+Requires: cryptsetup-luks-libs = %{version}-%{release}
 
-%define upstream_version %{version}-rc1
+%define _root_sbindir /sbin
+%define upstream_version %{version}
 Source0: http://cryptsetup.googlecode.com/files/cryptsetup-%{upstream_version}.tar.bz2
 
 %description
 This package contains cryptsetup, a utility for setting up
 encrypted filesystems using Device Mapper and the dm-crypt target.
 
-
 %package devel
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libgcrypt-devel > 1.1.42, device-mapper-devel, e2fsprogs-devel
+Requires: libgcrypt-devel > 1.1.42, device-mapper-devel, libuuid-devel
 Summary: Headers and libraries for using encrypted filesystems
 
-
 %description devel
 The cryptsetup-luks-devel package contain libraries and header files
 used for writing code that makes use of encrypted filesystems.
 
+%package libs
+Summary: Cryptsetup shared library
+
+%description libs
+This package contains the cryptsetup shared library, libcryptsetup.
 
 %prep
 %setup -q -n cryptsetup-%{upstream_version}
@@ -38,12 +43,13 @@ used for writing code that makes use of 
 iconv -f latin1 -t utf8 ChangeLog > ChangeLog.new
 mv -f ChangeLog.new ChangeLog 
 
-
 %build
-%configure --sbindir=/sbin --libdir=/%{_lib}
+%configure  --sbindir=%{_root_sbindir} --libdir=/%{_lib}
+# 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
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -57,28 +63,34 @@ ln -s ../../%{_lib}/$(ls libcryptsetup.s
 popd 
 %find_lang cryptsetup
 
+%post -n cryptsetup-luks-libs -p /sbin/ldconfig
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%postun -n cryptsetup-luks-libs -p /sbin/ldconfig
 
 %files -f cryptsetup.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog AUTHORS TODO
 %{_mandir}/man8/cryptsetup.8.gz
-/sbin/cryptsetup
-/%{_lib}/libcryptsetup.so.*
-
+%{_root_sbindir}/cryptsetup
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/libcryptsetup.h
 %{_libdir}/libcryptsetup.so
+
+%files libs
+%defattr(-,root,root,-)
+/%{_lib}/libcryptsetup.so.*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %changelog
+* Wed Jul 22 2009 Milan Broz <mbroz at redhat.com> - 1.0.7-1
+- Update to upstream final release.
+- Split libs subpackage.
+- Remove rpath setting from cryptsetup binary.
+
 * Wed Jul 15 2009 Till Maas <opensource at till.name> - 1.0.7-0.2
 - update BR because of libuuid splitout from e2fsprogs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cryptsetup-luks/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	22 Jun 2009 15:08:17 -0000	1.12
+++ sources	22 Jul 2009 11:36:06 -0000	1.13
@@ -1 +1 @@
-0910632173fb960252412bf7342b42fc  cryptsetup-1.0.7-rc1.tar.bz2
+5eea2a77391a8a1a651b31cbaef59e22  cryptsetup-1.0.7.tar.bz2