Accepting request 158127 from Base:System

update to 1.4.0 (forwarded request 157160 from AndreasStieger)

OBS-URL: https://build.opensuse.org/request/show/158127
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpgme?expand=0&rev=46
This commit is contained in:
Stephan Kulow 2013-03-10 06:49:56 +00:00 committed by Git OBS Bridge
commit c7f19aa514
7 changed files with 87 additions and 66 deletions

View File

@ -1,54 +0,0 @@
Index: src/gpgme-config.in
===================================================================
--- src/gpgme-config.in.orig 2012-05-02 09:42:23.000000000 +0100
+++ src/gpgme-config.in 2012-11-16 22:43:53.000000000 +0000
@@ -23,7 +23,7 @@ libs="-L@libdir@"
# Network libraries.
assuan_cflags="@LIBASSUAN_CFLAGS@"
-assuan_libs="@LIBASSUAN_LIBS@"
+#assuan_libs="@LIBASSUAN_LIBS@"
# Configure libgpg-error.
gpg_error_cflags="@GPG_ERROR_CFLAGS@"
Index: src/Makefile.am
===================================================================
--- src/Makefile.am.orig 2012-04-13 09:01:09.000000000 +0100
+++ src/Makefile.am 2012-11-16 22:43:53.000000000 +0000
@@ -196,12 +196,13 @@ libgpgme_la_DEPENDENCIES = @LTLIBOBJS@ $
libgpgme_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
@GPG_ERROR_LIBS@
+libgpgme_pthread_la_CFLAGS = -pthread
libgpgme_pthread_la_LDFLAGS = $(no_undefined) $(export_symbols) \
$(libgpgme_version_script_cmd) -version-info \
@LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
libgpgme_pthread_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers
libgpgme_pthread_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
- -lpthread @GPG_ERROR_LIBS@
+ @GPG_ERROR_LIBS@
if BUILD_W32_GLIB
libgpgme_glib_la_LDFLAGS = $(no_undefined) \
Index: configure.ac
===================================================================
--- configure.ac.orig 2012-05-02 10:06:21.000000000 +0100
+++ configure.ac 2012-11-16 22:43:53.000000000 +0000
@@ -78,7 +78,7 @@ AM_MAINTAINER_MODE
AC_CANONICAL_HOST
# Enable GNU extensions on systems that have them.
-AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
AH_VERBATIM([_REENTRANT],
[/* To allow the use of GPGME in multithreaded programs we have to use
@@ -89,7 +89,7 @@ AH_VERBATIM([_REENTRANT],
# define _REENTRANT 1
#endif])
-AC_PROG_CC
+AC_PROG_CC_STDC
AC_PROG_CXX
AC_CHECK_PROGS(GITLOG_TO_CHANGELOG, gitlog-to-changelog,
[build-aux/gitlog-to-changelog])

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cfd235663f1d1adc97abb38dd5e6d093bb7e155580f171f9ba0158feab69f875
size 867738

3
gpgme-1.4.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:728c959abb0795ed4357b308cdbba92210d22998b075664d1e038d3cc7145619
size 958151

BIN
gpgme-1.4.0.tar.bz2.sig Normal file

Binary file not shown.

View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Sun Mar 3 15:51:35 UTC 2013 - andreas.stieger@gmx.de
- update to 1.4.0
* New function gpgme_io_writen as a convenience wrapper around
gpgme_io_write.
* New functions to support the pinentry mode feature of GnuPG 2.1.
* New macro GPGME_VERSION_NUMBER to allow supporting different API
versions without the need for a configure test.
* Several improvements for gpgme-tool.
* Better logging of the common "invalid engine" error code.
* Support for FD passing is now enabled by default. The configure
option --disable-fd-passing may be used to disable this.
* Interface changes relative to the 1.3.1 release:
GPGME_VERSION_NUMBER NEW.
gpgme_io_writen NEW.
gpgme_set_global_flag NEW.
gpgme_set_pinentry_mode NEW.
gpgme_get_pinentry_mode NEW.
gpgme_pinentry_mode_t NEW.
GPGME_PINENTRY_MODE_DEFAULT NEW.
GPGME_PINENTRY_MODE_ASK NEW.
GPGME_PINENTRY_MODE_CANCEL NEW.
GPGME_PINENTRY_MODE_ERROR NEW.
GPGME_PINENTRY_MODE_LOOPBACK NEW.
- pass --disable-fd-passing, regression tests crash otherwise
- add verification of source tarball signatures during build
- remove conflict marker in past changelog entries
- drop gpgme-1.3.2-gpgme-config-remove-extraneous-libs.patch
other packages in openSUSE:Factory which depend on gpgme also depend
on libassuan
- autogen call no longer required
- call make in %build section
-------------------------------------------------------------------
Fri Nov 16 22:53:49 UTC 2012 - andreas.stieger@gmx.de
@ -63,7 +97,6 @@ Mon Jan 31 14:47:20 UTC 2011 - gber@opensuse.org
order to remove the extraneuos libassuan from gpgme-config
-------------------------------------------------------------------
>>>>>>> ./gpgme.changes.r4f20f9a7e442573486c918b107fed59f
Tue Dec 14 13:05:39 UTC 2010 - cristian.rodriguez@opensuse.org
- run spec cleaner

37
gpgme.keyring Normal file
View File

@ -0,0 +1,37 @@
pub 2048R/4F25E3B6 2011-01-12 [expires: 2019-12-31]
uid Werner Koch (dist sig)
sub 2048R/AC87C71A 2011-01-12 [expires: 2019-12-31]
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.19 (GNU/Linux)
mQENBE0ti4EBCACqGtKlX9jI/enhlBdy2cyQP6Q7JoyxtaG6/ckAKWHYrqFTQk3I
Ue8TuDrGT742XFncG9PoMBfJDUNltIPgKFn8E9tYQqAOlpSA25bOb30cA2ADkrjg
jvDAH8cZ+fkIayWtObTxwqLfPivjFxEM//IdShFFVQj+QHmXYBJggWyEIil8Bje7
KRw6B5ucs4qSzp5VH4CqDr9PDnLD8lBGHk0x8jpwh4V/yEODJKATY0Vj00793L8u
qA35ZiyczUvvJSLYvf7STO943GswkxdAfqxXbYifiK2gjE/7SAmB+2jFxsonUDOB
1BAY5s3FKqrkaxZr3BBjeuGGoCuiSX/cXRIhABEBAAG0Fldlcm5lciBLb2NoIChk
aXN0IHNpZymJAT4EEwECACgFAk0ti4ECGwMFCRDdnwIGCwkIBwMCBhUIAgkKCwQW
AgMBAh4BAheAAAoJECSbOdJPJeO2PlMIAJxPtFXf5yozPpFjRbSkSdjsk9eru05s
hKZOAKw3RUePTU80SRLPdg4AH+vkm1JMWFFpwvHlgfxqnE9rp13o7L/4UwNUwqH8
5zCwu7SHz9cX3d4UUwzcP6qQP4BQEH9/xlpQS9eTK9b2RMyggqwd/J8mxjvoWzL8
Klf/wl6jXHn/yP92xG9/YA86lNOL1N3/PhlZzLuJ6bdD9WzsEp/+kh3UDfjkIrOc
WkqwupB+d01R4bHPu9tvXy8Xut8Sok2zku2xVkEOsV2TXHbwuHO2AGC5pWDX6wgC
E4F5XeCB/0ovao2/bk22w1TxzP6PMxo6sLkmaF6D0frhM2bl4C/uSsq5AQ0ETS2L
gQEIAKHwucgbaRj0V7Ht0FnM6RmbqwZ7IFV2lR+YN1gkZaWRRCaJoPEZFKhhPEBX
1bDVwr/iTPaPPEtpi7oQoHk65yeLrhtOmXXpNVkV/5WQjAJIrWn+JQ3z/ZejxHUL
hzKsGg5FC6pRYcEyzRXHtv4BO9kBIKNVirZjEkQG4BnIrQgl6e2YFa47GNMqcQH7
nJdwG1cGQOZOIDQQM41gBzwoSrStMA6DjHkukFegKfcSbSLArBtYNAwTwmW7RqOM
EJwlo0+NYx2Yn75x66bYwdlsP0FLOgez/O/IxoPRxXr0l4e+uj6dFHqvBi04dx6J
sPmXEyeAyLiCWSh7Rwq8uIhBUBUAEQEAAYicBBABAgAGBQJNLY0EAAoJEFO2INAc
4MYwRk8EAIuasyOnCbJW8jpfk3g2VZy1dBZj7g4PHaI70K1Qz8X3piI8WWaDCwlT
PJcvAAtiT6yGHzdONAt+N7GiHNLU7TsMJlTLsuxv1HsdtgnVh/9BwTKRuIBbjrkJ
lvUEA4xHYdQ4MFNoAFqJ1+eGZTMm1rLPtjQopEcDH5VVLqR+ewWriQElBBgBAgAP
BQJNLYuBAhsgBQkQ3Z8CAAoJECSbOdJPJeO2uxIIAJE2B8aQPQ6o6LBijX/4rJae
tAu6xW9Jg7DyE3rqB5TcE7yJDQqjL6bRApjWRaNofB7CmDxl5tjgTawds0gL1KnK
LLPb2wAnaKe9/j/gx6lOCnE2LDj5ebKQKQ3UB9WG8xNBczNFs7lnBG0+mOwyvWPm
9fWzpTf9HFIAi2kCQK7UYZNM4fSvXY5yFz+6b5AYDI7pZSP8iJnUxfu2hdbRIKjw
NKXzPlDsqYlYXpNAsrUuS7hshUbUe7CjX/RYdza8Jp3kHEeOCjLxOwotOa9hBla2
eNa9AZXZQ4AFhZxpy61ldBDY88IhjsuWm5L/jkJdZtPlj6bFjfLt1vPhoX7y7II=
=Di5x
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -1,7 +1,7 @@
#
# spec file for package gpgme
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,19 +17,22 @@
Name: gpgme
BuildRequires: gpg2 >= 2.0.10
Version: 1.3.2
Version: 1.4.0
Release: 0
Summary: A Library Designed to Give Applications Easy Access to GnuPG
License: GPL-2.0+
Group: Productivity/Security
Url: http://www.gnupg.org/related_software/gpgme/
Source: ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2
Patch0: gpgme-1.3.2-gpgme-config-remove-extraneous-libs.patch
Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2.sig
Source2: baselibs.conf
BuildRequires: automake
Source3: gpgme.keyring
BuildRequires: gpg2 >= 2.0.10
BuildRequires: libassuan-devel >= 2.0.2
BuildRequires: libgpg-error-devel >= 1.8
%if 0%{?suse_version} >= 1230
BuildRequires: gpg-offline
%endif
PreReq: %install_info_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -94,11 +97,10 @@ Authors of MUAs should especially consider using GPGME. Creating a set
of standard widgets for common key selection tasks is even planned.
%prep
%{?gpg_verify: %gpg_verify %{S:1}}
%setup -q
%patch0
%build
sh autogen.sh
# Ensure that a (re)build uses fixed binaries with minimum version because
# in case configure picks GnuPG-1.x, e.g. from /usr/local, this would cause
# testsuite failures:
@ -108,7 +110,10 @@ sh autogen.sh
--with-gpgconf-version=2.0.10 \
--with-gpg=%{_bindir}/gpg2 \
--with-gpgsm=%{_bindir}/gpgsm \
--with-gpgconf=%{_bindir}/gpgconf
--with-gpgconf=%{_bindir}/gpgconf \
--disable-fd-passing
make %{?_smp_mflags}
%install
%make_install