From 1893be6eed5ee03754133ff34a531efa7c2c201617680c7b5fb799c2cd063a90 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 22 Dec 2011 10:29:01 +0000 Subject: [PATCH 1/3] go away OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=34 --- project.diff | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 project.diff diff --git a/project.diff b/project.diff new file mode 100644 index 0000000..009153c --- /dev/null +++ b/project.diff @@ -0,0 +1,53 @@ +--- gpgme.changes.orig ++++ gpgme.changes +@@ -1,4 +1,9 @@ + ------------------------------------------------------------------- ++Thu Dec 1 15:56:05 UTC 2011 - coolo@suse.com ++ ++- add automake as buildrequire to avoid implicit dependency ++ ++------------------------------------------------------------------- + Sun Oct 2 15:20:21 UTC 2011 - crrodriguez@opensuse.org + + - Workaround qemu-arm bugs +--- gpgme.spec.orig ++++ gpgme.spec +@@ -16,18 +16,18 @@ + # + + +- + Name: gpgme + BuildRequires: gpg2 >= 2.0.10 + Version: 1.3.1 +-Release: 1 +-License: GPLv2+ ++Release: 0 + Summary: A Library Designed to Give Applications Easy Access to GnuPG +-Url: http://www.gnupg.org/related_software/gpgme/ ++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.0-gpgme-config-remove-extraneous-libs.patch + Source2: baselibs.conf ++BuildRequires: automake + BuildRequires: libassuan-devel >= 2.0.2 + BuildRequires: libgpg-error-devel >= 1.4 + PreReq: %install_info_prereq +@@ -48,7 +48,6 @@ Authors of MUAs should especially consid + of standard widgets for common key selection tasks is even planned. + + %package -n libgpgme11 +-License: GPLv2+ + Summary: A Library Designed to give Applications easy Access to GnuPG + Group: Development/Libraries/C and C++ + Requires: gpg2 +@@ -70,7 +69,6 @@ Authors of MUAs should especially consid + of standard widgets for common key selection tasks is even planned. + + %package -n libgpgme-devel +-License: GPLv2+ + Summary: A Library Designed to give Applications easy Access to GnuPG + Group: Development/Libraries/C and C++ + Requires: glibc-devel From bdaf1b25cb06c4972e52f972718b80bf7081f3d7bef48f1e801bdb1928b1395e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 22 Dec 2011 10:56:12 +0000 Subject: [PATCH 2/3] cleanup OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=36 --- gpgme.spec | 1 - project.diff | 53 ---------------------------------------------------- 2 files changed, 54 deletions(-) delete mode 100644 project.diff diff --git a/gpgme.spec b/gpgme.spec index 378968a..43f75ea 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: gpgme BuildRequires: gpg2 >= 2.0.10 Version: 1.3.1 diff --git a/project.diff b/project.diff deleted file mode 100644 index 009153c..0000000 --- a/project.diff +++ /dev/null @@ -1,53 +0,0 @@ ---- gpgme.changes.orig -+++ gpgme.changes -@@ -1,4 +1,9 @@ - ------------------------------------------------------------------- -+Thu Dec 1 15:56:05 UTC 2011 - coolo@suse.com -+ -+- add automake as buildrequire to avoid implicit dependency -+ -+------------------------------------------------------------------- - Sun Oct 2 15:20:21 UTC 2011 - crrodriguez@opensuse.org - - - Workaround qemu-arm bugs ---- gpgme.spec.orig -+++ gpgme.spec -@@ -16,18 +16,18 @@ - # - - -- - Name: gpgme - BuildRequires: gpg2 >= 2.0.10 - Version: 1.3.1 --Release: 1 --License: GPLv2+ -+Release: 0 - Summary: A Library Designed to Give Applications Easy Access to GnuPG --Url: http://www.gnupg.org/related_software/gpgme/ -+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.0-gpgme-config-remove-extraneous-libs.patch - Source2: baselibs.conf -+BuildRequires: automake - BuildRequires: libassuan-devel >= 2.0.2 - BuildRequires: libgpg-error-devel >= 1.4 - PreReq: %install_info_prereq -@@ -48,7 +48,6 @@ Authors of MUAs should especially consid - of standard widgets for common key selection tasks is even planned. - - %package -n libgpgme11 --License: GPLv2+ - Summary: A Library Designed to give Applications easy Access to GnuPG - Group: Development/Libraries/C and C++ - Requires: gpg2 -@@ -70,7 +69,6 @@ Authors of MUAs should especially consid - of standard widgets for common key selection tasks is even planned. - - %package -n libgpgme-devel --License: GPLv2+ - Summary: A Library Designed to give Applications easy Access to GnuPG - Group: Development/Libraries/C and C++ - Requires: glibc-devel From 09992f19bf6f5ae2103e2e019103e9a3ad12317cdb3df01f44658bfc6a1384a0 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 18 Nov 2012 09:43:42 +0000 Subject: [PATCH 3/3] Accepting request 141603 from home:AndreasStieger:branches:Base:System update to 1.3.2 OBS-URL: https://build.opensuse.org/request/show/141603 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=37 --- gpgme-1.3.1.tar.bz2 | 3 -- ...-gpgme-config-remove-extraneous-libs.patch | 32 +++++++++++-------- gpgme-1.3.2.tar.bz2 | 3 ++ gpgme.changes | 12 +++++++ gpgme.spec | 11 ++++--- 5 files changed, 40 insertions(+), 21 deletions(-) delete mode 100644 gpgme-1.3.1.tar.bz2 rename gpgme-1.3.0-gpgme-config-remove-extraneous-libs.patch => gpgme-1.3.2-gpgme-config-remove-extraneous-libs.patch (52%) create mode 100644 gpgme-1.3.2.tar.bz2 diff --git a/gpgme-1.3.1.tar.bz2 b/gpgme-1.3.1.tar.bz2 deleted file mode 100644 index 53b1b92..0000000 --- a/gpgme-1.3.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15ef27a875ae0d79d7446fd931deda11438e724ffbeac74449ed19cba23df4d4 -size 841093 diff --git a/gpgme-1.3.0-gpgme-config-remove-extraneous-libs.patch b/gpgme-1.3.2-gpgme-config-remove-extraneous-libs.patch similarity index 52% rename from gpgme-1.3.0-gpgme-config-remove-extraneous-libs.patch rename to gpgme-1.3.2-gpgme-config-remove-extraneous-libs.patch index 089ce7b..80fbd07 100644 --- a/gpgme-1.3.0-gpgme-config-remove-extraneous-libs.patch +++ b/gpgme-1.3.2-gpgme-config-remove-extraneous-libs.patch @@ -1,5 +1,7 @@ ---- src/gpgme-config.in.orig -+++ src/gpgme-config.in +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. @@ -9,9 +11,11 @@ # Configure libgpg-error. gpg_error_cflags="@GPG_ERROR_CFLAGS@" ---- src/Makefile.am.orig -+++ src/Makefile.am -@@ -206,12 +206,13 @@ libgpgme_la_DEPENDENCIES = @LTLIBOBJS@ $ +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@ @@ -24,11 +28,13 @@ - -lpthread @GPG_ERROR_LIBS@ + @GPG_ERROR_LIBS@ - libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ $(no_undefined) $(export_symbols) \ - $(libgpgme_version_script_cmd) -version-info \ ---- configure.ac.orig -+++ configure.ac -@@ -80,7 +80,7 @@ AM_MAINTAINER_MODE + 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. @@ -37,12 +43,12 @@ AH_VERBATIM([_REENTRANT], [/* To allow the use of GPGME in multithreaded programs we have to use -@@ -91,7 +91,7 @@ AH_VERBATIM([_REENTRANT], +@@ -89,7 +89,7 @@ AH_VERBATIM([_REENTRANT], # define _REENTRANT 1 #endif]) -AC_PROG_CC +AC_PROG_CC_STDC AC_PROG_CXX - - AC_SUBST(LIBGPGME_LT_CURRENT) + AC_CHECK_PROGS(GITLOG_TO_CHANGELOG, gitlog-to-changelog, + [build-aux/gitlog-to-changelog]) diff --git a/gpgme-1.3.2.tar.bz2 b/gpgme-1.3.2.tar.bz2 new file mode 100644 index 0000000..87c48dc --- /dev/null +++ b/gpgme-1.3.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfd235663f1d1adc97abb38dd5e6d093bb7e155580f171f9ba0158feab69f875 +size 867738 diff --git a/gpgme.changes b/gpgme.changes index 4c3b9f3..5617d12 100644 --- a/gpgme.changes +++ b/gpgme.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Nov 16 22:53:49 UTC 2012 - andreas.stieger@gmx.de + +- update to 1.3.2 + * Remove support for libgpgme-pth. As far as we know, this was never used, + and GnuPG is going to use our own npth in the future. + * Fix signature summary information for a missing X.509 key. + * Fix parsing of dates >= year 2038. +- refresh gpgme-1.3.0-gpgme-config-remove-extraneous-libs.patch + to gpgme-1.3.2-gpgme-config-remove-extraneous-libs.patch +- actual minimum requirement for libgpg-error is >= 1.8 + ------------------------------------------------------------------- Thu Dec 1 15:56:05 UTC 2011 - coolo@suse.com diff --git a/gpgme.spec b/gpgme.spec index 43f75ea..b7ceaf7 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -1,7 +1,7 @@ # # spec file for package gpgme # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,20 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gpgme BuildRequires: gpg2 >= 2.0.10 -Version: 1.3.1 +Version: 1.3.2 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.0-gpgme-config-remove-extraneous-libs.patch +Patch0: gpgme-1.3.2-gpgme-config-remove-extraneous-libs.patch Source2: baselibs.conf BuildRequires: automake BuildRequires: libassuan-devel >= 2.0.2 -BuildRequires: libgpg-error-devel >= 1.4 +BuildRequires: libgpg-error-devel >= 1.8 PreReq: %install_info_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -134,7 +135,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog README NEWS THANKS TODO +%doc AUTHORS COPYING ChangeLog ChangeLog-2011 README NEWS THANKS TODO %{_datadir}/common-lisp %{_datadir}/common-lisp/source %{_infodir}/gpgme*