new upstream release
This commit is contained in:
Tomas Mraz
parent
6c120c940f
commit
037c370b3d
2
.gitignore
vendored
2
.gitignore
vendored
@ -18,3 +18,5 @@ libgpg-error-1.9.tar.bz2.sig
|
||||
/libgpg-error-1.20.tar.bz2.sig
|
||||
/libgpg-error-1.21.tar.bz2
|
||||
/libgpg-error-1.21.tar.bz2.sig
|
||||
/libgpg-error-1.24.tar.bz2
|
||||
/libgpg-error-1.24.tar.bz2.sig
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
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
|
||||
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)
|
||||
|
||||
@ -19,10 +19,10 @@ diff -up libgpg-error-1.20/configure.ac.multilib libgpg-error-1.20/configure.ac
|
||||
elif test "$ac_cv_sizeof_long_long" = "8"; then
|
||||
replacement_for_off_t="long long"
|
||||
else
|
||||
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=
|
||||
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
|
||||
@@ -11280,7 +11280,7 @@ shlibpath_var=
|
||||
shlibpath_overrides_runpath=unknown
|
||||
version_type=none
|
||||
dynamic_linker="$host_os ld.so"
|
||||
@ -31,7 +31,7 @@ diff -up libgpg-error-1.20/configure.multilib libgpg-error-1.20/configure
|
||||
need_lib_prefix=unknown
|
||||
hardcode_into_libs=no
|
||||
|
||||
@@ -11749,7 +11749,7 @@ fi
|
||||
@@ -11754,7 +11754,7 @@ fi
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
|
||||
@ -40,7 +40,7 @@ diff -up libgpg-error-1.20/configure.multilib libgpg-error-1.20/configure
|
||||
fi
|
||||
|
||||
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
||||
@@ -15440,12 +15440,12 @@ _ACEOF
|
||||
@@ -15445,12 +15445,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,10 +56,10 @@ diff -up libgpg-error-1.20/configure.multilib libgpg-error-1.20/configure
|
||||
elif test "$ac_cv_sizeof_long_long" = "8"; then
|
||||
replacement_for_off_t="long long"
|
||||
else
|
||||
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)
|
||||
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
|
||||
@@ -72,6 +72,7 @@ main (void)
|
||||
#ifdef USE_POSIX_THREADS
|
||||
unsigned char *p;
|
||||
int i;
|
||||
@ -67,7 +67,7 @@ diff -up libgpg-error-1.20/src/gen-posix-lock-obj.c.multilib libgpg-error-1.20/s
|
||||
#endif
|
||||
struct {
|
||||
long vers;
|
||||
@@ -103,11 +104,12 @@ main (void)
|
||||
@@ -111,11 +112,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. */
|
||||
@ -82,15 +82,15 @@ diff -up libgpg-error-1.20/src/gen-posix-lock-obj.c.multilib libgpg-error-1.20/s
|
||||
"%s"
|
||||
" long _x_align;\n"
|
||||
" long *_xp_align;\n"
|
||||
@@ -115,7 +117,6 @@ main (void)
|
||||
@@ -123,7 +125,6 @@ main (void)
|
||||
"} gpgrt_lock_t;\n"
|
||||
"\n"
|
||||
"#define GPGRT_LOCK_INITIALIZER {%d,{{",
|
||||
- SIZEOF_PTHREAD_MUTEX_T,
|
||||
# if USE_16BYTE_ALIGNMENT
|
||||
" int _x16_align __attribute__ ((aligned (16)));\n",
|
||||
# else
|
||||
@@ -125,10 +126,16 @@ main (void)
|
||||
# elif USE_DOUBLE_FOR_ALIGNMENT
|
||||
@@ -137,10 +138,16 @@ main (void)
|
||||
p = (unsigned char *)&mtx;
|
||||
for (i=0; i < sizeof mtx; i++)
|
||||
{
|
||||
@ -108,12 +108,12 @@ diff -up libgpg-error-1.20/src/gen-posix-lock-obj.c.multilib libgpg-error-1.20/s
|
||||
putchar (',');
|
||||
}
|
||||
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
|
||||
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
|
||||
@@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
* License along with this program; if not, see <https://www.gnu.org/licenses/>.
|
||||
*
|
||||
- * @configure_input@
|
||||
+ * Do not edit. Generated from gpg-error.h.in.
|
||||
@ -1,11 +1,11 @@
|
||||
Summary: Library for error values used by GnuPG components
|
||||
Name: libgpg-error
|
||||
Version: 1.21
|
||||
Release: 3%{?dist}
|
||||
Version: 1.24
|
||||
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.20-multilib.patch
|
||||
Patch1: libgpg-error-1.24-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
|
||||
* Thu Jul 14 2016 Tomáš Mráz <tmraz@redhat.com> 1.24-1
|
||||
- new upstream release
|
||||
|
||||
* Fri Mar 18 2016 Rex Dieter <rdieter@fedoraproject.org> - 1.21-3
|
||||
- drop explicit /sbin/ldconfig scriptlet deps (#1319144)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user