diff --git a/libassuan-2.1.0-multilib.patch b/libassuan-2.5.2-multilib.patch similarity index 54% rename from libassuan-2.1.0-multilib.patch rename to libassuan-2.5.2-multilib.patch index f6ec6aa..8c3345c 100644 --- a/libassuan-2.1.0-multilib.patch +++ b/libassuan-2.5.2-multilib.patch @@ -1,16 +1,16 @@ -diff -up libassuan-2.1.0/src/libassuan-config.in.multilib libassuan-2.1.0/src/libassuan-config.in ---- libassuan-2.1.0/src/libassuan-config.in.multilib 2013-05-15 12:41:33.376279564 +0200 -+++ libassuan-2.1.0/src/libassuan-config.in 2013-05-15 12:40:11.565515616 +0200 -@@ -18,7 +18,7 @@ lib="@LIBASSUAN_CONFIG_LIB@" - extralibs="@LIBASSUAN_CONFIG_EXTRA_LIBS@ $gpg_error_libs" +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="none" ++my_host="myhost" prefix=@prefix@ exec_prefix=@exec_prefix@ includes="" -@@ -121,13 +121,7 @@ if test "$echo_cflags" = "yes"; then +@@ -131,13 +131,7 @@ if test "$echo_cflags" = "yes"; then fi if test "$echo_libs" = "yes"; then diff --git a/libassuan.spec b/libassuan.spec index 0d4c9dc..8202e39 100644 --- a/libassuan.spec +++ b/libassuan.spec @@ -1,7 +1,7 @@ Name: libassuan Summary: GnuPG IPC library -Version: 2.5.1 -Release: 4%{?dist} +Version: 2.5.2 +Release: 1%{?dist} # The library is LGPLv2+, the documentation GPLv3+ License: LGPLv2+ and GPLv3+ @@ -9,7 +9,7 @@ Source0: https://gnupg.org/ftp/gcrypt/libassuan/libassuan-%{version}.tar.bz2 Source1: https://gnupg.org/ftp/gcrypt/libassuan/libassuan-%{version}.tar.bz2.sig URL: http://www.gnupg.org/ -Patch1: libassuan-2.1.0-multilib.patch +Patch1: libassuan-2.5.2-multilib.patch BuildRequires: gcc BuildRequires: gawk @@ -24,8 +24,7 @@ Summary: GnuPG IPC library Provides: libassuan2-devel = %{version}-%{release} Provides: libassuan2-devel%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info +Requires: pkgconfig %description devel This is the IPC static library used by GnuPG 2, GPGME and a few other packages. @@ -60,15 +59,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 %license COPYING COPYING.LIB %doc AUTHORS ChangeLog NEWS README THANKS TODO @@ -78,11 +68,16 @@ fi %{_bindir}/libassuan-config %{_includedir}/libassuan2/ %{_libdir}/libassuan.so +%{_libdir}/pkgconfig/libassuan.pc %{_datadir}/aclocal/libassuan.m4 %{_infodir}/assuan.info* %changelog +* Tue Jan 08 2019 Tomáš Mráz 2.5.2-1 +- new upstream release 2.5.2 +- drop obsolete install-info scriptlets + * Fri Jul 13 2018 Fedora Release Engineering - 2.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild