Update to cryptsetup 1.4.0.
Remove iconv (ChangeLog fixed upsteam). Remove temporary buildroot magic.
This commit is contained in:
parent
90545928eb
commit
6bfe7639ac
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
/cryptsetup-1.4.0-rc1.tar.bz2
|
/cryptsetup-1.4.0.tar.bz2
|
||||||
|
7
cryptsetup-1.4.0.tar.bz2.asc
Normal file
7
cryptsetup-1.4.0.tar.bz2.asc
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
Version: GnuPG v1.4.11 (GNU/Linux)
|
||||||
|
|
||||||
|
iEYEABECAAYFAk6oSuUACgkQf1Jlc7shgi82tgCgjnXpdC2zWQduAF8betHUFN9N
|
||||||
|
CVYAnRRe7Q2rcfZrPi5Uoe3EXvSVybMl
|
||||||
|
=hnkE
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,7 +1,7 @@
|
|||||||
Summary: A utility for setting up encrypted disks
|
Summary: A utility for setting up encrypted disks
|
||||||
Name: cryptsetup
|
Name: cryptsetup
|
||||||
Version: 1.4.0
|
Version: 1.4.0
|
||||||
Release: 0.2%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
URL: http://cryptsetup.googlecode.com/
|
URL: http://cryptsetup.googlecode.com/
|
||||||
@ -13,7 +13,7 @@ Obsoletes: cryptsetup-luks < 1.4.0
|
|||||||
Requires: cryptsetup-libs = %{version}-%{release}
|
Requires: cryptsetup-libs = %{version}-%{release}
|
||||||
|
|
||||||
%define _root_sbindir /sbin
|
%define _root_sbindir /sbin
|
||||||
%define upstream_version %{version}-rc1
|
%define upstream_version %{version}
|
||||||
Source0: http://cryptsetup.googlecode.com/files/cryptsetup-%{upstream_version}.tar.bz2
|
Source0: http://cryptsetup.googlecode.com/files/cryptsetup-%{upstream_version}.tar.bz2
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -37,12 +37,6 @@ used for writing code that makes use of disk encryption.
|
|||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Summary: Cryptsetup shared library
|
Summary: Cryptsetup shared library
|
||||||
Provides: cryptsetup-luks-libs = %{version}-%{release}
|
Provides: cryptsetup-luks-libs = %{version}-%{release}
|
||||||
# For buildroot magic
|
|
||||||
%if %{_lib} == lib64
|
|
||||||
Provides: libcryptsetup.so.1(CRYPTSETUP_1.0)(64bit), libcryptsetup.so.1()(64bit)
|
|
||||||
%else
|
|
||||||
Provides: libcryptsetup.so.1(CRYPTSETUP_1.0), libcryptsetup.so.1
|
|
||||||
%endif
|
|
||||||
Obsoletes: cryptsetup-luks-libs < 1.4.0
|
Obsoletes: cryptsetup-luks-libs < 1.4.0
|
||||||
|
|
||||||
%description libs
|
%description libs
|
||||||
@ -51,9 +45,6 @@ This package contains the cryptsetup shared library, libcryptsetup.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n cryptsetup-%{upstream_version}
|
%setup -q -n cryptsetup-%{upstream_version}
|
||||||
|
|
||||||
iconv -f latin1 -t utf8 ChangeLog > ChangeLog.new
|
|
||||||
mv -f ChangeLog.new ChangeLog
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --sbindir=%{_root_sbindir} --libdir=/%{_lib}
|
%configure --sbindir=%{_root_sbindir} --libdir=/%{_lib}
|
||||||
# remove rpath
|
# remove rpath
|
||||||
@ -97,6 +88,9 @@ popd
|
|||||||
%clean
|
%clean
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 26 2011 Milan Broz <mbroz@redhat.com> - 1.4.0-1
|
||||||
|
- Update to cryptsetup 1.4.0.
|
||||||
|
|
||||||
* Mon Oct 10 2011 Milan Broz <mbroz@redhat.com> - 1.4.0-0.1
|
* Mon Oct 10 2011 Milan Broz <mbroz@redhat.com> - 1.4.0-0.1
|
||||||
- Update to cryptsetup 1.4.0-rc1.
|
- Update to cryptsetup 1.4.0-rc1.
|
||||||
- Rename package back from cryptsetup-luks to cryptsetup.
|
- Rename package back from cryptsetup-luks to cryptsetup.
|
||||||
|
Loading…
Reference in New Issue
Block a user