From 48382d3ed5947fa8ccf5b957c9ce336b6a5f98f1f6a575a40c9b898b54ab092a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?= Date: Tue, 20 Aug 2013 12:20:13 +0000 Subject: [PATCH] Accepting request 195635 from home:AndreasStieger:branches:Base:System update to 1.12 OBS-URL: https://build.opensuse.org/request/show/195635 OBS-URL: https://build.opensuse.org/package/show/Base:System/libgpg-error?expand=0&rev=25 --- libgpg-error-1.11.tar.bz2 | 3 -- libgpg-error-1.11.tar.bz2.sig | Bin 287 -> 0 bytes libgpg-error-1.12.tar.bz2 | 3 ++ libgpg-error-1.12.tar.bz2.sig | Bin 0 -> 287 bytes libgpg-error-nld-build.diff | 88 ---------------------------------- libgpg-error.changes | 14 ++++++ libgpg-error.spec | 12 +---- 7 files changed, 18 insertions(+), 102 deletions(-) delete mode 100644 libgpg-error-1.11.tar.bz2 delete mode 100644 libgpg-error-1.11.tar.bz2.sig create mode 100644 libgpg-error-1.12.tar.bz2 create mode 100644 libgpg-error-1.12.tar.bz2.sig delete mode 100644 libgpg-error-nld-build.diff diff --git a/libgpg-error-1.11.tar.bz2 b/libgpg-error-1.11.tar.bz2 deleted file mode 100644 index 5b03384..0000000 --- a/libgpg-error-1.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae3376480a073b120c7add08f1e6cfcc08500648ccf22461cd42db6224a218c0 -size 489057 diff --git a/libgpg-error-1.11.tar.bz2.sig b/libgpg-error-1.11.tar.bz2.sig deleted file mode 100644 index 92d06459c4b8de4b7457a1613282ce52b2d278118b53f76ace24a11bfe74c7c8..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmV+)0pR|L0UQJX0SEvF1p-kkFVg@D2@oWkInqxhm5-~>+ni$re#(va_hboV(Mfso~E^cbQ)^2 zQoNvhIjS0^@%yPl8s*ca!a@@7zO<#hIVa;Y*8V6_b;-lFV+U5ABc*GDvkz5*@;V>Z zYc-R33MufN|34URFTKva&qAf>9O2|I3N^l|`ZmOpFMwM8LEKu>ZH;T9!Aq51a6Ggo lfcp-5?YO=ERw^??wU`x34R^9LS|3y&-zrc)Y8RBdR@qx%h8q9? diff --git a/libgpg-error-1.12.tar.bz2 b/libgpg-error-1.12.tar.bz2 new file mode 100644 index 0000000..12062a7 --- /dev/null +++ b/libgpg-error-1.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cafc9ed6a87c53a35175d5a1220a96ca386696eef2fa059cc0306211f246e55f +size 489266 diff --git a/libgpg-error-1.12.tar.bz2.sig b/libgpg-error-1.12.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..20db52523a7c820b112ae55f21f2930033d5f13660b5e97fedfd61fb100eebb6 GIT binary patch literal 287 zcmV+)0pR|L0UQJX0SEvF1p-mW&`kge2@oWkInqxh=xp zcnoGb+Vn@y_Kgj(7VcJf4QN=il%7L3YDI?8cd$iz9tD<1+0f`T52g+)Dl9G6OlQkT zF;Sj57g8}USptx^&@Du@>_P9f%b`85wdf}496=g6)>_i3G_OGY9NAaBGyH!c5*T-n zWNHgFQy|hr_|NK;Vp@VvE9l@j%Mw7|3IFJ%8G$Vba6`QLEs{xHdjl55rCVnnYsT2)Ae_sFq literal 0 HcmV?d00001 diff --git a/libgpg-error-nld-build.diff b/libgpg-error-nld-build.diff deleted file mode 100644 index fba9e8f..0000000 --- a/libgpg-error-nld-build.diff +++ /dev/null @@ -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) diff --git a/libgpg-error.changes b/libgpg-error.changes index 0ad77f8..4371a05 100644 --- a/libgpg-error.changes +++ b/libgpg-error.changes @@ -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 diff --git a/libgpg-error.spec b/libgpg-error.spec index 1cd71e3..9c9ad82 100644 --- a/libgpg-error.spec +++ b/libgpg-error.spec @@ -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}