Merge branch 'upstream' into tizen

Change-Id: I96df0e91f76fd714f6ec007c707ae7360142c93f
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

diff --cc packaging/cryptsetup.spec
index 85d8180,0000000..5b3c700
mode 100644,000000..100644
--- 1/packaging/cryptsetup.spec
--- /dev/null
+++ b/packaging/cryptsetup.spec
@@@ -1,103 -1,0 +1,105 @@@
- Version:  1.6
 +Name:     cryptsetup
 +Summary:  The cryptsetup
- Source0:  %{name}-%{version}.tar.gz
++Version:  1.6.7
 +Release:  1
 +License:  GPL-2.0
 +Group:    Base/Device Management
 +URL:      http://code.google.com/p/cryptsetup/
- %{_prefix}/lib/libcryptsetup.so.4.5.0
++Source0:  %{name}-%{version}.tar.xz
 +Source1:  cryptsetup.manifest
 +
 +BuildRequires: linux-kernel-headers
 +BuildRequires: device-mapper-devel
 +BuildRequires: libgpg-error-devel
 +BuildRequires: libgcrypt-devel
 +BuildRequires: libuuid-devel
 +BuildRequires: util-linux
 +BuildRequires: popt-devel
 +BuildRequires: automake
 +BuildRequires: gettext
 +
 +Requires:      libgpg-error
 +Requires:      libdevmapper
 +Requires:      libgcrypt
 +
 +%description
 +setup cryptographic volumes for dm-crypt (including LUKS extension)
 +
 +%package devel
 +Summary:    The cryptsetup development package
 +Group:      Development/Libraries
 +License:    LGPL-2.1
 +Requires:   %{name} = %{version}-%{release}
 +
 +%description devel
 +cryptsetup development package
 +
 +%package locale
 +License:    GPL-2.0
 +Summary:    The cryptsetup locale package
 +Group:      Base/Device Management
 +Requires:   %{name} = %{version}-%{release}
 +
 +%description locale
 +locale package for cryptsetup
 +
 +%package doc 
 +License:    GPL-2.0
 +Summary:    The cryptsetup doc package
 +Group:      Base/Device Management
 +Requires:   %{name} = %{version}-%{release}
 +
 +%description doc
 +doc package for cryptsetup
 +
 +%prep
 +%setup -q
 +
 +%build
++chmod +x ./autogen.sh
 +./autogen.sh --prefix=%{_prefix} -localedir=%{_prefix}/share/locale
 +
 +make %{?jobs:-j%jobs}
 +
 +%install
 +rm -rf %{buildroot}
 +%make_install
 +cp -a %{SOURCE1} %{buildroot}%{_datadir}/binary_package_name.manifest
 +
 +%clean
 +
 +%post -p /sbin/ldconfig
 +
 +%postun -p /sbin/ldconfig
 +
 +%files
 +%defattr(-,root,root,-)
 +%manifest %{_datadir}/binary_package_name.manifest
 +%{_prefix}/lib/libcryptsetup.so
 +%{_prefix}/lib/libcryptsetup.so.4
++%{_prefix}/lib/libcryptsetup.so.4.7.0
 +%{_prefix}/sbin/cryptsetup
 +%{_prefix}/sbin/veritysetup
 +
 +%files devel
 +%{_prefix}/include/libcryptsetup.h
 +%{_prefix}/lib/libcryptsetup.so
 +%{_prefix}/lib/pkgconfig/libcryptsetup.pc
 +
 +%files locale
 +%{_prefix}/share/locale/cs/LC_MESSAGES/cryptsetup.mo
 +%{_prefix}/share/locale/de/LC_MESSAGES/cryptsetup.mo
 +%{_prefix}/share/locale/fi/LC_MESSAGES/cryptsetup.mo
 +%{_prefix}/share/locale/fr/LC_MESSAGES/cryptsetup.mo
 +%{_prefix}/share/locale/id/LC_MESSAGES/cryptsetup.mo
 +%{_prefix}/share/locale/it/LC_MESSAGES/cryptsetup.mo
 +%{_prefix}/share/locale/nl/LC_MESSAGES/cryptsetup.mo
 +%{_prefix}/share/locale/pl/LC_MESSAGES/cryptsetup.mo
 +%{_prefix}/share/locale/sv/LC_MESSAGES/cryptsetup.mo
 +%{_prefix}/share/locale/uk/LC_MESSAGES/cryptsetup.mo
 +%{_prefix}/share/locale/vi/LC_MESSAGES/cryptsetup.mo
++%{_prefix}/share/locale/es/LC_MESSAGES/cryptsetup.mo
 +
 +%files doc
 +%{_prefix}/share/man/man8/cryptsetup.8.gz
 +%{_prefix}/share/man/man8/veritysetup.8.gz