Merge branch 'upstream' into tizen_base

Change-Id: I0940ba0e798dda602b80991153af292da3bfb3b7

diff --cc packaging/libgpg-error.spec
index 8765c36,0000000..fbede3d
mode 100644,000000..100644
--- 1/packaging/libgpg-error.spec
--- /dev/null
+++ b/packaging/libgpg-error.spec
@@@ -1,71 -1,0 +1,68 @@@
- Version:        1.43
 +Name:           libgpg-error
- %configure --disable-static --with-pic
++Version:        1.46
 +Release:        0
 +License:        LGPL-2.1+
 +Summary:        Library That Defines Common Error Values for All GnuPG Components
 +Url:            http://www.gnupg.org/
 +Group:          Security/Crypto Libraries
 +Source:         %{name}-%{version}.tar.bz2
 +Source1:        baselibs.conf
 +Source1001:   libgpg-error.manifest
 +BuildRequires:  gettext-tools
 +BuildRequires:  libtool
 +
 +%description
 +This is a library that defines common error values for all GnuPG
 +components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
 +pinentry, SmartCard Daemon, and possibly more in the future.
 +
 +%package devel
 +License:        LGPL-2.1+ and GPL-2.0+ and X11
 +Summary:        Development package for libgpg-error
 +Group:          Development/Libraries
 +Requires:       glibc-devel
 +Requires:       libgpg-error = %{version}
 +
 +%description devel
 +Files needed for software development using libgpg-error.
 +
 +%prep
 +%setup -q -n libgpg-error-%{version}
 +cp %{SOURCE1001} .
 +
 +%build
 +export CPPFLAGS+=" -P"
 +autoreconf -fiv
- %{_infodir}/*
- %{_datarootdir}/libgpg-error/*
- %{_mandir}/man1/*
++%configure --disable-static --with-pic --disable-doc
 +make %{?_smp_mflags}
 +
 +%install
 +%make_install
 +rm -r %{buildroot}%{_datadir}/common-lisp
 +%find_lang %{name}
 +
 +%post  -p /sbin/ldconfig
 +
 +%postun -p /sbin/ldconfig
 +
 +%lang_package
 +
 +
 +%files
 +%manifest %{name}.manifest
 +%defattr(-,root,root)
 +%license COPYING.LIB
 +%{_libdir}/libgpg-error*.so.*
 +
 +%files devel
 +%manifest %{name}.manifest
 +%defattr(-,root,root)
 +%license COPYING.MIT COPYING
 +%{_datadir}/aclocal/gpg-error.m4
 +%{_datadir}/aclocal/gpgrt.m4
 +%{_includedir}/*
 +%{_bindir}/*
 +%{_libdir}/libgpg-error*.so
 +%{_libdir}/pkgconfig/gpg-error.pc
 +
 +%changelog