From f4baa3064eb1027a129495c78ac70dfbb75a5ca4 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 15 Nov 2016 16:47:29 +0100 Subject: [PATCH] new upstream release 1.25 --- .gitignore | 2 ++ ....patch => libgpg-error-1.25-multilib.patch | 30 +++++++++---------- libgpg-error.spec | 9 ++++-- sources | 4 +-- 4 files changed, 25 insertions(+), 20 deletions(-) rename libgpg-error-1.24-multilib.patch => libgpg-error-1.25-multilib.patch (77%) diff --git a/.gitignore b/.gitignore index a4f40b3..de40525 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ libgpg-error-1.9.tar.bz2.sig /libgpg-error-1.21.tar.bz2.sig /libgpg-error-1.24.tar.bz2 /libgpg-error-1.24.tar.bz2.sig +/libgpg-error-1.25.tar.bz2 +/libgpg-error-1.25.tar.bz2.sig diff --git a/libgpg-error-1.24-multilib.patch b/libgpg-error-1.25-multilib.patch similarity index 77% rename from libgpg-error-1.24-multilib.patch rename to libgpg-error-1.25-multilib.patch index 7120c9c..d512a1e 100644 --- a/libgpg-error-1.24-multilib.patch +++ b/libgpg-error-1.25-multilib.patch @@ -1,8 +1,8 @@ -diff -up libgpg-error-1.24/configure.ac.multilib libgpg-error-1.24/configure.ac ---- libgpg-error-1.24/configure.ac.multilib 2016-07-14 09:46:23.000000000 +0200 -+++ libgpg-error-1.24/configure.ac 2016-07-14 16:55:02.766037969 +0200 -@@ -186,13 +186,13 @@ AC_CHECK_SIZEOF(long) - AC_CHECK_SIZEOF(long long) +diff -up libgpg-error-1.25/configure.ac.multilib libgpg-error-1.25/configure.ac +--- libgpg-error-1.25/configure.ac.multilib 2016-11-15 16:37:13.070082441 +0100 ++++ libgpg-error-1.25/configure.ac 2016-11-15 16:39:17.132910290 +0100 +@@ -200,13 +200,13 @@ AC_CHECK_SIZEOF(time_t,,[[ + ]]) # Find a 64 bit integer type to be used instead of off_t. We prefer -# the standard integer types over int64_t and finally try long long. @@ -19,9 +19,9 @@ diff -up libgpg-error-1.24/configure.ac.multilib libgpg-error-1.24/configure.ac elif test "$ac_cv_sizeof_long_long" = "8"; then replacement_for_off_t="long long" else -diff -up libgpg-error-1.24/configure.multilib libgpg-error-1.24/configure ---- libgpg-error-1.24/configure.multilib 2016-07-14 09:49:42.000000000 +0200 -+++ libgpg-error-1.24/configure 2016-07-14 16:55:02.768038016 +0200 +diff -up libgpg-error-1.25/configure.multilib libgpg-error-1.25/configure +--- libgpg-error-1.25/configure.multilib 2016-11-14 17:21:50.000000000 +0100 ++++ libgpg-error-1.25/configure 2016-11-15 16:37:13.072082487 +0100 @@ -11280,7 +11280,7 @@ shlibpath_var= shlibpath_overrides_runpath=unknown version_type=none @@ -40,7 +40,7 @@ diff -up libgpg-error-1.24/configure.multilib libgpg-error-1.24/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -15445,12 +15445,12 @@ _ACEOF +@@ -15526,12 +15526,12 @@ _ACEOF # Find a 64 bit integer type to be used instead of off_t. We prefer # the standard integer types over int64_t and finally try long long. @@ -56,9 +56,9 @@ diff -up libgpg-error-1.24/configure.multilib libgpg-error-1.24/configure elif test "$ac_cv_sizeof_long_long" = "8"; then replacement_for_off_t="long long" else -diff -up libgpg-error-1.24/src/gen-posix-lock-obj.c.multilib libgpg-error-1.24/src/gen-posix-lock-obj.c ---- libgpg-error-1.24/src/gen-posix-lock-obj.c.multilib 2016-07-12 10:42:56.000000000 +0200 -+++ libgpg-error-1.24/src/gen-posix-lock-obj.c 2016-07-14 16:57:08.914985179 +0200 +diff -up libgpg-error-1.25/src/gen-posix-lock-obj.c.multilib libgpg-error-1.25/src/gen-posix-lock-obj.c +--- libgpg-error-1.25/src/gen-posix-lock-obj.c.multilib 2016-11-12 20:02:56.000000000 +0100 ++++ libgpg-error-1.25/src/gen-posix-lock-obj.c 2016-11-15 16:37:13.072082487 +0100 @@ -72,6 +72,7 @@ main (void) #ifdef USE_POSIX_THREADS unsigned char *p; @@ -108,9 +108,9 @@ diff -up libgpg-error-1.24/src/gen-posix-lock-obj.c.multilib libgpg-error-1.24/s putchar (','); } fputs ("}}}\n", stdout); -diff -up libgpg-error-1.24/src/gpg-error.h.in.multilib libgpg-error-1.24/src/gpg-error.h.in ---- libgpg-error-1.24/src/gpg-error.h.in.multilib 2016-07-14 16:55:02.769038039 +0200 -+++ libgpg-error-1.24/src/gpg-error.h.in 2016-07-14 16:57:38.244670407 +0200 +diff -up libgpg-error-1.25/src/gpg-error.h.in.multilib libgpg-error-1.25/src/gpg-error.h.in +--- libgpg-error-1.25/src/gpg-error.h.in.multilib 2016-11-14 16:08:37.000000000 +0100 ++++ libgpg-error-1.25/src/gpg-error.h.in 2016-11-15 16:37:13.073082510 +0100 @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, see . diff --git a/libgpg-error.spec b/libgpg-error.spec index 670d54b..ddb19ec 100644 --- a/libgpg-error.spec +++ b/libgpg-error.spec @@ -1,11 +1,11 @@ Summary: Library for error values used by GnuPG components Name: libgpg-error -Version: 1.24 +Version: 1.25 Release: 1%{?dist} -URL: ftp://ftp.gnupg.org/gcrypt/libgpg-error/ +URL: https://www.gnupg.org/related_software/libgpg-error/ Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2 Source1: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2.sig -Patch1: libgpg-error-1.24-multilib.patch +Patch1: libgpg-error-1.25-multilib.patch Group: System Environment/Libraries License: LGPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -95,6 +95,9 @@ exit 0 %{_mandir}/man1/gpg-error-config.* %changelog +* Tue Nov 15 2016 Tomáš Mráz 1.25-1 +- new upstream release 1.25 + * Thu Jul 14 2016 Tomáš Mráz 1.24-1 - new upstream release diff --git a/sources b/sources index c7d209e..286c1f1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -feb42198c0aaf3b28eabe8f41a34b983 libgpg-error-1.24.tar.bz2 -e9bf9229d5ae82759ddc6b2f963242c9 libgpg-error-1.24.tar.bz2.sig +d9fa545922a5060cbfbd87464bc31686 libgpg-error-1.25.tar.bz2 +d4e7f1bbaf5509c5c13ce1936cd3a622 libgpg-error-1.25.tar.bz2.sig