forked from pool/libgpg-error
Accepting request 195695 from Base:System
update to 1.12 (forwarded request 195635 from AndreasStieger) OBS-URL: https://build.opensuse.org/request/show/195695 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgpg-error?expand=0&rev=32
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
commit
ee60d7d8d2
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ae3376480a073b120c7add08f1e6cfcc08500648ccf22461cd42db6224a218c0
|
||||
size 489057
|
||||
Binary file not shown.
3
libgpg-error-1.12.tar.bz2
Normal file
3
libgpg-error-1.12.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cafc9ed6a87c53a35175d5a1220a96ca386696eef2fa059cc0306211f246e55f
|
||||
size 489266
|
||||
BIN
libgpg-error-1.12.tar.bz2.sig
Normal file
BIN
libgpg-error-1.12.tar.bz2.sig
Normal file
Binary file not shown.
@ -1,88 +0,0 @@
|
||||
--- po/Makevars
|
||||
+++ po/Makevars 2004/07/14 08:56:43
|
||||
@@ -1,7 +1,7 @@
|
||||
# Makefile variables for PO directory in any package using GNU gettext.
|
||||
|
||||
# Usually the message domain is the same as the package name.
|
||||
-DOMAIN = $(PACKAGE)
|
||||
+DOMAIN = $(PACKAGE)-nld
|
||||
|
||||
# These two variables depend on the location of this directory.
|
||||
subdir = po
|
||||
--- src/gpg-error-config.in
|
||||
+++ src/gpg-error-config.in 2004/07/14 08:57:04
|
||||
@@ -65,7 +65,7 @@
|
||||
if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
|
||||
output="$output -L$libdir"
|
||||
fi
|
||||
- output="$output -lgpg-error"
|
||||
+ output="$output -lgpg-error-nld"
|
||||
;;
|
||||
*)
|
||||
usage 1 1>&2
|
||||
--- src/Makefile.am
|
||||
+++ src/Makefile.am 2004/07/14 08:56:43
|
||||
@@ -37,19 +37,19 @@
|
||||
|
||||
include_HEADERS = gpg-error.h
|
||||
|
||||
-lib_LTLIBRARIES = libgpg-error.la
|
||||
+lib_LTLIBRARIES = libgpg-error-nld.la
|
||||
|
||||
-libgpg_error_la_LDFLAGS = -version-info \
|
||||
+libgpg_error_nld_la_LDFLAGS = -version-info \
|
||||
@LIBGPG_ERROR_LT_CURRENT@:@LIBGPG_ERROR_LT_REVISION@:@LIBGPG_ERROR_LT_AGE@
|
||||
|
||||
-libgpg_error_la_SOURCES = gpg-error.h gettext.h \
|
||||
+libgpg_error_nld_la_SOURCES = gpg-error.h gettext.h \
|
||||
strsource.c strerror.c code-to-errno.c code-from-errno.c
|
||||
|
||||
-libgpg_error_la_LIBADD = @LTLIBINTL@
|
||||
+libgpg_error_nld_la_LIBADD = @LTLIBINTL@
|
||||
|
||||
bin_PROGRAMS = gpg-error
|
||||
gpg_error_SOURCES = strsource-sym.c strerror-sym.c gpg-error.c
|
||||
-gpg_error_LDADD = ./libgpg-error.la
|
||||
+gpg_error_LDADD = ./libgpg-error-nld.la
|
||||
|
||||
err-sources.h: Makefile mkstrtable.awk err-sources.h.in
|
||||
$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=3 \
|
||||
--- src/strerror.c
|
||||
+++ src/strerror.c 2004/07/14 08:56:43
|
||||
@@ -47,7 +47,7 @@
|
||||
else
|
||||
code = GPG_ERR_UNKNOWN_ERRNO;
|
||||
}
|
||||
- return dgettext (PACKAGE, msgstr + msgidx[msgidxof (code)]);
|
||||
+ return dgettext (PACKAGE"-nld", msgstr + msgidx[msgidxof (code)]);
|
||||
}
|
||||
|
||||
|
||||
@@ -158,7 +158,7 @@
|
||||
code = GPG_ERR_UNKNOWN_ERRNO;
|
||||
}
|
||||
|
||||
- errstr = dgettext (PACKAGE, msgstr + msgidx[msgidxof (code)]);
|
||||
+ errstr = dgettext (PACKAGE"-nld", msgstr + msgidx[msgidxof (code)]);
|
||||
errstr_len = strlen (errstr) + 1;
|
||||
cpy_len = errstr_len < buflen ? errstr_len : buflen;
|
||||
memcpy (buf, errstr, cpy_len);
|
||||
--- src/strsource.c
|
||||
+++ src/strsource.c 2004/07/14 08:56:43
|
||||
@@ -33,5 +33,5 @@
|
||||
gpg_strsource (gpg_error_t err)
|
||||
{
|
||||
gpg_err_source_t source = gpg_err_source (err);
|
||||
- return dgettext (PACKAGE, msgstr + msgidx[msgidxof (source)]);
|
||||
+ return dgettext (PACKAGE"-nld", msgstr + msgidx[msgidxof (source)]);
|
||||
}
|
||||
--- tests/Makefile.am
|
||||
+++ tests/Makefile.am 2004/07/14 08:56:43
|
||||
@@ -23,6 +23,6 @@
|
||||
|
||||
INCLUDES = -I$(top_builddir)/src
|
||||
|
||||
-LDADD = ../src/libgpg-error.la
|
||||
+LDADD = ../src/libgpg-error-nld.la
|
||||
|
||||
noinst_PROGRAMS = $(TESTS)
|
||||
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 19 21:21:34 UTC 2013 - andreas.stieger@gmx.de
|
||||
|
||||
- update to 1.12
|
||||
* Interface changes relative to the 1.11 release:
|
||||
GPG_ERR_NO_CRYPT_CTX NEW.
|
||||
GPG_ERR_WRONG_CRYPT_CTX NEW.
|
||||
GPG_ERR_BAD_CRYPT_CTX NEW.
|
||||
GPG_ERR_CRYPT_CTX_CONFLICT NEW.
|
||||
GPG_ERR_BROKEN_PUBKEY NEW.
|
||||
GPG_ERR_BROKEN_SECKEY NEW.
|
||||
- drop unused libgpg-error-nld-build.diff
|
||||
- drop autoreconv call
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 18 08:46:57 UTC 2013 - coolo@suse.com
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: libgpg-error
|
||||
Version: 1.11
|
||||
Version: 1.12
|
||||
Release: 0
|
||||
Summary: Library That Defines Common Error Values for All GnuPG Components
|
||||
License: GPL-2.0+ and LGPL-2.1+
|
||||
@ -28,9 +28,6 @@ Source1: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.b
|
||||
# http://www.gnupg.org/signature_key.en.html
|
||||
Source2: %name.keyring
|
||||
Source3: baselibs.conf
|
||||
# rename package to "libgpg-error-nld" and set this to 1 for NLD
|
||||
%define nld_build 0
|
||||
Patch0: %name-nld-build.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: libtool
|
||||
#BuildRequires: gpg-offline
|
||||
@ -66,9 +63,6 @@ Group: Development/Libraries/C and C++
|
||||
Obsoletes: libgpg-error-devel-64bit
|
||||
%endif
|
||||
#
|
||||
%if %nld_build
|
||||
Conflicts: libgpg-error-devel
|
||||
%endif
|
||||
Requires: glibc-devel
|
||||
Requires: libgpg-error0 = %version
|
||||
|
||||
@ -77,12 +71,8 @@ Files needed for software development using libgpg-error.
|
||||
|
||||
%prep
|
||||
%setup -q -n libgpg-error-%version
|
||||
%if %nld_build
|
||||
%patch0
|
||||
%endif
|
||||
|
||||
%build
|
||||
autoreconf -fiv
|
||||
%configure --disable-static --with-pic
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user