diff --git a/libassuan-2.5.1.tar.bz2 b/libassuan-2.5.1.tar.bz2 deleted file mode 100644 index 98c51df..0000000 Binary files a/libassuan-2.5.1.tar.bz2 and /dev/null differ diff --git a/libassuan-2.5.1.tar.bz2.sig b/libassuan-2.5.1.tar.bz2.sig deleted file mode 100644 index a18714f..0000000 Binary files a/libassuan-2.5.1.tar.bz2.sig and /dev/null differ diff --git a/libassuan-2.5.2-multilib.patch b/libassuan-2.5.2-multilib.patch new file mode 100644 index 0000000..8c3345c --- /dev/null +++ b/libassuan-2.5.2-multilib.patch @@ -0,0 +1,28 @@ +diff -up libassuan-2.5.2/src/libassuan-config.in.multilib libassuan-2.5.2/src/libassuan-config.in +--- libassuan-2.5.2/src/libassuan-config.in.multilib 2019-01-08 16:31:11.042204893 +0100 ++++ libassuan-2.5.2/src/libassuan-config.in 2019-01-08 16:31:20.026048884 +0100 +@@ -19,7 +19,7 @@ lib="@LIBASSUAN_CONFIG_LIBS@" + extralibs="$gpg_error_libs" + cflags="@LIBASSUAN_CONFIG_CFLAGS@ $gpg_error_cflags" + api_version="@LIBASSUAN_CONFIG_API_VERSION@" +-my_host="@LIBASSUAN_CONFIG_HOST@" ++my_host="myhost" + prefix=@prefix@ + exec_prefix=@exec_prefix@ + includes="" +@@ -131,13 +131,7 @@ if test "$echo_cflags" = "yes"; then + fi + + if test "$echo_libs" = "yes"; then +- if test "@libdir@" != "/usr/lib" ; then +- libdirs="-L@libdir@" +- for i in $lib $extralibs ; do +- if test "$i" = "-L@libdir@" ; then +- libdirs="" +- fi +- done +- fi ++ # libdir is always standard and implicitly searched ++ libdirs="" + echo $libdirs $lib $extralibs + fi diff --git a/libassuan-2.5.3-includedir.patch b/libassuan-2.5.3-includedir.patch new file mode 100644 index 0000000..1e56733 --- /dev/null +++ b/libassuan-2.5.3-includedir.patch @@ -0,0 +1,11 @@ +diff -up libassuan-2.5.3/src/libassuan.pc.in.includedir libassuan-2.5.3/src/libassuan.pc.in +--- libassuan-2.5.3/src/libassuan.pc.in.includedir 2018-10-25 11:20:28.000000000 +0200 ++++ libassuan-2.5.3/src/libassuan.pc.in 2019-08-19 10:29:10.536279378 +0200 +@@ -9,6 +9,6 @@ Name: libassuan + Description: IPC library for the GnuPG components + Requires: gpg-error + Version: @PACKAGE_VERSION@ +-Cflags: @LIBASSUAN_CONFIG_CFLAGS@ ++Cflags: @LIBASSUAN_CONFIG_CFLAGS@ -I${includedir} + Libs: @LIBASSUAN_CONFIG_LIBS@ + URL: https://www.gnupg.org/related_software/libassuan/index.html diff --git a/libassuan-2.5.3.tar.bz2 b/libassuan-2.5.3.tar.bz2 new file mode 100644 index 0000000..81dddfb Binary files /dev/null and b/libassuan-2.5.3.tar.bz2 differ diff --git a/libassuan-2.5.3.tar.bz2.sig b/libassuan-2.5.3.tar.bz2.sig new file mode 100644 index 0000000..c1f7f81 Binary files /dev/null and b/libassuan-2.5.3.tar.bz2.sig differ diff --git a/libassuan.spec b/libassuan.spec index 1cc5fff..7e87099 100644 --- a/libassuan.spec +++ b/libassuan.spec @@ -1,11 +1,14 @@ -Name: libassuan -Version: 2.5.1 -Release: 6 +Name: libassuan +Version: 2.5.3 +Release: 1 Summary: A small library implementing the so-called Assuan protocal License: LGPLv2+ and GPLv3+ URL: https://ww.gnupg.org/ -Source0: https://gnupg.org/ftp/gcrypt/libassuan/libassuan-%{version}.tar.bz2 -Source1: https://gnupg.org/ftp/gcrypt/libassuan/libassuan-%{version}.tar.bz2.sig +Source0: https://gnupg.org/ftp/gcrypt/libassuan/libassuan-%{version}.tar.bz2 +Source1: https://gnupg.org/ftp/gcrypt/libassuan/libassuan-%{version}.tar.bz2.sig + +Patch0000: libassuan-2.5.2-multilib.patch +Patch0001: libassuan-2.5.3-includedir.patch BuildRequires: gcc gawk libgpg-error-devel >= 1.8 @@ -17,8 +20,7 @@ BuildRequires: gcc gawk libgpg-error-devel >= 1.8 Summary: GnuPG IPC library Provides: libassuan2-devel = %{version}-%{release} Requires: %{name} = %{version}-%{release} -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info +Requires: pkgconfig %description devel Provide files which are needed to develop applications using %{name}. @@ -44,14 +46,6 @@ make check %ldconfig_scriptlets -%post devel -/sbin/install-info %{_infodir}/assuan.info %{_infodir}/dir &>/dev/null || : - -%preun devel -if [ $1 -eq 0 ]; then - /sbin/install-info --delete %{_infodir}/assuan.info %{_infodir}/dir &>/dev/null || : -fi - %files %defattr(-,root,root) %doc AUTHORS @@ -64,6 +58,7 @@ fi %{_bindir}/libassuan-config %{_includedir}/libassuan2/assuan.* %{_libdir}/lib*.so +%{_libdir}/pkgconfig/libassuan.pc %{_datadir}/aclocal/lib*.m4 %{_infodir}/assuan.info* @@ -72,6 +67,12 @@ fi %doc ChangeLog NEWS README THANKS TODO %changelog +* Fri Jul 24 2020 openEuler Buildteam - 2.5.3-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:upgrade to 2.5.3 + * Sat Jan 11 2020 openEuler Buildteam - 2.5.1-6 - delete uesless info