From 1d7564e1af4148201ae9168c2fe179ead5ed8a91 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 1 Sep 2015 17:50:28 +0200 Subject: [PATCH] new upstream release --- .gitignore | 2 + ....patch => libgpg-error-1.20-multilib.patch | 67 ++++++++++--------- libgpg-error.spec | 9 ++- sources | 4 +- 4 files changed, 44 insertions(+), 38 deletions(-) rename libgpg-error-1.19-multilib.patch => libgpg-error-1.20-multilib.patch (65%) diff --git a/.gitignore b/.gitignore index 6c1cfd3..dfd224b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ libgpg-error-1.9.tar.bz2.sig /libgpg-error-1.17.tar.bz2.sig /libgpg-error-1.19.tar.bz2 /libgpg-error-1.19.tar.bz2.sig +/libgpg-error-1.20.tar.bz2 +/libgpg-error-1.20.tar.bz2.sig diff --git a/libgpg-error-1.19-multilib.patch b/libgpg-error-1.20-multilib.patch similarity index 65% rename from libgpg-error-1.19-multilib.patch rename to libgpg-error-1.20-multilib.patch index 381629f..ab22248 100644 --- a/libgpg-error-1.19-multilib.patch +++ b/libgpg-error-1.20-multilib.patch @@ -1,6 +1,6 @@ -diff -up libgpg-error-1.19/configure.ac.multilib libgpg-error-1.19/configure.ac ---- libgpg-error-1.19/configure.ac.multilib 2015-04-10 18:59:23.000000000 +0200 -+++ libgpg-error-1.19/configure.ac 2015-04-13 17:19:13.494395238 +0200 +diff -up libgpg-error-1.20/configure.ac.multilib libgpg-error-1.20/configure.ac +--- libgpg-error-1.20/configure.ac.multilib 2015-08-26 08:50:34.000000000 +0200 ++++ libgpg-error-1.20/configure.ac 2015-09-01 17:34:30.948996640 +0200 @@ -186,13 +186,13 @@ AC_CHECK_SIZEOF(long) AC_CHECK_SIZEOF(long long) @@ -19,9 +19,9 @@ diff -up libgpg-error-1.19/configure.ac.multilib libgpg-error-1.19/configure.ac elif test "$ac_cv_sizeof_long_long" = "8"; then replacement_for_off_t="long long" else -diff -up libgpg-error-1.19/configure.multilib libgpg-error-1.19/configure ---- libgpg-error-1.19/configure.multilib 2015-04-10 19:02:22.000000000 +0200 -+++ libgpg-error-1.19/configure 2015-04-13 17:19:13.534396167 +0200 +diff -up libgpg-error-1.20/configure.multilib libgpg-error-1.20/configure +--- libgpg-error-1.20/configure.multilib 2015-08-26 08:59:12.000000000 +0200 ++++ libgpg-error-1.20/configure 2015-09-01 17:34:30.950996687 +0200 @@ -11275,7 +11275,7 @@ shlibpath_var= shlibpath_overrides_runpath=unknown version_type=none @@ -56,23 +56,24 @@ diff -up libgpg-error-1.19/configure.multilib libgpg-error-1.19/configure elif test "$ac_cv_sizeof_long_long" = "8"; then replacement_for_off_t="long long" else -diff -up libgpg-error-1.19/src/gen-posix-lock-obj.c.multilib libgpg-error-1.19/src/gen-posix-lock-obj.c ---- libgpg-error-1.19/src/gen-posix-lock-obj.c.multilib 2014-08-05 19:29:48.000000000 +0200 -+++ libgpg-error-1.19/src/gen-posix-lock-obj.c 2015-04-13 17:19:13.496395284 +0200 -@@ -61,6 +61,7 @@ main (void) - { +diff -up libgpg-error-1.20/src/gen-posix-lock-obj.c.multilib libgpg-error-1.20/src/gen-posix-lock-obj.c +--- libgpg-error-1.20/src/gen-posix-lock-obj.c.multilib 2015-09-01 17:34:30.950996687 +0200 ++++ libgpg-error-1.20/src/gen-posix-lock-obj.c 2015-09-01 17:45:01.009835073 +0200 +@@ -64,6 +64,7 @@ main (void) + #ifdef USE_POSIX_THREADS unsigned char *p; int i; + int initidx = 0; + #endif struct { - pthread_mutex_t mtx; long vers; -@@ -84,11 +85,12 @@ main (void) - "## File created by " PGM " - DO NOT EDIT\n" - "## To be included by mkheader into gpg-error.h\n" - "\n" -+ "#include \n" - "typedef struct\n" +@@ -103,11 +104,12 @@ main (void) + + /* To force a probably suitable alignment of the structure we use a + union and include a long and a pointer to a long. */ +- printf ("typedef struct\n" ++ printf ("#include \n" ++ "typedef struct\n" "{\n" " long _vers;\n" " union {\n" @@ -81,15 +82,15 @@ diff -up libgpg-error-1.19/src/gen-posix-lock-obj.c.multilib libgpg-error-1.19/s "%s" " long _x_align;\n" " long *_xp_align;\n" -@@ -97,7 +99,6 @@ main (void) +@@ -115,7 +117,6 @@ main (void) + "} gpgrt_lock_t;\n" "\n" "#define GPGRT_LOCK_INITIALIZER {%d,{{", - HOST_TRIPLET_STRING, - SIZEOF_PTHREAD_MUTEX_T, - #if USE_16BYTE_ALIGNMENT + # if USE_16BYTE_ALIGNMENT " int _x16_align __attribute__ ((aligned (16)));\n", - #else -@@ -107,10 +108,16 @@ main (void) + # else +@@ -125,10 +126,16 @@ main (void) p = (unsigned char *)&mtx; for (i=0; i < sizeof mtx; i++) { @@ -106,16 +107,16 @@ diff -up libgpg-error-1.19/src/gen-posix-lock-obj.c.multilib libgpg-error-1.19/s + if (i < initidx) putchar (','); } - fputs ("}}}\n" -diff -up libgpg-error-1.19/src/gpg-error.h.in.multilib libgpg-error-1.19/src/gpg-error.h.in ---- libgpg-error-1.19/src/gpg-error.h.in.multilib 2015-01-26 09:46:09.000000000 +0100 -+++ libgpg-error-1.19/src/gpg-error.h.in 2015-04-13 17:19:13.496395284 +0200 + fputs ("}}}\n", stdout); +diff -up libgpg-error-1.20/src/gpg-error.h.in.multilib libgpg-error-1.20/src/gpg-error.h.in +--- libgpg-error-1.20/src/gpg-error.h.in.multilib 2015-09-01 17:34:30.951996711 +0200 ++++ libgpg-error-1.20/src/gpg-error.h.in 2015-09-01 17:46:43.468248050 +0200 @@ -16,7 +16,7 @@ - You should have received a copy of the GNU Lesser General Public - License along with this program; if not, see . - -- @configure_input@ -+ Do not edit. Generated from gpg-error.h.in. + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, see . + * +- * @configure_input@ ++ * Do not edit. Generated from gpg-error.h.in. */ - + #ifndef GPG_ERROR_H diff --git a/libgpg-error.spec b/libgpg-error.spec index 096b897..55afb34 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.19 -Release: 2%{?dist} +Version: 1.20 +Release: 1%{?dist} URL: ftp://ftp.gnupg.org/gcrypt/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.19-multilib.patch +Patch1: libgpg-error-1.20-multilib.patch Group: System Environment/Libraries License: LGPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -97,6 +97,9 @@ exit 0 %{_mandir}/man1/gpg-error-config.* %changelog +* Tue Sep 1 2015 Tomáš Mráz 1.20-1 +- new upstream release + * Wed Jun 17 2015 Fedora Release Engineering - 1.19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index e18bb36..11ffc64 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c04c16245b92829281f43b5bef7d16da libgpg-error-1.19.tar.bz2 -b4d45f66222545ca153e3a7eb62830ff libgpg-error-1.19.tar.bz2.sig +9997d9203b672402a04760176811589d libgpg-error-1.20.tar.bz2 +1400fe717c18ad717c91ecb40337147d libgpg-error-1.20.tar.bz2.sig