Merge branch 'upstream' into tizen

Change-Id: I254f6095d312777427a57af3ed346986a28f3aaa

diff --cc configure.ac
Simple merge

diff --cc packaging/libtasn1.spec
index 740f7fb,0000000..ac63c2d
mode 100644,000000..100644
--- 1/packaging/libtasn1.spec
--- /dev/null
+++ b/packaging/libtasn1.spec
@@@ -1,76 -1,0 +1,76 @@@
- Version:        4.8
 +Name:           libtasn1
++Version:        4.13
 +Release:        0
 +License:        LGPL-2.1+ or GPL-3.0+
 +Summary:        ASN
 +Url:            http://ftp.gnu.org/gnu/libtasn1/
 +Group:          Security/Crypto Libraries
 +Source:         %{name}-%{version}.tar.gz
 +Source99:       baselibs.conf
 +Source1001:     libtasn1.manifest
 +BuildRequires:  info
 +BuildRequires:  pkg-config
 +BuildRequires:  makeinfo
 +BuildRequires:  help2man
 +
 +%description
 +This is the ASN.1 library used in GNUTLS. More up to date information
 +can be found at http://www.gnu.org/software/gnutls and
 +http://www.gnutls.org
 +
 +%package tools
 +Summary:        ASN
 +Group:          Security/Crypto Libraries
 +Requires:       %{name} = %{version}
 +
 +%description tools
 +This is the ASN.1 library used in GNUTLS. More up to date information
 +can be found at http://www.gnu.org/software/gnutls and
 +http://www.gnutls.org
 +
 +%package devel
 +Summary:        ASN
 +Group:          Development/Libraries
 +Requires:       %{name} = %{version}
 +
 +%description devel
 +This is the ASN.1 library used in GNUTLS. More up to date information
 +can be found at http://www.gnu.org/software/gnutls and
 +http://www.gnutls.org
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1001} .
 +
 +%build
 +touch ChangeLog
 +%reconfigure --disable-static
 +%__make %{?_smp_mflags}
 +
 +%install
 +%make_install
 +
 +%post -p /sbin/ldconfig
 +
 +%postun  -p /sbin/ldconfig
 +
 +%docs_package
 +
 +%files tools
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%license COPYING
 +%{_bindir}/*
 +
 +%files
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%license COPYING.LIB
 +%{_libdir}/*.so.*
 +
 +%files devel
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%{_includedir}/*.h
 +%{_libdir}/*.so
 +%{_libdir}/pkgconfig/libtasn1.pc