upgrade to 2.5.3

Signed-off-by: yeah_wang <1485652911@qq.com>
This commit is contained in:
yeah_wang 2020-07-24 21:31:43 +08:00
parent bf0d004a85
commit 902f63ca9d
7 changed files with 55 additions and 15 deletions

Binary file not shown.

Binary file not shown.

View File

@ -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

View File

@ -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

BIN
libassuan-2.5.3.tar.bz2 Normal file

Binary file not shown.

BIN
libassuan-2.5.3.tar.bz2.sig Normal file

Binary file not shown.

View File

@ -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 <buildteam@openeuler.org> - 2.5.3-1
- Type:enhancement
- ID:NA
- SUG:NA
- DESC:upgrade to 2.5.3
* Sat Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.5.1-6
- delete uesless info